Skip to content

Commit 6254d36

Browse files
sidoraressidorares
committed
Merge branch 'master' of github.com:sidorares/node-mysql2
2 parents 542a497 + 7c351e8 commit 6254d36

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

‎index.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export interface Connection extends mysql.Connection {
1414
| mysql.RowDataPacket[]
1515
| mysql.OkPacket
1616
| mysql.OkPacket[]
17+
| mysql.ResultSetHeader
1718
>(
1819
sql: string,
1920
callback?: (
@@ -28,6 +29,7 @@ export interface Connection extends mysql.Connection {
2829
| mysql.RowDataPacket[]
2930
| mysql.OkPacket
3031
| mysql.OkPacket[]
32+
| mysql.ResultSetHeader
3133
>(
3234
sql: string,
3335
values: any | any[] | { [param: string]: any },
@@ -43,6 +45,7 @@ export interface Connection extends mysql.Connection {
4345
| mysql.RowDataPacket[]
4446
| mysql.OkPacket
4547
| mysql.OkPacket[]
48+
| mysql.ResultSetHeader
4649
>(
4750
options: mysql.QueryOptions,
4851
callback?: (
@@ -57,6 +60,7 @@ export interface Connection extends mysql.Connection {
5760
| mysql.RowDataPacket[]
5861
| mysql.OkPacket
5962
| mysql.OkPacket[]
63+
| mysql.ResultSetHeader
6064
>(
6165
options: mysql.QueryOptions,
6266
values: any | any[] | { [param: string]: any },
@@ -81,6 +85,7 @@ export interface Pool extends mysql.Connection {
8185
| mysql.RowDataPacket[]
8286
| mysql.OkPacket
8387
| mysql.OkPacket[]
88+
| mysql.ResultSetHeader
8489
>(
8590
sql: string,
8691
callback?: (
@@ -95,6 +100,7 @@ export interface Pool extends mysql.Connection {
95100
| mysql.RowDataPacket[]
96101
| mysql.OkPacket
97102
| mysql.OkPacket[]
103+
| mysql.ResultSetHeader
98104
>(
99105
sql: string,
100106
values: any | any[] | { [param: string]: any },
@@ -110,6 +116,7 @@ export interface Pool extends mysql.Connection {
110116
| mysql.RowDataPacket[]
111117
| mysql.OkPacket
112118
| mysql.OkPacket[]
119+
| mysql.ResultSetHeader
113120
>(
114121
options: mysql.QueryOptions,
115122
callback?: (
@@ -124,6 +131,7 @@ export interface Pool extends mysql.Connection {
124131
| mysql.RowDataPacket[]
125132
| mysql.OkPacket
126133
| mysql.OkPacket[]
134+
| mysql.ResultSetHeader
127135
>(
128136
options: mysql.QueryOptions,
129137
values: any | any[] | { [param: string]: any },

‎promise.d.ts

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
RowDataPacket,
33
OkPacket,
4+
ResultSetHeader,
45
FieldPacket,
56
QueryOptions,
67
ConnectionOptions,
@@ -23,39 +24,39 @@ export interface Connection extends EventEmitter {
2324

2425
changeUser(options: ConnectionOptions): Promise<void>;
2526

26-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
27+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
2728
sql: string
2829
): Promise<[T, FieldPacket[]]>;
29-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
30+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
3031
sql: string,
3132
values: any | any[] | { [param: string]: any }
3233
): Promise<[T, FieldPacket[]]>;
33-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
34+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
3435
options: QueryOptions
3536
): Promise<[T, FieldPacket[]]>;
36-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
37+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
3738
options: QueryOptions,
3839
values: any | any[] | { [param: string]: any }
3940
): Promise<[T, FieldPacket[]]>;
4041

4142
execute<
42-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
43+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
4344
>(
4445
sql: string
4546
): Promise<[T, FieldPacket[]]>;
4647
execute<
47-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
48+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
4849
>(
4950
sql: string,
5051
values: any | any[] | { [param: string]: any }
5152
): Promise<[T, FieldPacket[]]>;
5253
execute<
53-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
54+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
5455
>(
5556
options: QueryOptions
5657
): Promise<[T, FieldPacket[]]>;
5758
execute<
58-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
59+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
5960
>(
6061
options: QueryOptions,
6162
values: any | any[] | { [param: string]: any }
@@ -84,39 +85,39 @@ export interface PoolConnection extends Connection {
8485
}
8586

8687
export interface Pool extends EventEmitter {
87-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
88+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
8889
sql: string
8990
): Promise<[T, FieldPacket[]]>;
90-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
91+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
9192
sql: string,
9293
values: any | any[] | { [param: string]: any }
9394
): Promise<[T, FieldPacket[]]>;
94-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
95+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
9596
options: QueryOptions
9697
): Promise<[T, FieldPacket[]]>;
97-
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
98+
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
9899
options: QueryOptions,
99100
values: any | any[] | { [param: string]: any }
100101
): Promise<[T, FieldPacket[]]>;
101102

102103
execute<
103-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
104+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
104105
>(
105106
sql: string
106107
): Promise<[T, FieldPacket[]]>;
107108
execute<
108-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
109+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
109110
>(
110111
sql: string,
111112
values: any | any[] | { [param: string]: any }
112113
): Promise<[T, FieldPacket[]]>;
113114
execute<
114-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
115+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
115116
>(
116117
options: QueryOptions
117118
): Promise<[T, FieldPacket[]]>;
118119
execute<
119-
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
120+
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
120121
>(
121122
options: QueryOptions,
122123
values: any | any[] | { [param: string]: any }

0 commit comments

Comments
 (0)