From f720f34bc78cf795ea388e828c78e3a179ebb937 Mon Sep 17 00:00:00 2001 From: Kononnable Date: Sun, 15 Dec 2019 12:57:19 +0100 Subject: [PATCH] remove sleep parameter sql query execution timeout now set to 1hr --- src/IConnectionOptions.ts | 4 +-- src/drivers/MssqlDriver.ts | 2 +- src/drivers/MysqlDriver.ts | 4 +-- src/drivers/OracleDriver.ts | 2 +- src/drivers/PostgresDriver.ts | 2 +- src/index.ts | 41 ----------------------- test/integration/runTestsFromPath.test.ts | 2 +- 7 files changed, 7 insertions(+), 50 deletions(-) diff --git a/src/IConnectionOptions.ts b/src/IConnectionOptions.ts index 138c49f..8be2079 100644 --- a/src/IConnectionOptions.ts +++ b/src/IConnectionOptions.ts @@ -16,7 +16,6 @@ export default interface IConnectionOptions { | "sqlite"; schemaName: string; ssl: boolean; - timeout?: number; } export function getDefaultConnectionOptions(): IConnectionOptions { @@ -28,8 +27,7 @@ export function getDefaultConnectionOptions(): IConnectionOptions { password: "", databaseType: undefined as any, schemaName: "", - ssl: false, - timeout: undefined + ssl: false }; return connectionOptions; } diff --git a/src/drivers/MssqlDriver.ts b/src/drivers/MssqlDriver.ts index 92efbc3..4f513ac 100644 --- a/src/drivers/MssqlDriver.ts +++ b/src/drivers/MssqlDriver.ts @@ -440,7 +440,7 @@ WHERE TABLE_TYPE='BASE TABLE' and TABLE_SCHEMA in (${schema}) AND TABLE_CATALOG }, password: connectionOptons.password, port: connectionOptons.port, - requestTimeout: connectionOptons.timeout, + requestTimeout: 60 * 60 * 1000, server: connectionOptons.host, user: connectionOptons.user }; diff --git a/src/drivers/MysqlDriver.ts b/src/drivers/MysqlDriver.ts index 75aab4a..4e40085 100644 --- a/src/drivers/MysqlDriver.ts +++ b/src/drivers/MysqlDriver.ts @@ -421,7 +421,7 @@ export default class MysqlDriver extends AbstractDriver { ssl: { rejectUnauthorized: false }, - timeout: connectionOptons.timeout, + timeout: 60 * 60 * 1000, user: connectionOptons.user }; } else { @@ -430,7 +430,7 @@ export default class MysqlDriver extends AbstractDriver { host: connectionOptons.host, password: connectionOptons.password, port: connectionOptons.port, - timeout: connectionOptons.timeout, + timeout: 60 * 60 * 1000, user: connectionOptons.user }; } diff --git a/src/drivers/OracleDriver.ts b/src/drivers/OracleDriver.ts index 38cf79b..1d90233 100644 --- a/src/drivers/OracleDriver.ts +++ b/src/drivers/OracleDriver.ts @@ -42,7 +42,7 @@ export default class OracleDriver extends AbstractDriver { TABLE_NAME: string; DB_NAME: string; }[] = (await this.Connection.execute( - ` SELECT NULL AS TABLE_SCHEMA, TABLE_NAME, NULL AS DB_NAME FROM all_tables WHERE owner = (select user from dual)` + `SELECT NULL AS TABLE_SCHEMA, TABLE_NAME, NULL AS DB_NAME FROM all_tables WHERE owner = (select user from dual)` )).rows!; return response; }; diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts index c34402f..446ad83 100644 --- a/src/drivers/PostgresDriver.ts +++ b/src/drivers/PostgresDriver.ts @@ -594,7 +594,7 @@ export default class PostgresDriver extends AbstractDriver { port: connectionOptons.port, ssl: connectionOptons.ssl, // eslint-disable-next-line @typescript-eslint/camelcase - statement_timeout: connectionOptons.timeout, + statement_timeout: 60 * 60 * 1000, user: connectionOptons.user }); diff --git a/src/index.ts b/src/index.ts index ce1ae5a..99ebe28 100644 --- a/src/index.ts +++ b/src/index.ts @@ -81,14 +81,6 @@ function readTOMLConfig( hasUnknownProperties = true; } }); - if ( - !Object.prototype.hasOwnProperty.call( - loadedConnectionOptions, - "timeout" - ) - ) { - loadedConnectionOptions.timeout = undefined; - } } if (loadedGenerationOptions) { Object.keys(loadedGenerationOptions).forEach(key => { @@ -251,11 +243,6 @@ function checkYargsParameters(options: options): options { choices: ["none", "?", "!"], default: options.generationOptions.strictMode, describe: "Mark fields as optional(?) or non-null(!)" - }, - timeout: { - describe: "SQL Query timeout(ms)", - default: options.connectionOptions.timeout, - number: true } }); @@ -272,7 +259,6 @@ function checkYargsParameters(options: options): options { ? argv.s.toString() : standardSchema; options.connectionOptions.ssl = argv.ssl; - options.connectionOptions.timeout = argv.timeout; options.connectionOptions.user = argv.u || standardUser; options.generationOptions.activeRecord = argv.a; options.generationOptions.generateConstructor = argv.generateConstructor; @@ -396,33 +382,6 @@ async function useInquirer(options: options): Promise { type: "input" } ])).output; - - if ( - options.connectionOptions.databaseType === "mssql" || - options.connectionOptions.databaseType === "postgres" - ) { - const { changeRequestTimeout } = await inquirer.prompt([ - { - default: false, - message: "Do you want to change default sql query timeout?", - name: "changeRequestTimeout", - type: "confirm" - } - ]); - if (changeRequestTimeout) { - const { timeout } = await inquirer.prompt({ - message: "Query timeout(ms):", - name: "timeout", - type: "input", - default: options.connectionOptions.timeout, - validate(value) { - const valid = !Number.isNaN(parseInt(value, 10)); - return valid || "Please enter a valid number"; - } - }); - options.connectionOptions.timeout = parseInt(timeout, 10); - } - } const { customizeGeneration } = await inquirer.prompt([ { default: false, diff --git a/test/integration/runTestsFromPath.test.ts b/test/integration/runTestsFromPath.test.ts index 71e4d3d..c394a6f 100644 --- a/test/integration/runTestsFromPath.test.ts +++ b/test/integration/runTestsFromPath.test.ts @@ -23,7 +23,7 @@ const { expect } = chai; it("Column default values", async () => { const testPartialPath = "test/integration/defaultValues"; await runTestsFromPath(testPartialPath, true); -}).timeout(); +}) it("Platform specific types", async () => { const testPartialPath = "test/integration/entityTypes"; await runTestsFromPath(testPartialPath, true);