Skip to content

Commit

Permalink
reverted test configuration changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Umed Khudoiberdiev committed Oct 9, 2016
1 parent 01a92d9 commit a1ff141
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions config/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"host": "localhost",
"port": 3306,
"username": "root",
"password": "root",
"password": "admin",
"database": "test"
},
"mysqlSecondary": {
"host": "localhost",
"port": 3306,
"username": "root",
"password": "root",
"password": "admin",
"database": "test2"
},
"mariadb": {
Expand Down
2 changes: 1 addition & 1 deletion config/parameters.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"host": "localhost",
"port": 3306,
"username": "root",
"password": "root",
"password": "admin",
"database": "test2"
},
"sqlite": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe("persistence > many-to-many", function() {
host: "localhost",
port: 3306,
username: "root",
password: "root",
password: "admin",
database: "test"
},
logging: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("repository > removeById and removeByIds methods", function() {
host: "localhost",
port: 3306,
username: "root",
password: "root",
password: "admin",
database: "test"
},
logging: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe("repository > set/add/remove relation methods", function() {
host: "localhost",
port: 3306,
username: "root",
password: "root",
password: "admin",
database: "test"
},
logging: {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/sample2-one-to-one.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("one-to-one", function() {
// -------------------------------------------------------------------------

const options: ConnectionOptions = {
driver: createTestingConnectionOptions("mysql"),
driver: createTestingConnectionOptions("postgres"),
entities: [Post, PostDetails, PostCategory, PostMetadata, PostImage, PostInformation, PostAuthor]
};

Expand Down
2 changes: 1 addition & 1 deletion test/integration/sample3-many-to-one.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("many-to-one", function() {
// -------------------------------------------------------------------------

const options: ConnectionOptions = {
driver: createTestingConnectionOptions("mysql"),
driver: createTestingConnectionOptions("postgres"),
entities: [Post, PostDetails, PostCategory, PostMetadata, PostImage, PostInformation, PostAuthor]
};

Expand Down
2 changes: 1 addition & 1 deletion test/integration/sample4-many-to-many.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("many-to-many", function() {
// -------------------------------------------------------------------------

const options: ConnectionOptions = {
driver: createTestingConnectionOptions("mysql"),
driver: createTestingConnectionOptions("postgres"),
entities: [__dirname + "/../../sample/sample4-many-to-many/entity/*"],
// logging: {
// logQueries: true,
Expand Down
10 changes: 5 additions & 5 deletions test/utils/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export async function setupTestingConnections(options?: TestingConnectionOptions
entities: options && options.entities ? options.entities : [],
entitySchemas: options && options.entitySchemas ? options.entitySchemas : [],
logging: {
logQueries: true, // uncomment for debugging
// logQueries: true, // uncomment for debugging
logOnlyFailedQueries: true,
logFailedQueryError: true
},
Expand Down Expand Up @@ -217,9 +217,9 @@ export async function setupTestingConnections(options?: TestingConnectionOptions
};

const mysql = true; // !options || !options.skipMysql;
const mariadb = false; // !options || !options.skipMariadb;
const postgres = false; // !options || !options.skipPostgres;
const sqlite = false; // !options || !options.skipSqlite;
const mariadb = true; // !options || !options.skipMariadb;
const postgres = true; // !options || !options.skipPostgres;
const sqlite = true; // !options || !options.skipSqlite;
const mssql = false; // !options || !options.skipSqlserver;

const allParameters: ConnectionOptions[] = [];
Expand Down Expand Up @@ -264,7 +264,7 @@ export function setupConnection(callback: (connection: Connection) => any, entit
host: "localhost",
port: 3306,
username: "root",
password: "root",
password: "admin",
database: "test"
},
autoSchemaSync: true,
Expand Down

0 comments on commit a1ff141

Please sign in to comment.