f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IConnectionOptions fix for tests

Browse Source
This commit is contained in:
pc3b3r 2020-08-20 16:03:23 +02:00
parent b1335eed7f
commit 06653f96ed
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/runTestsFromPath.test.ts
View File

@ -350,7 +350,8 @@ async function prepareTestRuns(
databaseType: "mysql",
schemaName: "ignored",
ssl: yn(process.env.MYSQL_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: [],
};
break;
case "mariadb":
@ -363,7 +364,8 @@ async function prepareTestRuns(
databaseType: "mariadb",
schemaName: "ignored",
ssl: yn(process.env.MARIADB_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: []
};
break;

18
test/utils/GeneralTestUtils.ts
View File

@ -31,7 +31,8 @@ export async function createMSSQLModels(
databaseType: "mssql",
schemaName: "dbo,sch1,sch2",
ssl: yn(process.env.MSSQL_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: []
};
await driver.ConnectToServer(connectionOptions);
connectionOptions.databaseName = String(process.env.MSSQL_Database);
@ -83,7 +84,8 @@ export async function createPostgresModels(
databaseType: "postgres",
schemaName: "public,sch1,sch2",
ssl: yn(process.env.POSTGRES_SSL, { default: false }),
skipTables: ["spatial_ref_sys"]
skipTables: ["spatial_ref_sys"],
tables: []
};
await driver.ConnectToServer(connectionOptions);
connectionOptions.databaseName = String(process.env.POSTGRES_Database);
@ -134,7 +136,8 @@ export async function createSQLiteModels(
databaseType: "sqlite",
schemaName: "",
ssl: false,
skipTables: []
skipTables: [],
tables: []
};
const connOpt: ConnectionOptions = {
@ -169,7 +172,8 @@ export async function createMysqlModels(
databaseType: "mysql",
schemaName: "ignored",
ssl: yn(process.env.MYSQL_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: []
};
await driver.ConnectToServer(connectionOptions);
@ -212,7 +216,8 @@ export async function createMariaDBModels(
databaseType: "mariadb",
schemaName: "ignored",
ssl: yn(process.env.MARIADB_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: []
};
await driver.ConnectToServer(connectionOptions);
@ -257,7 +262,8 @@ export async function createOracleDBModels(
databaseType: "oracle",
schemaName: String(process.env.ORACLE_Username),
ssl: yn(process.env.ORACLE_SSL, { default: false }),
skipTables: []
skipTables: [],
tables: []
};
await driver.ConnectToServer(connectionOptions);
connectionOptions.user = String(process.env.ORACLE_Username);