From 55063def3bbc4e4f31ce58b69961d41db143ebc9 Mon Sep 17 00:00:00 2001 From: Bug1312 Date: Fri, 16 Jan 2026 07:03:33 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74352=20mssql:=20C?= =?UTF-8?q?onvert=20ConnectionPool=20argument=20to=20a=20union=20type=20by?= =?UTF-8?q?=20@Bug1312?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/mssql/index.d.ts | 3 +-- types/mssql/mssql-tests.ts | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts index 27afb14bcfecee..55db06e04b91a3 100644 --- a/types/mssql/index.d.ts +++ b/types/mssql/index.d.ts @@ -236,8 +236,7 @@ export declare class ConnectionPool extends events.EventEmitter { public static parseConnectionString( connectionString: string, ): config & { options: IOptions; pool: Partial> }; - public constructor(config: config, callback?: (err?: any) => void); - public constructor(connectionString: string, callback?: (err?: any) => void); + public constructor(configOrConnectionString: config | string, callback?: (err?: any) => void); public query(command: string): Promise>; public query(strings: TemplateStringsArray, ...interpolations: any[]): Promise>; public query(command: string): Promise>; diff --git a/types/mssql/mssql-tests.ts b/types/mssql/mssql-tests.ts index 47593af36ef9fa..73944cd0087b73 100644 --- a/types/mssql/mssql-tests.ts +++ b/types/mssql/mssql-tests.ts @@ -36,6 +36,8 @@ var config: sql.config = { var connectionString = "Server=localhost,1433;Database=database;User Id=username;Password=password;Encrypt=true"; +var configOrConnectionString: sql.config | string; + var minimalConfig: sql.config = { server: "ip" }; var connectionStringTest: sql.ConnectionPool = new sql.ConnectionPool("connectionstring", (err) => { @@ -163,6 +165,8 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function(err } }); +var connectionUnionTypeTest = new sql.ConnectionPool(configOrConnectionString); + function test_connection_string_parser() { var parsedConfig: sql.config = sql.ConnectionPool.parseConnectionString(connectionString); parsedConfig.pool; // $ExpectType PoolOpts