pqb 0.39.3 → 0.40.0

package/dist/index.js

@@ -3179,30 +3179,10 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
-const singleQuoteRegex = /'/g;
-const doubleQuoteRegex = /"/g;
-const quoteValue = (value) => {
+const quoteValue = (value, nested = false) => {
   const type = typeof value;
-  if (type === "number")
+  if (type === "number" || type === "bigint")
     return String(value);
-  else if (type === "string")
-    return `"${value.replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-  else if (type === "boolean")
-    return value ? "true" : "false";
-  else if (value instanceof Date)
-    return `"${value.toISOString()}"`;
-  else if (Array.isArray(value))
-    return quoteArray(value);
-  else if (value === null || value === void 0)
-    return "NULL";
-  else
-    return `"${JSON.stringify(value).replace(doubleQuoteRegex, '\\"').replace(singleQuoteRegex, "''")}"`;
-};
-const quoteArray = (array) => `'{${array.map(quoteValue).join(",")}}'`;
-const quote = (value) => {
-  const type = typeof value;
-  if (type === "number")
-    return `${value}`;
   else if (type === "string")
     return quoteString(value);
   else if (type === "boolean")
@@ -3210,15 +3190,14 @@ const quote = (value) => {
   else if (value instanceof Date)
     return `'${value.toISOString()}'`;
   else if (Array.isArray(value))
-    return quoteArray(value);
+    return `${nested ? "" : "ARRAY"}[${value.map((el) => quoteValue(el, true)).join(",")}]`;
   else if (value === null || value === void 0)
     return "NULL";
   else
-    return `'${JSON.stringify(value).replace(singleQuoteRegex, "''")}'`;
-};
-const quoteString = (value) => {
-  return `'${value.replace(singleQuoteRegex, "''")}'`;
+    return quoteString(JSON.stringify(value));
 };
+const quote = (value) => quoteValue(value);
+const quoteString = (value) => `'${value.replaceAll("'", "''")}'`;
 
 const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values) => {
   const elapsed = process.hrtime(time);
@@ -3882,7 +3861,8 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
           );
         }
         if (afterCommitHooks) {
-          if (trx) {
+          if (trx && // when inside test transactions, push to a transaction only unless it's the outer user transaction.
+          (!trx.testTransactionCount || trx.transactionId + 1 > trx.testTransactionCount)) {
             ((_c = trx.afterCommit) != null ? _c : trx.afterCommit = []).push(
               result,
               q,