From 06653f96edda6bcda658c26e4fe4da0937aa8588 Mon Sep 17 00:00:00 2001 From: pc3b3r Date: Thu, 20 Aug 2020 16:03:23 +0200 Subject: [PATCH] IConnectionOptions fix for tests --- test/integration/runTestsFromPath.test.ts | 6 ++++-- test/utils/GeneralTestUtils.ts | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/test/integration/runTestsFromPath.test.ts b/test/integration/runTestsFromPath.test.ts index f645fa0..66813b8 100644 --- a/test/integration/runTestsFromPath.test.ts +++ b/test/integration/runTestsFromPath.test.ts @@ -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; diff --git a/test/utils/GeneralTestUtils.ts b/test/utils/GeneralTestUtils.ts index 813ebd1..55163a9 100644 --- a/test/utils/GeneralTestUtils.ts +++ b/test/utils/GeneralTestUtils.ts @@ -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);