Skip to content

Commit 2244347

Browse files
committed
Added prepare and unprepare method declarations to Connection, fixes #1564
1 parent dd191ce commit 2244347

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

index.d.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export interface Connection extends mysql.Connection {
7272
): mysql.Query;
7373
ping(callback?: (err: mysql.QueryError | null) => any): void;
7474
promise(promiseImpl?: PromiseConstructor): PromiseConnection;
75+
unprepare(sql: string): mysql.PrepareStatementInfo;
76+
prepare(sql: string, callback?: (err: mysql.QueryError | null, statement: mysql.PrepareStatementInfo) => any): mysql.Prepare;
7577
}
7678

7779
export interface PoolConnection extends mysql.PoolConnection, Connection {
@@ -149,6 +151,8 @@ export interface Pool extends mysql.Connection {
149151
on(event: 'release', listener: (connection: PoolConnection) => any): this;
150152
on(event: 'enqueue', listener: () => any): this;
151153
promise(promiseImpl?: PromiseConstructor): PromisePool;
154+
unprepare(sql: string): mysql.PrepareStatementInfo;
155+
prepare(sql: string, callback?: (err: mysql.QueryError | null, statement: mysql.PrepareStatementInfo) => any): mysql.Prepare;
152156
}
153157

154158
type authPlugins = (pluginMetadata: {
@@ -182,14 +186,6 @@ export interface ConnectionOptions extends mysql.ConnectionOptions {
182186
};
183187
}
184188

185-
export interface ConnectionConfig extends ConnectionOptions {
186-
static mergeFlags(defaultFlags: string[], userFlags: string[] | string): number;
187-
static getDefaultFlags(options?: ConnectionOptions): string[];
188-
static getCharsetNumber(charset: string): number;
189-
static getSSLProfile(name: string): { ca: string[] };
190-
static parseUrl(url: string): { host: string, port: number, database: string, user: string, password: string, [key: string]: any };
191-
}
192-
193189
export interface PoolOptions extends mysql.PoolOptions, ConnectionOptions {}
194190

195191
export function createConnection(connectionUri: string): Connection;

typings/mysql/index.d.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import {PoolOptions} from './lib/Pool';
77
import BasePoolCluster = require('./lib/PoolCluster');
88
import {PoolClusterOptions} from './lib/PoolCluster';
99
import BaseQuery = require('./lib/protocol/sequences/Query');
10+
import BasePrepare = require('./lib/protocol/sequences/Prepare');
1011
import {QueryOptions, StreamOptions, QueryError} from './lib/protocol/sequences/Query';
12+
import {PrepareStatementInfo} from 'mysql2/typings/mysql/lib/protocol/sequences/Prepare';
1113

1214
export function createConnection(connectionUri: string): Connection;
1315
export function createConnection(config: BaseConnection.ConnectionOptions): Connection;
@@ -28,7 +30,8 @@ export {
2830
PoolOptions,
2931
PoolClusterOptions,
3032
QueryOptions,
31-
QueryError
33+
QueryError,
34+
PrepareStatementInfo
3235
};
3336
export * from './lib/protocol/packets/index';
3437

@@ -38,3 +41,4 @@ export interface PoolConnection extends BasePoolConnection {}
3841
export interface Pool extends BasePool {}
3942
export interface PoolCluster extends BasePoolCluster {}
4043
export interface Query extends BaseQuery {}
44+
export interface Prepare extends BasePrepare {}

typings/mysql/lib/Connection.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Modifications copyright (c) 2021, Oracle and/or its affiliates.
55

66
import Query = require('./protocol/sequences/Query');
7+
import Prepare = require('./protocol/sequences/Prepare');
78
import {OkPacket, FieldPacket, RowDataPacket, ResultSetHeader} from './protocol/packets/index';
89
import {EventEmitter} from 'events';
910

0 commit comments

Comments
 (0)