From e9a21055ba28a1cec15a9ab11ead57aed31fa8db Mon Sep 17 00:00:00 2001 From: Justin Wilaby Date: Mon, 8 Apr 2024 15:41:18 -0700 Subject: [PATCH] Update import paths for types --- .../pg/settings/log-min-duration-statement.ts | 9 +-- .../commands/settings/settings.unit.test.js | 60 ------------------- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/packages/cli/src/commands/pg/settings/log-min-duration-statement.ts b/packages/cli/src/commands/pg/settings/log-min-duration-statement.ts index 3cbb4fcf94..89bb3e1a2f 100644 --- a/packages/cli/src/commands/pg/settings/log-min-duration-statement.ts +++ b/packages/cli/src/commands/pg/settings/log-min-duration-statement.ts @@ -1,6 +1,7 @@ import {Args} from '@oclif/core' import heredoc from 'tsheredoc' -import {PGSettingsCommand, type Setting, type SettingKey} from '../../../lib/pg/setter' +import {PGSettingsCommand} from '../../../lib/pg/setter' +import type {Setting, SettingKey} from '../../../lib/pg/types' export default class LogMinDurationStatement extends PGSettingsCommand { static description = heredoc(` @@ -16,11 +17,11 @@ export default class LogMinDurationStatement extends PGSettingsCommand { protected settingKey:SettingKey = 'log_min_duration_statement' - protected convertValue(val: number): number { - return val + protected convertValue(val: unknown): number { + return val as number } - protected explain(setting: Setting) { + protected explain(setting: Setting) { if (setting.value === -1) { return 'The duration of each completed statement will not be logged.' } diff --git a/packages/pg-v5/test/unit/commands/settings/settings.unit.test.js b/packages/pg-v5/test/unit/commands/settings/settings.unit.test.js index d2a2d82aa0..66af46ae42 100644 --- a/packages/pg-v5/test/unit/commands/settings/settings.unit.test.js +++ b/packages/pg-v5/test/unit/commands/settings/settings.unit.test.js @@ -96,66 +96,6 @@ describe('pg:settings', () => { .then(() => expect(cli.stdout).to.equal(`${settingsResultName} is set to ${settingResult.value} for postgres-1.\n${settingResult.values[settingResult.value]}\n`)) }) - it('shows settings for auto_explain_log_analyze with value', () => { - setupSettingsMockData('auto_explain.log_analyze') - cmd = proxyquire('../../../../commands/settings/auto_explain_log_analyze', { - settings: proxyquire.noCallThru().load('../../../../lib/setter', { - './fetcher': fetcher, - }), - }) - pg.get('/postgres/v0/databases/1/config').reply(200, settingsResult) - return cmd.run({args: {database: 'test-database', value: ''}, flags: {}}) - .then(() => expect(cli.stdout).to.equal('auto-explain.log-analyze is set to test_value for postgres-1.\nEXPLAIN ANALYZE execution plans will be logged.\n')) - }) - - it('shows settings for auto_explain_log_analyze with no value', () => { - setupSettingsMockData('auto_explain.log_analyze', '') - cmd = proxyquire('../../../../commands/settings/auto_explain_log_analyze', { - settings: proxyquire.noCallThru().load('../../../../lib/setter', { - './fetcher': fetcher, - }), - }) - pg.get('/postgres/v0/databases/1/config').reply(200, settingsResult) - return cmd.run({args: {database: 'test-database', value: ''}, flags: {}}) - .then(() => expect(cli.stdout).to.equal('auto-explain.log-analyze is set to for postgres-1.\nEXPLAIN ANALYZE execution plans will not be logged.\n')) - }) - - it('shows settings for log_min_duration_statement with value', () => { - setupSettingsMockData('log_min_duration_statement') - cmd = proxyquire('../../../../commands/settings/log_min_duration_statement', { - settings: proxyquire.noCallThru().load('../../../../lib/setter', { - './fetcher': fetcher, - }), - }) - pg.get('/postgres/v0/databases/1/config').reply(200, settingsResult) - return cmd.run({args: {database: 'test-database', value: ''}, flags: {}}) - .then(() => expect(cli.stdout).to.equal('log-min-duration-statement is set to test_value for postgres-1.\nThe duration of each completed statement will be logged if the statement ran for at least test_value milliseconds.\n')) - }) - - it('shows settings for log_min_duration_statement with no value', () => { - setupSettingsMockData('log_min_duration_statement', -1) - cmd = proxyquire('../../../../commands/settings/log_min_duration_statement', { - settings: proxyquire.noCallThru().load('../../../../lib/setter', { - './fetcher': fetcher, - }), - }) - pg.get('/postgres/v0/databases/1/config').reply(200, settingsResult) - return cmd.run({args: {database: 'test-database', value: ''}, flags: {}}) - .then(() => expect(cli.stdout).to.equal('log-min-duration-statement is set to -1 for postgres-1.\nThe duration of each completed statement will not be logged.\n')) - }) - - it('shows settings for log_min_duration_statement with value set to 0', () => { - setupSettingsMockData('log_min_duration_statement', 0) - cmd = proxyquire('../../../../commands/settings/log_min_duration_statement', { - settings: proxyquire.noCallThru().load('../../../../lib/setter', { - './fetcher': fetcher, - }), - }) - pg.get('/postgres/v0/databases/1/config').reply(200, settingsResult) - return cmd.run({args: {database: 'test-database', value: ''}, flags: {}}) - .then(() => expect(cli.stdout).to.equal('log-min-duration-statement is set to 0 for postgres-1.\nThe duration of each completed statement will be logged.\n')) - }) - it('shows settings for auto_explain_log_nested_statements with value', () => { setupSettingsMockData('auto_explain.log_nested_statements') cmd = proxyquire('../../../../commands/settings/auto_explain_log_nested_statements', {