pqb 0.31.7 → 0.31.9

package/dist/index.js

@@ -836,6 +836,12 @@ const columnCode = (type, t, code, migration, data = type.data, skip) => {
   return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
 
+const getSqlText = (sql) => {
+  if ("text" in sql)
+    return sql.text;
+  throw new Error(`Batch SQL is not supported in this query`);
+};
+
 var __defProp$f = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
 var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
@@ -889,7 +895,7 @@ const quoteValue$1 = (arg, ctx, quotedAs, jsonArray) => {
       return arg.toSQL(ctx, quotedAs);
     }
     if ("toSQL" in arg) {
-      return `(${arg.toSQL({ values: ctx.values }).text})`;
+      return `(${getSqlText(arg.toSQL({ values: ctx.values }))})`;
     }
   }
   return orchidCore.addValue(ctx.values, arg);
@@ -2072,7 +2078,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     if (query2.q.expr) {
       const q = joinSubQuery(table, query2);
       q.q.select = [query2.q.expr];
-      ands.push(`(${makeSQL(q, ctx).text})`);
+      ands.push(`(${getSqlText(makeSQL(q, ctx))})`);
     } else {
       pushWhereToSql(
         ands,
@@ -2225,7 +2231,9 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
           }
         }
         if (value instanceof ctx.queryBuilder.constructor) {
-          ands.push(`${quotedColumn} = (${value.toSQL(ctx).text})`);
+          ands.push(
+            `${quotedColumn} = (${getSqlText(value.toSQL(ctx))})`
+          );
         } else {
           for (const op in value) {
             const operator = column.operators[op];
@@ -2272,8 +2280,7 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   } else if (orchidCore.isExpression(arg.values)) {
     value = arg.values.toSQL(ctx, quotedAs);
   } else {
-    const sql = makeSQL(arg.values, ctx);
-    value = `(${sql.text})`;
+    value = `(${getSqlText(makeSQL(arg.values, ctx))})`;
   }
   const columnsSql = arg.columns.map((column) => columnToSql(ctx, query, query.shape, column, quotedAs)).join(", ");
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
@@ -2402,9 +2409,11 @@ const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
       jq = jq.clone();
     jq.q.select = [new RawSQL(`${innerAs}.*`)];
   }
