fix: unit tests

sidorares · Oct 14, 2023 · 62c5066 · 62c5066
1 parent ccbcbc7
commit 62c5066
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -620,11 +620,19 @@ class Connection extends EventEmitter {
     };
     if (typeof sql === 'object') {
       // execute(options, cb)
-      options = {
-        ...options,
-        sql: sql.sql, 
-        values: sql.values
-      };
+      // check if sql-template-tag or sql-template-string lib
+      if (!sql.hasOwnProperty('sql') && 'sql' in sql) {
+        options = {
+          ...options,
+          sql: sql.sql,
+          values: sql.values,
+        };
+      } else {
+        options = {
+          ...options,
+          ...sql,
+        };
+      }
       if (typeof values === 'function') {
         cb = values;
       } else {
@@ -910,11 +918,19 @@ class Connection extends EventEmitter {
     };
     if (typeof sql === 'object') {
       // query(options, cb)
-      options = {
-        ...options,
-        sql: sql.sql, 
-        values: sql.values
-      };
+      // check if sql-template-tag or sql-template-string lib
+      if (!sql.hasOwnProperty('sql') && 'sql' in sql) {
+        options = {
+          ...options,
+          sql: sql.sql,
+          values: sql.values,
+        };
+      } else {
+        options = {
+          ...options,
+          ...sql,
+        };
+      }
       if (typeof values === 'function') {
         cb = values;
       } else if (values !== undefined) {