@miatechnet/node-odbc 2.4.16 → 2.4.19

package/lib/odbc.d.ts

@@ -91,8 +91,8 @@ declare namespace odbc {
     query<T, O extends QueryOptions>(sql: string, options: O, callback: (error: NodeOdbcError, result: O extends CursorQueryOptions ? Cursor : Result<T>) => undefined): undefined;
     query<T, O extends QueryOptions>(sql: string, parameters: Array<number|string>, options: O, callback: (error: NodeOdbcError, result: O extends CursorQueryOptions ? Cursor : Result<T>) => undefined): undefined;
 
-    callProcedure<T>(catalog: string|null, schema: string|null, name: string, callback: (error: NodeOdbcError, result: Result<T>) => undefined): undefined;
-    callProcedure<T>(catalog: string|null, schema: string|null, name: string, parameters: Array<number|string>, callback: (error: NodeOdbcError, result: Result<T>) => undefined): undefined;
+    callProcedure<T>(catalog: string|null, schema: string|null, name: string, callback: (error: NodeOdbcError, result: Array<Result<T>>) => undefined): undefined;
+    callProcedure<T>(catalog: string|null, schema: string|null, name: string, parameters: Array<number|string>, callback: (error: NodeOdbcError, result: Array<Result<T>>) => undefined): undefined;
 
     createStatement(callback: (error: NodeOdbcError, statement: Statement) => undefined): undefined;
 
@@ -122,7 +122,7 @@ declare namespace odbc {
     query<T, O extends QueryOptions>(sql: string, options: O): O extends CursorQueryOptions ? Promise<Cursor> : Promise<Result<T>>;
     query<T, O extends QueryOptions>(sql: string, parameters: Array<number|string>, options: O): O extends CursorQueryOptions ? Promise<Cursor> : Promise<Result<T>>;
 
-    callProcedure<T>(catalog: string|null, schema: string|null, name: string, parameters?: Array<number|string>): Promise<Result<T>>;
+    callProcedure<T>(catalog: string|null, schema: string|null, name: string, parameters?: Array<number|string>): Promise<Array<Result<T>>>;
 
     createStatement(): Promise<Statement>;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@miatechnet/node-odbc",
   "description": "unixodbc bindings for node - Fork with multi-result set support for stored procedures",
-  "version": "2.4.16",
+  "version": "2.4.19",
   "homepage": "https://github.com/ppimentela/node-odbc/",
   "main": "lib/odbc.js",
   "types": "lib/odbc.d.ts",

package/src/odbc_connection.cpp

@@ -1887,6 +1887,25 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
           return;
         }
 
+        // Skip result sets with no columns (e.g., from INSERT/UPDATE/SET statements)
+        if (data->column_count == 0) {
+          // No columns means this is not a SELECT-like result set, skip it
+          return_code = SQLMoreResults(data->hstmt);
+          if (return_code == SQL_NO_DATA) {
+            hasMoreResults = false;
+          } else if (!SQL_SUCCEEDED(return_code)) {
+            this->errors = GetODBCErrors(SQL_HANDLE_STMT, data->hstmt);
+            SetError("[odbc] Error getting more results\0");
+            return;
+          }
+          
+          // Set fetch size for the next result set
+          if (hasMoreResults) {
+            set_fetch_size(data, data->fetch_size);
+          }
+          continue;
+        }
+
         // Obtener todos los datos del result set actual
         return_code = fetch_all_and_store(
           data,
@@ -1906,8 +1925,9 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
         }
 
         // Save the result set with column metadata to allResultSets
+        // Use swap/move to transfer ownership and prevent double-free
         ResultSetData rsData;
-        rsData.rows = data->storedRows;
+        rsData.rows.swap(data->storedRows);  // Transfer ownership of rows vector
         rsData.columns = data->columns;
         rsData.column_count = data->column_count;
         rsData.bound_columns = data->bound_columns;
@@ -1916,8 +1936,7 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
         
         data->allResultSets.push_back(rsData);
 
-        // Clear storedRows and reset pointers (don't free, they're now in allResultSets)
-        data->storedRows.clear();
+        // Reset pointers to NULL (ownership transferred to allResultSets)
         data->columns = NULL;
         data->column_count = 0;
         data->bound_columns = NULL;
@@ -1934,6 +1953,11 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
           SetError("[odbc] Error getting more results\0");
           return;
         }
+        
+        // Set fetch size for the next result set
+        if (hasMoreResults) {
+          set_fetch_size(data, data->fetch_size);
+        }
       }
     }
 
@@ -1951,8 +1975,9 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
       for (size_t rs_index = 0; rs_index < data->allResultSets.size(); rs_index++) {
         ResultSetData &rsData = data->allResultSets[rs_index];
         
-        // Restore column metadata and rows for this result set
-        data->storedRows = rsData.rows;
+        // Transfer ownership of rows and column metadata for processing
+        // Use swap to ensure proper ownership transfer
+        data->storedRows.swap(rsData.rows);
         data->columns = rsData.columns;
         data->column_count = rsData.column_count;
         data->bound_columns = rsData.bound_columns;
@@ -1966,8 +1991,7 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
         
         allResults.Set(rs_index, singleResult);
         
-        // Mark rows as processed (process_data_for_napi frees them internally)
-        data->allResultSets[rs_index].rows.clear();
+        // After process_data_for_napi, rows are freed and storedRows is cleared
         // Mark columns as processed to prevent double-free
         data->allResultSets[rs_index].columns = NULL;
         data->allResultSets[rs_index].bound_columns = NULL;
@@ -1983,6 +2007,25 @@ class CallProcedureAsyncWorker : public ODBCAsyncWorker {
       data->bound_columns = NULL;
       data->row_status_array = NULL;
 
+      // Set metadata properties on the outer allResults array for backward compatibility
+      if (data->sql != NULL) {
+        #ifdef UNICODE
+        allResults.Set(Napi::String::New(env, STATEMENT), Napi::String::New(env, (const char16_t*)data->sql));
+        #else
+        allResults.Set(Napi::String::New(env, STATEMENT), Napi::String::New(env, (const char*)data->sql));
+        #endif
+      } else {
+        allResults.Set(Napi::String::New(env, STATEMENT), env.Null());
+      }
+
+      if (napiParameters.IsEmpty()) {
+        allResults.Set(Napi::String::New(env, PARAMETERS), env.Undefined());
+      } else {
+        allResults.Set(Napi::String::New(env, PARAMETERS), napiParameters.Value());
+      }
+
+      allResults.Set(Napi::String::New(env, RETURN), env.Undefined());
+
       std::vector<napi_value> callbackArguments;
       callbackArguments.push_back(env.Null());
       callbackArguments.push_back(allResults);