-  return `(${jq.toSQL({
-    values: ctx.values
-  }).text}) ${outerAs || innerAs}`;
+  return `(${getSqlText(
+    jq.toSQL({
+      values: ctx.values
+    })
+  )}) ${outerAs || innerAs}`;
 };
 const processArgs = (args, ctx, query, joinAs, joinShape, quotedAs) => {
   return args.length === 1 ? getObjectOrRawConditions(ctx, query, args[0], quotedAs, joinAs, joinShape) : getConditionsFor3Or4LengthItem(
@@ -2461,7 +2470,7 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      sql = `${item[0]} LATERAL (${q.toSQL(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
+      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, on = "true" } = processJoinItem(
@@ -2987,6 +2996,104 @@ const defaultSchemaConfig = {
   timestamp: (precision) => new TimestampTZColumn(defaultSchemaConfig, precision)
 };
 
+const commitSql$1 = {
+  text: "COMMIT"
+};
+const rollbackSql$1 = {
+  text: "ROLLBACK"
+};
+class Transaction {
+  async transaction(cbOrOptions, cb) {
+    let options;
+    let fn;
+    if (typeof cbOrOptions === "function") {
+      options = orchidCore.emptyObject;
+      fn = cbOrOptions;
+    } else {
+      options = typeof cbOrOptions === "object" ? cbOrOptions : { level: cbOrOptions };
+      fn = cb;
+    }
+    const sql = {
+      values: orchidCore.emptyArray
+    };
+    const log = this.q.log;
+    let logData;
+    let trx = this.internal.transactionStorage.getStore();
+    const transactionId = trx ? trx.transactionId + 1 : 0;
+    const callback = (adapter) => {
+      if (log)
+        log.afterQuery(sql, logData);
+      if (log)
+        logData = log.beforeQuery(commitSql$1);
+      if (trx) {
+        trx.transactionId = transactionId;
+        return fn();
+      }
+      trx = {
+        adapter,
+        transactionId
+      };
+      return this.internal.transactionStorage.run(trx, fn);
+    };
+    if (!trx) {
+      sql.text = `BEGIN${options.level ? ` ISOLATION LEVEL ${options.level}` : ""}${options.readOnly !== void 0 ? ` READ ${options.readOnly ? "ONLY" : "WRITE"}` : ""}${options.deferrable !== void 0 ? ` ${options.deferrable ? "" : "NOT "}DEFERRABLE` : ""}`;
+      if (log)
+        logData = log.beforeQuery(sql);
+      try {
+        const result = await this.q.adapter.transaction(sql, callback);
+        if (log)
+          log.afterQuery(commitSql$1, logData);
+        const { afterCommit } = trx;
+        if (afterCommit) {
+          const promises = [];
+          for (let i = 0, len = afterCommit.length; i < len; i += 2) {
+            const q = afterCommit[i];
+            const result2 = afterCommit[i + 1];
+            for (const fn2 of afterCommit[i + 2]) {
+              promises.push(fn2(result2, q));
+            }
+          }
+          await Promise.all(promises);
+        }
+        return result;
+      } catch (err) {
+        if (log)
+          log.afterQuery(rollbackSql$1, logData);
+        throw err;
+      }
+    } else {
+      try {
+        sql.text = `SAVEPOINT "${transactionId}"`;
+        if (log)
+          logData = log.beforeQuery(sql);
+        const { adapter } = trx;
+        await adapter.query(sql);
+        let result;
+        try {
+          result = await callback(adapter);
+        } catch (err) {
+          sql.text = `ROLLBACK TO SAVEPOINT "${transactionId}"`;
+          if (log)
+            logData = log.beforeQuery(sql);
+          await adapter.query(sql);
+          if (log)
+            log.afterQuery(sql, logData);
+          throw err;
+        }
+        sql.text = `RELEASE SAVEPOINT "${transactionId}"`;
+        if (log)
+          logData = log.beforeQuery(sql);
+        await adapter.query(sql);
+        if (log)
+          log.afterQuery(sql, logData);
+        return result;
+      } finally {
+        trx.transactionId = transactionId - 1;
+      }
+    }
+  }
+}
+
 const queryMethodByReturnType = {
   all: "query",
   rows: "arrays",
@@ -3093,6 +3200,7 @@ let nameI = 0;
 const callAfterHook = function(cb) {
   return cb(this[0], this[1]);
 };
+const beginSql = { text: "BEGIN" };
 const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks, resolve, reject) => {
   var _a;
   const { q: query } = q;
@@ -3110,23 +3218,64 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
     }
     sql = q.toSQL();
     const { hookSelect } = sql;
-    if (query.autoPreparedStatements) {
-      sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
-    }
-    if (query.log) {
-      logData = query.log.beforeQuery(sql);
-    }
     const { returnType = "all" } = query;
     const returns = hookSelect ? "all" : returnType;
-    const queryResult = await adapter[hookSelect ? "query" : queryMethodByReturnType[returnType]](sql);
-    if (query.patchResult) {
-      await query.patchResult(q, queryResult);
-    }
-    if (query.log) {
-      query.log.afterQuery(sql, logData);
-      sql = void 0;
+    let result;
+    let queryResult;
+    if ("text" in sql) {
+      if (query.autoPreparedStatements) {
+        sql.name = queriesNames[sql.text] || (queriesNames[sql.text] = (nameI++).toString(36));
+      }
+      if (query.log) {
+        logData = query.log.beforeQuery(sql);
+      }
+      queryResult = await adapter[hookSelect ? "query" : queryMethodByReturnType[returnType]](sql);
+      if (query.patchResult) {
+        await query.patchResult(q, queryResult);
+      }
+      if (query.log) {
+        query.log.afterQuery(sql, logData);
+        sql = void 0;
+      }
+      result = query.handleResult(q, returns, queryResult);
+    } else {
+      const queryMethod = hookSelect ? "query" : queryMethodByReturnType[returnType];
+      if (!trx) {
+        if (query.log)
+          logData = query.log.beforeQuery(beginSql);
+        await adapter.arrays(beginSql);
+        if (query.log)
+          query.log.afterQuery(beginSql, logData);
+      }
+      for (const item of sql.batch) {
+        sql = item;
+        if (query.log) {
+          logData = query.log.beforeQuery(sql);
+        }
+        const result2 = await adapter[queryMethod](sql);
+        if (queryResult) {
+          queryResult.rowCount += result2.rowCount;
+          queryResult.rows.push(...result2.rows);
+        } else {
+          queryResult = result2;
+        }
+        if (query.log) {
+          query.log.afterQuery(sql, logData);
+          sql = void 0;
+        }
+      }
+      if (!trx) {
+        if (query.log)
+          logData = query.log.beforeQuery(commitSql$1);
+        await adapter.arrays(commitSql$1);
+        if (query.log)
+          query.log.afterQuery(commitSql$1, logData);
+      }
+      if (query.patchResult) {
+        await query.patchResult(q, queryResult);
+      }
+      result = query.handleResult(q, returns, queryResult);
     }
-    let result = query.handleResult(q, returns, queryResult);
     if (afterHooks || afterCommitHooks || query.after) {
       if (queryResult.rowCount) {
         if (afterHooks || query.after) {
@@ -4029,7 +4178,7 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
     `${coalesce(
       ctx,
       query,
-      `(${makeSQL(query, ctx).text})`,
+      `(${getSqlText(makeSQL(query, ctx))})`,
       quotedAs
     )} "${as}"`
   );
@@ -4112,7 +4261,7 @@ const pushWithSql = (ctx, items) => {
       var _a;
       let inner;
       if (item.q) {
-        inner = makeSQL(item.q, ctx).text;
+        inner = getSqlText(makeSQL(item.q, ctx));
       } else {
         inner = item.s.toSQL(ctx, `"${item.n}"`);
       }
@@ -4206,9 +4355,9 @@ const fromToSql = (ctx, data, from, quotedAs) => {
     } else {
       only = from.q.only;
       if (!from.table) {
-        sql = `(${makeSQL(from, ctx).text})`;
+        sql = `(${getSqlText(makeSQL(from, ctx))})`;
       } else if (!checkIfASimpleQuery(from)) {
-        sql = `(${makeSQL(from, ctx).text})`;
+        sql = `(${getSqlText(makeSQL(from, ctx))})`;
       } else {
         sql = quoteSchemaAndTable(from.q.schema, from.table);
       }
@@ -4276,8 +4425,10 @@ const getTsVector = (ctx, data, lang, source, quotedAs) => {
   }
 };
 
+const MAX_BINDING_PARAMS = 65536;
+
 const quotedColumns = [];
-const pushInsertSql = (ctx, q, query, quotedAs) => {
+const makeInsertSql = (ctx, q, query, quotedAs) => {
   var _a, _b, _c, _d;
   const { columns, shape } = query;
   quotedColumns.length = columns.length;
@@ -4304,59 +4455,11 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
       values = [[void 0]];
     }
   }
-  ctx.sql.push(`INSERT INTO ${quotedAs}(${quotedColumns.join(", ")})`);
+  ctx.sql.push(
+    `INSERT INTO ${quotedAs}(${quotedColumns.join(", ")})`,
+    null
+  );
   const QueryClass = ctx.queryBuilder.constructor;
-  if (query.kind === "object") {
-    let sql = "";
-    for (let i = 0; i < values.length; i++) {
-      if (i)
-        sql += ", ";
-      sql += `(${encodeRow(
-        ctx,
-        q,
-        QueryClass,
-        values[i],
-        runtimeDefaults,
-        quotedAs
-      )})`;
-    }
-    ctx.sql.push(`VALUES ${sql}`);
-  } else if (query.kind === "raw") {
-    if (orchidCore.isExpression(values)) {
-      let valuesSql = values.toSQL(ctx, quotedAs);
-      if (runtimeDefaults) {
-        valuesSql += `, ${runtimeDefaults.map((fn) => orchidCore.addValue(ctx.values, fn())).join(", ")}`;
-      }
-      ctx.sql.push(`VALUES (${valuesSql})`);
-    } else {
-      let sql;
-      if (runtimeDefaults) {
-        const { values: v } = ctx;
-        sql = values.map(
-          (raw) => (
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            `(${raw.toSQL(ctx, quotedAs)}, ${runtimeDefaults.map((fn) => orchidCore.addValue(v, fn())).join(", ")})`
-          )
-        ).join(", ");
-      } else {
-        sql = values.map((raw) => `(${raw.toSQL(ctx, quotedAs)})`).join(", ");
-      }
-      ctx.sql.push(`VALUES ${sql}`);
-    }
-  } else {
-    const { from, values: v } = values;
-    const q2 = from.clone();
-    if (v) {
-      pushQueryValue(
-        q2,
-        "select",
-        new RawSQL(
-          encodeRow(ctx, q2, QueryClass, v[0], runtimeDefaults, quotedAs)
-        )
-      );
-    }
-    ctx.sql.push(makeSQL(q2, { values: ctx.values }).text);
-  }
   if (query.onConflict) {
     ctx.sql.push("ON CONFLICT");
     const { target } = query.onConflict;
@@ -4422,7 +4525,111 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
     }
   }
   pushWhereStatementSql(ctx, q, query, quotedAs);
-  return pushReturningSql(ctx, q, query, quotedAs, query.afterCreateSelect);
+  const hookSelect = pushReturningSql(
+    ctx,
+    q,
+    query,
+    quotedAs,
+    query.afterCreateSelect
+  );
+  if (query.kind === "object") {
+    const valuesSql = [];
+    let ctxValues = ctx.values;
+    const restValuesLen = ctxValues.length;
+    let currentValuesLen = restValuesLen;
+    let batch;
+    for (let i = 0; i < values.length; i++) {
+      const encodedRow = `(${encodeRow(
+        ctx,
+        ctxValues,
+        q,
+        QueryClass,
+        values[i],
+        runtimeDefaults,
+        quotedAs
+      )})`;
+      if (ctxValues.length > MAX_BINDING_PARAMS) {
+        if (ctxValues.length - currentValuesLen > MAX_BINDING_PARAMS) {
+          throw new Error(
+            `Too many parameters for a single insert row, max is ${MAX_BINDING_PARAMS}`
+          );
+        }
+        ctx.sql[1] = `VALUES ${valuesSql.join(",")}`;
+        ctxValues.length = currentValuesLen;
+        batch = orchidCore.pushOrNewArray(batch, {
+          text: ctx.sql.join(" "),
+          values: ctxValues
+        });
+        ctxValues = ctx.values = [];
+        valuesSql.length = 0;
+        i--;
+      } else {
+        currentValuesLen = ctxValues.length;
+        valuesSql.push(encodedRow);
+      }
+    }
+    if (batch) {
+      ctx.sql[1] = `VALUES ${valuesSql.join(",")}`;
+      batch.push({
+        text: ctx.sql.join(" "),
+        values: ctxValues
+      });
+      return {
+        hookSelect,
+        batch
+      };
+    } else {
+      ctx.sql[1] = `VALUES ${valuesSql.join(", ")}`;
+    }
+  } else if (query.kind === "raw") {
+    if (orchidCore.isExpression(values)) {
+      let valuesSql = values.toSQL(ctx, quotedAs);
+      if (runtimeDefaults) {
+        valuesSql += `, ${runtimeDefaults.map((fn) => orchidCore.addValue(ctx.values, fn())).join(", ")}`;
+      }
+      ctx.sql[1] = `VALUES (${valuesSql})`;
+    } else {
+      let sql;
+      if (runtimeDefaults) {
+        const { values: v } = ctx;
+        sql = values.map(
+          (raw) => (
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            `(${raw.toSQL(ctx, quotedAs)}, ${runtimeDefaults.map((fn) => orchidCore.addValue(v, fn())).join(", ")})`
+          )
+        ).join(", ");
+      } else {
+        sql = values.map((raw) => `(${raw.toSQL(ctx, quotedAs)})`).join(", ");
+      }
+      ctx.sql[1] = `VALUES ${sql}`;
+    }
+  } else {
+    const { from, values: v } = values;
+    const q2 = from.clone();
+    if (v) {
+      pushQueryValue(
+        q2,
+        "select",
+        new RawSQL(
+          encodeRow(
+            ctx,
+            ctx.values,
+            q2,
+            QueryClass,
+            v[0],
+            runtimeDefaults,
+            quotedAs
+          )
+        )
+      );
+    }
+    ctx.sql[1] = getSqlText(makeSQL(q2, { values: ctx.values }));
+  }
+  return {
+    hookSelect,
+    text: ctx.sql.join(" "),
+    values: ctx.values
+  };
 };
 const mergeColumnsSql = (columns, quotedColumns2, target, except) => {
   const notExcluded = [];
@@ -4441,20 +4648,20 @@ const mergeColumnsSql = (columns, quotedColumns2, target, except) => {
   }
   return notExcluded.length ? `DO UPDATE SET ${notExcluded.map((column) => `${column} = excluded.${column}`).join(", ")}` : "DO NOTHING";
 };
-const encodeRow = (ctx, q, QueryClass, row, runtimeDefaults, quotedAs) => {
+const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {
     if (value && typeof value === "object") {
       if (value instanceof orchidCore.Expression) {
         return value.toSQL(ctx, quotedAs);
       } else if (value instanceof QueryClass) {
-        return `(${joinSubQuery(q, value).toSQL(ctx).text})`;
+        return `(${getSqlText(joinSubQuery(q, value).toSQL(ctx))})`;
       }
     }
-    return value === void 0 ? "DEFAULT" : orchidCore.addValue(ctx.values, value);
+    return value === void 0 ? "DEFAULT" : orchidCore.addValue(values, value);
   });
   if (runtimeDefaults) {
     for (const fn of runtimeDefaults) {
-      arr.push(orchidCore.addValue(ctx.values, fn()));
+      arr.push(orchidCore.addValue(values, fn()));
     }
   }
   return arr.join(", ");
@@ -4568,7 +4775,9 @@ const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
     } else if (orchidCore.isExpression(value)) {
       return value.toSQL(ctx, quotedAs);
     } else if (value instanceof QueryClass) {
-      return `(${joinSubQuery(table, value).toSQL(ctx).text})`;
+      return `(${getSqlText(
+        joinSubQuery(table, value).toSQL(ctx)
+      )})`;
     } else if ("op" in value && "arg" in value) {
       return `"${table.q.shape[key].data.name || key}" ${value.op} ${orchidCore.addValue(ctx.values, value.arg)}`;
     }
@@ -4595,7 +4804,7 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
         ctx.aliasValue = true;
         const as = item[2];
         targets.push(
-          `LATERAL (${q.toSQL(ctx).text}) "${((_b = query.joinOverrides) == null ? void 0 : _b[as]) || as}"`
+          `LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_b = query.joinOverrides) == null ? void 0 : _b[as]) || as}"`
         );
         ctx.aliasValue = aliasValue;
       } else {
@@ -4772,11 +4981,7 @@ const makeSQL = (table, options) => {
     }
     const quotedAs2 = `"${query.as || tableName}"`;
     if (query.type === "insert") {
-      return {
-        hookSelect: pushInsertSql(ctx, table, query, `"${tableName}"`),
-        text: sql.join(" "),
-        values
-      };
+      return makeInsertSql(ctx, table, query, `"${tableName}"`);
     }
     if (query.type === "update") {
       return {
@@ -4799,9 +5004,9 @@ const makeSQL = (table, options) => {
   }
   const quotedAs = (query.as || table.table) && `"${query.as || table.table}"`;
   if (query.union) {
-    sql.push(`(${makeSQL(query.union.b, { values }).text})`);
+    sql.push(`(${getSqlText(makeSQL(query.union.b, { values }))})`);
     for (const u of query.union.u) {
-      const itemSql = orchidCore.isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : makeSQL(u.a, { values }).text;
+      const itemSql = orchidCore.isExpression(u.a) ? u.a.toSQL(ctx, quotedAs) : getSqlText(makeSQL(u.a, { values }));
       sql.push(`${u.k} (${itemSql})`);
     }
   } else {
@@ -5291,8 +5496,8 @@ for (const key in types.builtins) {
   delete defaultTypeParsers[id];
 });
 const returnArg = (arg) => arg;
-const rollbackSql$1 = { text: "ROLLBACK" };
-const commitSql$1 = { text: "COMMIT" };
+const rollbackSql = { text: "ROLLBACK" };
+const commitSql = { text: "COMMIT" };
 class Adapter {
   constructor(_a) {
     var _b = _a, { types: types2 = defaultTypeParsers } = _b, config = __objRest$1(_b, ["types"]);
@@ -5334,7 +5539,7 @@ class Adapter {
   arrays(query, types2) {
     return performQuery$1(this, query, types2, "array");
   }
-  async transaction(begin, cb, end = commitSql$1) {
+  async transaction(begin, cb, end = commitSql) {
     const client = await this.connect();
     try {
       await setSearchPath(client, this.schema);
@@ -5343,7 +5548,7 @@ class Adapter {
       try {
         result = await cb(new TransactionAdapter(this, client, this.types));
       } catch (err) {
-        await performQueryOnClient(client, rollbackSql$1, this.types);
+        await performQueryOnClient(client, rollbackSql, this.types);
         throw err;
       }
       await performQueryOnClient(client, end, this.types);
@@ -6206,7 +6411,7 @@ const createCtx = () => ({
 });
 const mapColumnValues = (columns, encoders, data) => {
   return columns.map(
-    (key) => encoders[key] ? encoders[key](data[key]) : data[key]
+    (key) => encoders[key] && !orchidCore.isExpression(data[key]) ? encoders[key](data[key]) : data[key]
   );
 };
 const handleOneData = (q, data, ctx) => {
@@ -6449,6 +6654,19 @@ class Create {
    * const createdCount = await db.table.insertMany([data, data, data]);
    * ```
    *
+   * Because of a limitation of Postgres protocol, queries having more than **65536** are going to fail in runtime.
+   * To solve this seamlessly, OrchidORM will automatically batch such queries, and wrap them into a transaction, unless they are already in a transaction.
+   *
+   * ```ts
+   * // OK: executes 2 inserts wrapped into a transaction
+   * await db.table.createMany(
+   *   Array.from({ length: 65536 }, () => ({ text: 'text' })),
+   * );
+   * ```
+   *
+   * However, this only works in the case shown above. This **won't** work if you're using the `createMany` in `with` statement,
+   * or if the insert is used as a sub-query in other query part.
+   *
    * @param data - array of records data, may have values, raw SQL, queries, relation operations
    */
   createMany(data) {
@@ -9830,106 +10048,6 @@ class Update {
   }
 }
 
-const commitSql = {
-  text: "COMMIT",
-  values: orchidCore.emptyArray
-};
-const rollbackSql = {
-  text: "ROLLBACK",
-  values: orchidCore.emptyArray
-};
-class Transaction {
-  async transaction(cbOrOptions, cb) {
-    let options;
-    let fn;
-    if (typeof cbOrOptions === "function") {
-      options = orchidCore.emptyObject;
-      fn = cbOrOptions;
-    } else {
-      options = typeof cbOrOptions === "object" ? cbOrOptions : { level: cbOrOptions };
-      fn = cb;
-    }
-    const sql = {
-      values: orchidCore.emptyArray
-    };
-    const log = this.q.log;
-    let logData;
-    let trx = this.internal.transactionStorage.getStore();
-    const transactionId = trx ? trx.transactionId + 1 : 0;
-    const callback = (adapter) => {
-      if (log)
-        log.afterQuery(sql, logData);
-      if (log)
-        logData = log.beforeQuery(commitSql);
-      if (trx) {
-        trx.transactionId = transactionId;
-        return fn();
-      }
-      trx = {
-        adapter,
-        transactionId
-      };
-      return this.internal.transactionStorage.run(trx, fn);
-    };
-    if (!trx) {
-      sql.text = `BEGIN${options.level ? ` ISOLATION LEVEL ${options.level}` : ""}${options.readOnly !== void 0 ? ` READ ${options.readOnly ? "ONLY" : "WRITE"}` : ""}${options.deferrable !== void 0 ? ` ${options.deferrable ? "" : "NOT "}DEFERRABLE` : ""}`;
-      if (log)
-        logData = log.beforeQuery(sql);
-      try {
-        const result = await this.q.adapter.transaction(sql, callback);
-        if (log)
-          log.afterQuery(commitSql, logData);
-        const { afterCommit } = trx;
-        if (afterCommit) {
-          const promises = [];
-          for (let i = 0, len = afterCommit.length; i < len; i += 2) {
-            const q = afterCommit[i];
-            const result2 = afterCommit[i + 1];
-            for (const fn2 of afterCommit[i + 2]) {
-              promises.push(fn2(result2, q));
-            }
-          }
-          await Promise.all(promises);
-        }
-        return result;
-      } catch (err) {
-        if (log)
-          log.afterQuery(rollbackSql, logData);
-        throw err;
-      }
-    } else {
-      try {
-        sql.text = `SAVEPOINT "${transactionId}"`;
-        if (log)
-          logData = log.beforeQuery(sql);
-        const { adapter } = trx;
-        await adapter.query(sql);
-        let result;
-        try {
-          result = await callback(adapter);
-        } catch (err) {
-          sql.text = `ROLLBACK TO SAVEPOINT "${transactionId}"`;
-          if (log)
-            logData = log.beforeQuery(sql);
-          await adapter.query(sql);
-          if (log)
-            log.afterQuery(sql, logData);
-          throw err;
-        }
-        sql.text = `RELEASE SAVEPOINT "${transactionId}"`;
-        if (log)
-          logData = log.beforeQuery(sql);
-        await adapter.query(sql);
-        if (log)
-          log.afterQuery(sql, logData);
-        return result;
-      } finally {
-        trx.transactionId = transactionId - 1;
-      }
-    }
-  }
-}
-
 var __defProp$2 = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -10604,7 +10722,7 @@ class OrExpression extends orchidCore.Expression {
           if (sql)
             res.push(sql);
         } else {
-          res.push(`(${arg.toSQL(ctx).text})`);
+          res.push(`(${getSqlText(arg.toSQL(ctx))})`);
         }
       }
     }
@@ -12190,6 +12308,7 @@ exports.columnCode = columnCode;
 exports.columnForeignKeysToCode = columnForeignKeysToCode;
 exports.columnIndexesToCode = columnIndexesToCode;
 exports.columnsShapeToCode = columnsShapeToCode;
+exports.commitSql = commitSql$1;
 exports.constraintInnerToCode = constraintInnerToCode;
 exports.constraintToCode = constraintToCode;
 exports.copyTableData = copyTableData;
@@ -12204,6 +12323,7 @@ exports.getColumnTypes = getColumnTypes;
 exports.getPrimaryKeys = getPrimaryKeys;
 exports.getQueryAs = getQueryAs;
 exports.getShapeFromSelect = getShapeFromSelect;
+exports.getSqlText = getSqlText;
 exports.handleResult = handleResult;
 exports.identityToCode = identityToCode;
 exports.indexInnerToCode = indexInnerToCode;
@@ -12243,6 +12363,7 @@ exports.quoteString = quoteString;
 exports.raw = raw;
 exports.referencesArgsToCode = referencesArgsToCode;
 exports.resolveSubQueryCallback = resolveSubQueryCallback;
+exports.rollbackSql = rollbackSql$1;
 exports.saveSearchAlias = saveSearchAlias;
 exports.setParserForSelectedString = setParserForSelectedString;
 exports.setQueryObjectValue = setQueryObjectValue;