Add warnings count for non-DML/DLL queries like SELECT

sidorares · Sep 21, 2023 · 479fa03 · 479fa03
1 parent 001a183
commit 479fa03
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/lib/commands/query.js b/lib/commands/query.js
@@ -26,6 +26,7 @@ class Query extends Command {
     this._fieldCount = 0;
     this._rowParser = null;
     this._fields = [];
+    this._warningCounts = [];
     this._rows = [];
     this._receivedFieldsCount = 0;
     this._resultIndex = 0;
@@ -73,21 +74,23 @@ class Query extends Command {
       this.queryTimeout = null;
     }
     if (this.onResult) {
-      let rows, fields;
+      let rows, fields, warningCounts;
       if (this._resultIndex === 0) {
         rows = this._rows[0];
         fields = this._fields[0];
+        warningCounts = this._warningCounts[0];
       } else {
         rows = this._rows;
         fields = this._fields;
+        warningCounts = this._warningCounts
       }
       if (fields) {
         process.nextTick(() => {
-          this.onResult(null, rows, fields);
+          this.onResult(null, rows, fields, warningCounts);
         });
       } else {
         process.nextTick(() => {
-          this.onResult(null, rows);
+          this.onResult(null, rows, fields, warningCounts);
         });
       }
     }
@@ -227,9 +230,11 @@ class Query extends Command {
   }
 
   /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */
-  row(packet, _connection) { 
+  row(packet, _connection) {
     if (packet.isEOF()) {
       const status = packet.eofStatusFlags();
+      this._warningCounts[this._resultIndex] = packet.eofWarningCount();
+
       const moreResults = status & ServerStatus.SERVER_MORE_RESULTS_EXISTS;
       if (moreResults) {
         this._resultIndex++;
@@ -302,7 +307,7 @@ class Query extends Command {
       Timers.clearTimeout(this.queryTimeout);
       this.queryTimeout = null;
     }
-    
+
     const err = new Error('Query inactivity timeout');
     err.errorno = 'PROTOCOL_SEQUENCE_TIMEOUT';
     err.code = 'PROTOCOL_SEQUENCE_TIMEOUT';

diff --git a/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts b/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts
@@ -28,7 +28,7 @@ export declare function QueryableBase<T extends QueryableConstructor>(
     >(
       sql: string,
       callback?:
-        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[], warningCount: number | number[]) => any)
         | undefined
     ): Query;
     query<
@@ -44,7 +44,7 @@ export declare function QueryableBase<T extends QueryableConstructor>(
       sql: string,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[], warningCount: number | number[]) => any)
         | undefined
     ): Query;
     query<
@@ -59,7 +59,7 @@ export declare function QueryableBase<T extends QueryableConstructor>(
     >(
       options: QueryOptions,
       callback?:
-        | ((err: QueryError | null, result: T, fields?: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[], warningCount: number | number[]) => any)
         | undefined
     ): Query;
     query<
@@ -75,7 +75,7 @@ export declare function QueryableBase<T extends QueryableConstructor>(
       options: QueryOptions,
       values: any,
       callback?:
-        | ((err: QueryError | null, result: T, fields: FieldPacket[]) => any)
+        | ((err: QueryError | null, result: T, fields: FieldPacket[], warningCount: number | number[]) => any)
         | undefined
     ): Query;
   };