Skip to content

Commit

Permalink
add ResultSetHeader
Browse files Browse the repository at this point in the history
  • Loading branch information
larshp committed Sep 21, 2020
1 parent 19149dc commit 364383c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 18 deletions.
12 changes: 10 additions & 2 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface Connection extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
sql: string,
callback?: (
Expand All @@ -28,6 +29,7 @@ export interface Connection extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
sql: string,
values: any | any[] | { [param: string]: any },
Expand All @@ -43,6 +45,7 @@ export interface Connection extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
options: mysql.QueryOptions,
callback?: (
Expand All @@ -57,6 +60,7 @@ export interface Connection extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
options: mysql.QueryOptions,
values: any | any[] | { [param: string]: any },
Expand All @@ -81,6 +85,7 @@ export interface Pool extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
sql: string,
callback?: (
Expand All @@ -95,6 +100,7 @@ export interface Pool extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
sql: string,
values: any | any[] | { [param: string]: any },
Expand All @@ -110,6 +116,7 @@ export interface Pool extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
options: mysql.QueryOptions,
callback?: (
Expand All @@ -124,6 +131,7 @@ export interface Pool extends mysql.Connection {
| mysql.RowDataPacket[]
| mysql.OkPacket
| mysql.OkPacket[]
| mysql.ResultSetHeader
>(
options: mysql.QueryOptions,
values: any | any[] | { [param: string]: any },
Expand All @@ -142,11 +150,11 @@ export interface Pool extends mysql.Connection {
on(event: 'enqueue', listener: () => any): this;
promise(promiseImpl?: PromiseConstructor): PromisePool;
}

type authPlugins =
(pluginMetadata: { connection: Connection; command: string }) =>
(pluginData: Buffer) => Promise<string>;

export interface ConnectionOptions extends mysql.ConnectionOptions {
charsetNumber?: number;
compress?: boolean;
Expand Down
33 changes: 17 additions & 16 deletions promise.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
RowDataPacket,
OkPacket,
ResultSetHeader,
FieldPacket,
QueryOptions,
ConnectionOptions,
Expand All @@ -23,39 +24,39 @@ export interface Connection extends EventEmitter {

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

query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
sql: string
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
sql: string,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
options: QueryOptions
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
options: QueryOptions,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;

execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
sql: string
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
sql: string,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
options: QueryOptions
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
options: QueryOptions,
values: any | any[] | { [param: string]: any }
Expand Down Expand Up @@ -84,39 +85,39 @@ export interface PoolConnection extends Connection {
}

export interface Pool extends EventEmitter {
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
sql: string
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
sql: string,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
options: QueryOptions
): Promise<[T, FieldPacket[]]>;
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]>(
query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader>(
options: QueryOptions,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;

execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
sql: string
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
sql: string,
values: any | any[] | { [param: string]: any }
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
options: QueryOptions
): Promise<[T, FieldPacket[]]>;
execute<
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[]
T extends RowDataPacket[][] | RowDataPacket[] | OkPacket | OkPacket[] | ResultSetHeader
>(
options: QueryOptions,
values: any | any[] | { [param: string]: any }
Expand Down

0 comments on commit 364383c

Please sign in to comment.