refactor: better naming (ExecuteOrQueryResultPackets -> QueryResult)

sidorares · Mar 1, 2024 · d44bf83 · d44bf83
1 parent 5fa4324
commit d44bf83
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/typings/mysql/lib/protocol/packets/index.d.ts b/typings/mysql/lib/protocol/packets/index.d.ts
@@ -7,7 +7,7 @@ import { ResultSetHeader } from './ResultSetHeader.js';
 import { OkPacketParams } from './params/OkPacketParams.js';
 import { ErrorPacketParams } from './params/ErrorPacketParams.js';
 
-export type ExecuteOrQueryResultPackets =
+export type QueryResult =
   | OkPacket
   | ResultSetHeader
   | ResultSetHeader[]

diff --git a/typings/mysql/lib/protocol/sequences/ExecutableBase.d.ts b/typings/mysql/lib/protocol/sequences/ExecutableBase.d.ts
@@ -1,6 +1,6 @@
 import {
   FieldPacket,
-  ExecuteOrQueryResultPackets,
+  QueryResult,
 } from '../packets/index.js';
 import {
   Query,
@@ -13,26 +13,26 @@ export declare function ExecutableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
   new (...args: any[]): {
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       sql: string,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       sql: string,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       options: QueryOptions,
       callback?:
         | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
         | undefined
     ): Query;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       options: QueryOptions,
       values: any,
       callback?:

diff --git a/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts b/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts
@@ -1,6 +1,6 @@
 import {
   FieldPacket,
-  ExecuteOrQueryResultPackets,
+  QueryResult,
 } from '../packets/index.js';
 import {
   Query,
@@ -13,26 +13,26 @@ export declare function QueryableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
   new (...args: any[]): {
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       sql: string,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       sql: string,
       values: any,
       callback?:
         | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
         | undefined
     ): Query;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       options: QueryOptions,
       callback?:
         | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
         | undefined
     ): Query;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       options: QueryOptions,
       values: any,
       callback?:

diff --git a/typings/mysql/lib/protocol/sequences/promise/ExecutableBase.d.ts b/typings/mysql/lib/protocol/sequences/promise/ExecutableBase.d.ts
@@ -1,24 +1,24 @@
 import {
   FieldPacket,
-  ExecuteOrQueryResultPackets,
+  QueryResult,
 } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
 export declare function ExecutableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
   new (...args: any[]): {
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       sql: string
     ): Promise<[T, FieldPacket[]]>;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       sql: string,
       values: any
     ): Promise<[T, FieldPacket[]]>;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       options: QueryOptions
     ): Promise<[T, FieldPacket[]]>;
-    execute<T extends ExecuteOrQueryResultPackets>(
+    execute<T extends QueryResult>(
       options: QueryOptions,
       values: any
     ): Promise<[T, FieldPacket[]]>;

diff --git a/typings/mysql/lib/protocol/sequences/promise/QueryableBase.d.ts b/typings/mysql/lib/protocol/sequences/promise/QueryableBase.d.ts
@@ -1,24 +1,24 @@
 import {
   FieldPacket,
-  ExecuteOrQueryResultPackets,
+  QueryResult,
 } from '../../packets/index.js';
 import { QueryOptions, QueryableConstructor } from '../Query.js';
 
 export declare function QueryableBase<T extends QueryableConstructor>(
   Base?: T
 ): {
   new (...args: any[]): {
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       sql: string
     ): Promise<[T, FieldPacket[]]>;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       sql: string,
       values: any
     ): Promise<[T, FieldPacket[]]>;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       options: QueryOptions
     ): Promise<[T, FieldPacket[]]>;
-    query<T extends ExecuteOrQueryResultPackets>(
+    query<T extends QueryResult>(
       options: QueryOptions,
       values: any
     ): Promise<[T, FieldPacket[]]>;