Skip to content

Commit 55063de

Browse files
authored
🤖 Merge PR DefinitelyTyped#74352 mssql: Convert ConnectionPool argument to a union type by @Bug1312
1 parent d5bcab9 commit 55063de

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

‎types/mssql/index.d.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ export declare class ConnectionPool extends events.EventEmitter {
236236
public static parseConnectionString(
237237
connectionString: string,
238238
): config & { options: IOptions; pool: Partial<PoolOpts<Connection>> };
239-
public constructor(config: config, callback?: (err?: any) => void);
240-
public constructor(connectionString: string, callback?: (err?: any) => void);
239+
public constructor(configOrConnectionString: config | string, callback?: (err?: any) => void);
241240
public query(command: string): Promise<IResult<any>>;
242241
public query(strings: TemplateStringsArray, ...interpolations: any[]): Promise<IResult<any>>;
243242
public query<Entity>(command: string): Promise<IResult<Entity>>;

‎types/mssql/mssql-tests.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var config: sql.config = {
3636

3737
var connectionString = "Server=localhost,1433;Database=database;User Id=username;Password=password;Encrypt=true";
3838

39+
var configOrConnectionString: sql.config | string;
40+
3941
var minimalConfig: sql.config = { server: "ip" };
4042

4143
var connectionStringTest: sql.ConnectionPool = new sql.ConnectionPool("connectionstring", (err) => {
@@ -163,6 +165,8 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function(err
163165
}
164166
});
165167

168+
var connectionUnionTypeTest = new sql.ConnectionPool(configOrConnectionString);
169+
166170
function test_connection_string_parser() {
167171
var parsedConfig: sql.config = sql.ConnectionPool.parseConnectionString(connectionString);
168172
parsedConfig.pool; // $ExpectType PoolOpts<Connection>

0 commit comments

Comments
 (0)