Skip to content

[pull] master from DefinitelyTyped:master #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 16, 2026
+5 −2
Merged

[pull] master from DefinitelyTyped:master #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions types/mssql/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ export declare class ConnectionPool extends events.EventEmitter {
public static parseConnectionString(
connectionString: string,
): config & { options: IOptions; pool: Partial<PoolOpts<Connection>> };
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<IResult<any>>;
public query(strings: TemplateStringsArray, ...interpolations: any[]): Promise<IResult<any>>;
public query<Entity>(command: string): Promise<IResult<Entity>>;
Expand Down
4 changes: 4 additions & 0 deletions types/mssql/mssql-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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<Connection>
Expand Down