pqb 0.27.7 → 0.29.0

package/dist/index.js

@@ -101,10 +101,23 @@ const countSelect = [new RawSQL("count(*)")];
 function sqlQueryArgsToExpression(args) {
   return Array.isArray(args[0]) ? new RawSQL(args) : args[0];
 }
+const sqlFn = (...args) => {
+  const arg = args[0];
+  if (Array.isArray(arg)) {
+    return new RawSQL(args);
+  }
+  if (typeof args[0] === "string") {
+    return new RawSQL(args[0]);
+  }
+  if (args[1] !== void 0) {
+    return new RawSQL(args[1], arg);
+  }
+  return (...args2) => new RawSQL(args2, arg);
+};
 
 var __defProp$h = Object.defineProperty;
-var __defProps$b = Object.defineProperties;
-var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
 var __hasOwnProp$i = Object.prototype.hasOwnProperty;
 var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
@@ -120,7 +133,7 @@ var __spreadValues$h = (a, b) => {
     }
   return a;
 };
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 class ColumnType extends orchidCore.ColumnTypeBase {
   /**
    * Mark the column as a primary key.
@@ -135,6 +148,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    *   readonly table = 'table';
    *   columns = this.setColumns((t) => ({
    *     id: t.uuid().primaryKey(),
+   *     // database-level name can be passed:
+   *     id: t.uuid().primaryKey('primary_key_name'),
    *   }));
    * }
    *
@@ -142,21 +157,76 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * db.table.find('97ba9e78-7510-415a-9c03-23d440aec443');
    * ```
    *
-   * @param options - to specify a constraint name
+   * @param name - to specify a constraint name
    */
-  primaryKey(options) {
-    var _a;
-    return orchidCore.setColumnData(this, "primaryKey", (_a = options == null ? void 0 : options.name) != null ? _a : true);
+  primaryKey(name) {
+    return orchidCore.setColumnData(this, "primaryKey", name != null ? name : true);
   }
   foreignKey(fnOrTable, column, options = orchidCore.emptyObject) {
-    const item = typeof fnOrTable === "string" ? __spreadValues$h({ table: fnOrTable, columns: [column] }, options) : __spreadValues$h({ fn: fnOrTable, columns: [column] }, options);
-    return orchidCore.pushColumnData(this, "foreignKeys", item);
+    return orchidCore.pushColumnData(this, "foreignKeys", {
+      fnOrTable,
+      foreignColumns: [column],
+      options
+    });
   }
   toSQL() {
     return this.dataType;
   }
-  index(options = {}) {
-    return orchidCore.pushColumnData(this, "indexes", options);
+  /**
+   * Add an index to the column.
+   *
+   * ```ts
+   * import { change } from '../dbScript';
+   *
+   * change(async (db) => {
+   *   await db.createTable('table', (t) => ({
+   *     // add an index to the name column with default settings:
+   *     name: t.text().index(),
+   *     // options are described below:
+   *     name: t.text().index({ ...options }),
+   *     // with a database-level name:
+   *     name: t.text().index('custom_index_name'),
+   *     // with name and options:
+   *     name: t.text().index('custom_index_name', { ...options }),
+   *   }));
+   * });
+   * ```
+   *
+   * Possible options are:
+   *
+   * ```ts
+   * type IndexOptions = {
+   *   // NULLS NOT DISTINCT: availabe in Postgres 15+, makes sense only for unique index
+   *   nullsNotDistinct?: true;
+   *   // index algorithm to use such as GIST, GIN
+   *   using?: string;
+   *   // specify collation:
+   *   collate?: string;
+   *   // see `opclass` in the Postgres document for creating the index
+   *   opclass?: string;
+   *   // specify index order such as ASC NULLS FIRST, DESC NULLS LAST
+   *   order?: string;
+   *   // include columns to an index to optimize specific queries
+   *   include?: MaybeArray<string>;
+   *   // see "storage parameters" in the Postgres document for creating an index, for example, 'fillfactor = 70'
+   *   with?: string;
+   *   // The tablespace in which to create the index. If not specified, default_tablespace is consulted, or temp_tablespaces for indexes on temporary tables.
+   *   tablespace?: string;
+   *   // WHERE clause to filter records for the index
+   *   where?: string;
+   *   // mode is for dropping the index
+   *   mode?: 'CASCADE' | 'RESTRICT';
+   * };
+   * ```
+   *
+   * @param args
+   */
+  index(...args) {
+    var _a;
+    return orchidCore.pushColumnData(this, "indexes", {
+      options: (_a = typeof args[0] === "string" ? args[1] : args[0]) != null ? _a : orchidCore.emptyObject,
+      name: typeof args[0] === "string" ? args[0] : void 0
+    });
   }
   /**
    * `searchIndex` is designed for [full text search](/guide/text-search).
@@ -260,11 +330,19 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    *
    * @param options - index options
    */
-  searchIndex(options) {
-    return orchidCore.pushColumnData(this, "indexes", __spreadValues$h(__spreadValues$h({}, options), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }));
+  searchIndex(...args) {
+    return orchidCore.pushColumnData(this, "indexes", {
+      options: __spreadValues$h(__spreadValues$h({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      name: typeof args[0] === "string" ? args[0] : void 0
+    });
   }
-  unique(options = {}) {
-    return orchidCore.pushColumnData(this, "indexes", __spreadProps$b(__spreadValues$h({}, options), { unique: true }));
+  unique(...args) {
+    return orchidCore.pushColumnData(this, "indexes", {
+      options: __spreadProps$9(__spreadValues$h({}, typeof args[0] === "string" ? args[1] : args[0]), {
+        unique: true
+      }),
+      name: typeof args[0] === "string" ? args[0] : void 0
+    });
   }
   comment(comment) {
     return orchidCore.setColumnData(this, "comment", comment);
@@ -303,8 +381,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
 }
 
 var __defProp$g = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
 var __hasOwnProp$h = Object.prototype.hasOwnProperty;
 var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
@@ -320,7 +398,7 @@ var __spreadValues$g = (a, b) => {
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const knownDefaults = {
   current_timestamp: "now()",
   "transaction_timestamp()": "now()"
@@ -336,7 +414,7 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$a(__spreadValues$g({}, params), {
+  Object.assign(column.data, __spreadProps$8(__spreadValues$g({}, params), {
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
@@ -346,15 +424,6 @@ const instantiateColumn = (typeFn, params) => {
   }));
   return column;
 };
-const getConstraintKind = (it) => {
-  let num = 0;
-  for (const key in it) {
-    if ((key === "references" || key === "check") && it[key] !== void 0) {
-      num++;
-    }
-  }
-  return num === 1 ? it.references ? "foreignKey" : "check" : "constraint";
-};
 
 const isDefaultTimeStamp = (item) => {
   if (item.dataType !== "timestamptz")
@@ -382,7 +451,7 @@ const combineCodeElements = (input) => {
   }
   return output;
 };
-const columnsShapeToCode = (shape, tableData, t, m) => {
+const columnsShapeToCode = (shape, t) => {
   const hasTimestamps = "createdAt" in shape && isDefaultTimeStamp(shape.createdAt) && "updatedAt" in shape && isDefaultTimeStamp(shape.updatedAt);
   const code = [];
   for (const key in shape) {
@@ -399,33 +468,40 @@ const columnsShapeToCode = (shape, tableData, t, m) => {
   if (hasTimestamps) {
     code.push(`...${t}.timestamps(),`);
   }
-  const { primaryKey, indexes, constraints } = tableData;
-  if (primaryKey) {
-    code.push(primaryKeyToCode(primaryKey, t));
+  return code;
+};
+const pushTableDataCode = (code, ast) => {
+  const lines = [];
+  if (ast.primaryKey) {
+    lines.push([primaryKeyInnerToCode(ast.primaryKey, "t") + ","]);
   }
-  if (indexes) {
-    for (const index of indexes) {
-      code.push(...indexToCode(index, t));
+  if (ast.indexes) {
+    for (const index of ast.indexes) {
+      lines.push(indexToCode(index, "t"));
     }
   }
-  if (constraints) {
-    for (const item of constraints) {
-      code.push(...constraintToCode(item, t, m));
+  if (ast.constraints) {
+    for (const constraint of ast.constraints) {
+      lines.push(constraintToCode(constraint, "t", true));
     }
   }
+  if (lines.length > 1) {
+    code.push("(t) => [", ...lines, "],");
+  } else if (lines[0].length === 1 && typeof lines[0][0] === "string") {
+    code.push("(t) => " + lines[0][0]);
+  } else {
+    code.push("(t) => ", lines[0]);
+  }
   return code;
 };
-const primaryKeyToCode = (primaryKey, t) => {
-  return `...${primaryKeyInnerToCode(primaryKey, t)},`;
-};
 const primaryKeyInnerToCode = (primaryKey, t) => {
-  var _a;
-  const name = (_a = primaryKey.options) == null ? void 0 : _a.name;
-  return `${t}.primaryKey([${primaryKey.columns.map(orchidCore.singleQuote).join(", ")}]${name ? `, { name: ${orchidCore.singleQuote(name)} }` : ""})`;
+  const name = primaryKey.name;
+  return `${t}.primaryKey([${primaryKey.columns.map(orchidCore.singleQuote).join(", ")}]${name ? `, ${orchidCore.singleQuote(name)}` : ""})`;
 };
-const indexToCode = (index, t) => {
+const indexToCode = (index, t, prefix) => {
   const code = indexInnerToCode(index, t);
-  code[0] = `...${code[0]}`;
+  if (prefix)
+    code[0] = prefix + code[0];
   const last = code[code.length - 1];
   if (typeof last === "string" && !last.endsWith(","))
     orchidCore.addCode(code, ",");
@@ -437,6 +513,19 @@ const indexInnerToCode = (index, t) => {
     `${t}.${index.options.tsVector ? "searchIndex" : index.options.unique ? "unique" : "index"}(`
   );
   const columnOptions = ["collate", "opclass", "order", "weight"];
+  const indexOptionsKeys = [
+    index.options.tsVector ? "unique" : void 0,
+    "using",
+    "nullsNotDistinct",
+    "include",
+    "with",
+    "tablespace",
+    "where",
+    "language",
+    "languageColumn",
+    "dropMode"
+  ];
+  const hasOptions = indexOptionsKeys.some((key) => key && index.options[key]);
   const columnsMultiline = index.columns.some((column) => {
     for (const key in column) {
       if (key !== "column" && column[key] !== void 0)
@@ -448,13 +537,13 @@ const indexInnerToCode = (index, t) => {
     const objects = [];
     for (const column of index.columns) {
       const expr = "column" in column ? column.column : column.expression;
-      let hasOptions = false;
+      let hasOptions2 = false;
       for (const key in column) {
         if (key !== "column") {
-          hasOptions = true;
+          hasOptions2 = true;
         }
       }
-      if (!hasOptions) {
+      if (!hasOptions2) {
         objects.push(`${orchidCore.singleQuote(expr)},`);
       } else {
         const props = [
@@ -471,38 +560,29 @@ const indexInnerToCode = (index, t) => {
         objects.push("{", props, "},");
       }
     }
-    code.push(["[", objects, "]"]);
+    code.push(["[", objects, hasOptions || index.name ? "]," : "]"]);
+    if (index.name) {
+      orchidCore.addCode(code, `  ${orchidCore.singleQuote(index.name)},`);
+    }
   } else {
     orchidCore.addCode(
       code,
       `[${index.columns.map((it) => orchidCore.singleQuote(it.column)).join(", ")}]`
     );
+    if (index.name) {
+      orchidCore.addCode(code, `, ${orchidCore.singleQuote(index.name)}`);
+    }
   }
-  const indexOptionsKeys = [
-    "name",
-    "using",
-    "nullsNotDistinct",
-    "include",
-    "with",
-    "tablespace",
-    "where",
-    "language",
-    "languageColumn",
-    "dropMode"
-  ];
-  if (index.options.tsVector && index.options.unique) {
-    indexOptionsKeys.unshift("unique");
-  }
-  if (indexOptionsKeys.some((key) => index.options[key])) {
+  if (hasOptions) {
     if (columnsMultiline) {
-      const columns = code[code.length - 1];
-      columns[columns.length - 1] += ",";
       code.push(["{"]);
     } else {
       orchidCore.addCode(code, ", {");
     }
     const options = [];
     for (const key of indexOptionsKeys) {
+      if (!key)
+        continue;
       const value = index.options[key];
       if (value === null || value === void 0)
         continue;
@@ -524,46 +604,26 @@ const indexInnerToCode = (index, t) => {
   }
   return code;
 };
-const constraintToCode = (item, t, m) => {
+const constraintToCode = (item, t, m, prefix) => {
   const code = constraintInnerToCode(item, t, m);
-  code[0] = `...${code[0]}`;
+  if (prefix)
+    code[0] = prefix + code[0];
   const last = code[code.length - 1];
   if (typeof last === "string" && !last.endsWith(","))
     code[code.length - 1] += ",";
   return code;
 };
 const constraintInnerToCode = (item, t, m) => {
-  const kind = getConstraintKind(item);
-  if (kind === "foreignKey" && item.references) {
+  if (item.references) {
     return [
       `${t}.foreignKey(`,
       referencesArgsToCode(item.references, item.name, m),
       "),"
     ];
-  } else if (kind === "check" && item.check) {
-    return [
-      `${t}.check(${item.check.toCode(t)}${item.name ? `, { name: '${item.name}' }` : ""})`
-    ];
-  } else {
-    return [`${t}.constraint({`, constraintPropsToCode(t, item, m), "}),"];
-  }
-};
-const constraintPropsToCode = (t, item, m) => {
-  const props = [];
-  if (item.name) {
-    props.push(`name: ${orchidCore.singleQuote(item.name)},`);
-  }
-  if (item.references) {
-    props.push(
-      `references: [`,
-      referencesArgsToCode(item.references, false, m),
-      "],"
-    );
-  }
-  if (item.check) {
-    props.push(`check: ${item.check.toCode(t)},`);
   }
-  return props;
+  return [
+    `${t}.check(${item.check.toCode(t)}${item.name ? `, ${orchidCore.singleQuote(item.name)}` : ""})`
+  ];
 };
 const referencesArgsToCode = ({
   columns,
@@ -607,9 +667,12 @@ const columnForeignKeysToCode = (foreignKeys, migration) => {
   }
   return code;
 };
-const foreignKeyArgumentToCode = (foreignKey, migration) => {
+const foreignKeyArgumentToCode = ({
+  fnOrTable,
+  foreignColumns,
+  options = orchidCore.emptyObject
+}, migration) => {
   const code = [];
-  let fnOrTable = "fn" in foreignKey ? foreignKey.fn : foreignKey.table;
   if (migration && typeof fnOrTable !== "string") {
     const { schema, table } = new (fnOrTable())();
     fnOrTable = schema ? `${schema}.${table}` : table;
@@ -617,18 +680,18 @@ const foreignKeyArgumentToCode = (foreignKey, migration) => {
   code.push(
     typeof fnOrTable === "string" ? orchidCore.singleQuote(fnOrTable) : fnOrTable.toString()
   );
-  orchidCore.addCode(code, `, ${orchidCore.singleQuote(foreignKey.columns[0])}`);
-  const hasOptions = foreignKey.name || foreignKey.match || foreignKey.onUpdate || foreignKey.onDelete;
+  orchidCore.addCode(code, `, ${orchidCore.singleQuote(foreignColumns[0])}`);
+  const hasOptions = options.name || options.match || options.onUpdate || options.onDelete;
   if (hasOptions) {
     const arr = [];
-    if (foreignKey.name)
-      arr.push(`name: ${orchidCore.singleQuote(foreignKey.name)},`);
-    if (foreignKey.match)
-      arr.push(`match: ${orchidCore.singleQuote(foreignKey.match)},`);
-    if (foreignKey.onUpdate)
-      arr.push(`onUpdate: ${orchidCore.singleQuote(foreignKey.onUpdate)},`);
-    if (foreignKey.onDelete)
-      arr.push(`onDelete: ${orchidCore.singleQuote(foreignKey.onDelete)},`);
+    if (options.name)
+      arr.push(`name: ${orchidCore.singleQuote(options.name)},`);
+    if (options.match)
+      arr.push(`match: ${orchidCore.singleQuote(options.match)},`);
+    if (options.onUpdate)
+      arr.push(`onUpdate: ${orchidCore.singleQuote(options.onUpdate)},`);
+    if (options.onDelete)
+      arr.push(`onDelete: ${orchidCore.singleQuote(options.onDelete)},`);
     orchidCore.addCode(code, ", {");
     code.push(arr);
     orchidCore.addCode(code, "}");
@@ -637,31 +700,31 @@ const foreignKeyArgumentToCode = (foreignKey, migration) => {
 };
 const columnIndexesToCode = (indexes) => {
   const code = [];
-  for (const index of indexes) {
-    orchidCore.addCode(code, `.${index.unique ? "unique" : "index"}(`);
+  for (const { options, name } of indexes) {
+    orchidCore.addCode(code, `.${options.unique ? "unique" : "index"}(`);
     const arr = [];
-    if (index.collate)
-      arr.push(`collate: ${orchidCore.singleQuote(index.collate)},`);
-    if (index.opclass)
-      arr.push(`opclass: ${orchidCore.singleQuote(index.opclass)},`);
-    if (index.order)
-      arr.push(`order: ${orchidCore.singleQuote(index.order)},`);
-    if (index.name)
-      arr.push(`name: ${orchidCore.singleQuote(index.name)},`);
-    if (index.using)
-      arr.push(`using: ${orchidCore.singleQuote(index.using)},`);
-    if (index.include)
+    if (options.collate)
+      arr.push(`collate: ${orchidCore.singleQuote(options.collate)},`);
+    if (options.opclass)
+      arr.push(`opclass: ${orchidCore.singleQuote(options.opclass)},`);
+    if (options.order)
+      arr.push(`order: ${orchidCore.singleQuote(options.order)},`);
+    if (name)
+      arr.push(`name: ${orchidCore.singleQuote(name)},`);
+    if (options.using)
+      arr.push(`using: ${orchidCore.singleQuote(options.using)},`);
+    if (options.include)
       arr.push(
-        `include: ${typeof index.include === "string" ? orchidCore.singleQuote(index.include) : `[${index.include.map(orchidCore.singleQuote).join(", ")}]`},`
+        `include: ${typeof options.include === "string" ? orchidCore.singleQuote(options.include) : `[${options.include.map(orchidCore.singleQuote).join(", ")}]`},`
       );
-    if (index.nullsNotDistinct)
+    if (options.nullsNotDistinct)
       arr.push(`nullsNotDistinct: true,`);
-    if (index.with)
-      arr.push(`with: ${orchidCore.singleQuote(index.with)},`);
-    if (index.tablespace)
-      arr.push(`tablespace: ${orchidCore.singleQuote(index.tablespace)},`);
-    if (index.where)
-      arr.push(`where: ${orchidCore.singleQuote(index.where)},`);
+    if (options.with)
+      arr.push(`with: ${orchidCore.singleQuote(options.with)},`);
+    if (options.tablespace)
+      arr.push(`tablespace: ${orchidCore.singleQuote(options.tablespace)},`);
+    if (options.where)
+      arr.push(`where: ${orchidCore.singleQuote(options.where)},`);
     if (arr.length) {
       orchidCore.addCode(code, "{");
       orchidCore.addCode(code, arr);
@@ -671,8 +734,8 @@ const columnIndexesToCode = (indexes) => {
   }
   return code;
 };
-const columnCheckToCode = (t, { sql, options }) => {
-  return `.check(${sql.toCode(t)}${(options == null ? void 0 : options.name) ? `, { name: '${options.name}' }` : ""})`;
+const columnCheckToCode = (t, { sql, name }) => {
+  return `.check(${sql.toCode(t)}${name ? `, { name: '${name}' }` : ""})`;
 };
 const identityToCode = (identity, dataType) => {
   const code = [];
@@ -717,7 +780,7 @@ const columnCode = (type, t, code, migration, data = type.data, skip) => {
   if (data.primaryKey) {
     orchidCore.addCode(
       code,
-      `.primaryKey(${data.primaryKey === true ? "" : `{ name: '${data.primaryKey}' }`})`
+      `.primaryKey(${data.primaryKey === true ? "" : orchidCore.singleQuote(data.primaryKey)})`
     );
   }
   if (data.foreignKeys) {
@@ -1205,8 +1268,8 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
 };
 
 var __defProp$f = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
 var __hasOwnProp$g = Object.prototype.hasOwnProperty;
 var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
@@ -1222,7 +1285,7 @@ var __spreadValues$f = (a, b) => {
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
@@ -1284,8 +1347,8 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$9(__spreadValues$f({}, q.q), {
-          joinedShapes: __spreadProps$9(__spreadValues$f(__spreadValues$f({}, query.joinedShapes), q.q.joinedShapes), {
+        __spreadProps$7(__spreadValues$f({}, q.q), {
+          joinedShapes: __spreadProps$7(__spreadValues$f(__spreadValues$f({}, query.joinedShapes), q.q.joinedShapes), {
             [table.q.as || table.table]: table.q.shape
           })
         }),
@@ -1442,8 +1505,8 @@ const getIsJoinSubQuery = (query) => {
 };
 
 var __defProp$e = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
 var __hasOwnProp$f = Object.prototype.hasOwnProperty;
 var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
@@ -1459,7 +1522,7 @@ var __spreadValues$e = (a, b) => {
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
   var _a;
   if (typeof first === "string") {
@@ -1491,7 +1554,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$8(__spreadValues$e({}, joinToQ.joinedShapes), {
+      const joinedShapes = __spreadProps$6(__spreadValues$e({}, joinToQ.joinedShapes), {
         [joinToQ.as || joinTo.table]: joinTo.shape
       });
       const r = args[0](
@@ -1518,7 +1581,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
         pushQueryArray(q, "or", query.or);
       }
     }
-    const joinedShapes = __spreadProps$8(__spreadValues$e({}, joinTo.q.joinedShapes), {
+    const joinedShapes = __spreadProps$6(__spreadValues$e({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
     const r = args[0](
@@ -1547,8 +1610,8 @@ const makeJoinQueryBuilder = (joinedQuery, joinedShapes, joinTo) => {
 };
 
 var __defProp$d = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
 var __hasOwnProp$e = Object.prototype.hasOwnProperty;
 var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
@@ -1564,7 +1627,7 @@ var __spreadValues$d = (a, b) => {
     }
   return a;
 };
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const _join = (q, require2, type, first, args) => {
   var _a, _b;
   let joinKey;
@@ -1665,7 +1728,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
         const t = Object.create(q.queryBuilder);
         t.table = arg;
         t.shape = shape;
-        t.q = __spreadProps$7(__spreadValues$d({}, t.q), {
+        t.q = __spreadProps$5(__spreadValues$d({}, t.q), {
           shape
         });
         t.baseQuery = t;
@@ -3302,13 +3365,13 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
   }
   if (query.onConflict) {
     ctx.sql.push("ON CONFLICT");
-    const { expr, type } = query.onConflict;
-    if (expr) {
-      if (typeof expr === "string") {
-        ctx.sql.push(`("${((_b = shape[expr]) == null ? void 0 : _b.data.name) || expr}")`);
-      } else if (Array.isArray(expr)) {
+    const { target } = query.onConflict;
+    if (target) {
+      if (typeof target === "string") {
+        ctx.sql.push(`("${((_b = shape[target]) == null ? void 0 : _b.data.name) || target}")`);
+      } else if (Array.isArray(target)) {
         ctx.sql.push(
-          `(${expr.reduce(
+          `(${target.reduce(
             (sql, item, i) => {
               var _a2;
               return sql + (i ? ", " : "") + `"${((_a2 = shape[item]) == null ? void 0 : _a2.data.name) || item}"`;
@@ -3316,68 +3379,67 @@ const pushInsertSql = (ctx, q, query, quotedAs) => {
             ""
           )})`
         );
+      } else if ("toSQL" in target) {
+        ctx.sql.push(target.toSQL(ctx, quotedAs));
       } else {
-        ctx.sql.push(expr.toSQL(ctx, quotedAs));
+        ctx.sql.push(`ON CONSTRAINT "${target.constraint}"`);
       }
-    } else if (type === "merge") {
-      const { indexes } = q.internal;
-      const quotedUniques = columns.reduce((arr, key, i) => {
-        var _a2, _b2;
-        const unique = (
-          // check column index
-          ((_b2 = ((_a2 = shape[key]) == null ? void 0 : _a2.data).indexes) == null ? void 0 : _b2.some(
-            (index) => index.unique
-          )) || // check table composite indexes
-          (indexes == null ? void 0 : indexes.some(
-            (index) => index.columns.some(
-              (item) => "column" in item && item.column === key
-            )
-          ))
-        );
-        if (unique)
-          arr.push(quotedColumns[i]);
-        return arr;
-      }, []);
-      ctx.sql.push(`(${quotedUniques.join(", ")})`);
     }
-    if (type === "ignore") {
-      ctx.sql.push("DO NOTHING");
-    } else if (type === "merge") {
-      let set;
-      const { update } = query.onConflict;
-      if (update) {
-        if (typeof update === "string") {
-          const name = ((_c = shape[update]) == null ? void 0 : _c.data.name) || update;
-          set = `"${name}" = excluded."${name}"`;
-        } else if (Array.isArray(update)) {
-          set = update.reduce((sql, item, i) => {
+    if ("merge" in query.onConflict) {
+      let sql;
+      const { merge } = query.onConflict;
+      if (merge) {
+        if (typeof merge === "string") {
+          const name = ((_c = shape[merge]) == null ? void 0 : _c.data.name) || merge;
+          sql = `"${name}" = excluded."${name}"`;
+        } else if ("except" in merge) {
+          const notExcluded = [];
+          const except = orchidCore.toArray(merge.except);
+          for (let i = 0; i < columns.length; i++) {
+            if (!except.includes(columns[i])) {
+              notExcluded.push(quotedColumns[i]);
+            }
+          }
+          sql = mergeColumnsSql(notExcluded);
+        } else {
+          sql = merge.reduce((sql2, item, i) => {
             var _a2;
             const name = ((_a2 = shape[item]) == null ? void 0 : _a2.data.name) || item;
-            return sql + (i ? ", " : "") + `"${name}" = excluded."${name}"`;
+            return sql2 + (i ? ", " : "") + `"${name}" = excluded."${name}"`;
           }, "");
-        } else if (orchidCore.isExpression(update)) {
-          set = update.toSQL(ctx, quotedAs);
-        } else {
-          const arr = [];
-          for (const key in update) {
-            arr.push(
-              `"${((_d = shape[key]) == null ? void 0 : _d.data.name) || key}" = ${addValue(
-                ctx.values,
-                update[key]
-              )}`
-            );
-          }
-          set = arr.join(", ");
         }
       } else {
-        set = quotedColumns.map((column) => `${column} = excluded.${column}`).join(", ");
+        sql = mergeColumnsSql(quotedColumns);
       }
-      ctx.sql.push("DO UPDATE SET", set);
+      ctx.sql.push("DO UPDATE SET", sql);
+    } else if (query.onConflict.set) {
+      let sql;
+      const { set } = query.onConflict;
+      if (orchidCore.isExpression(set)) {
+        sql = set.toSQL(ctx, quotedAs);
+      } else {
+        const arr = [];
+        for (const key in set) {
+          arr.push(
+            `"${((_d = shape[key]) == null ? void 0 : _d.data.name) || key}" = ${addValue(
+              ctx.values,
+              set[key]
+            )}`
+          );
+        }
+        sql = arr.join(", ");
+      }
+      ctx.sql.push("DO UPDATE SET", sql);
+    } else {
+      ctx.sql.push("DO NOTHING");
     }
   }
   pushWhereStatementSql(ctx, q, query, quotedAs);
   return pushReturningSql(ctx, q, query, quotedAs, query.afterCreateSelect);
 };
+const mergeColumnsSql = (quotedColumns2) => {
+  return quotedColumns2.map((column) => `${column} = excluded.${column}`).join(", ");
+};
 const encodeRow = (ctx, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {
     if (typeof value === "function") {
@@ -4012,10 +4074,27 @@ const extendQuery = (q, methods) => {
   cloned.q = getClonedQueryData(q.q);
   return cloned;
 };
+const getPrimaryKeys = (q) => {
+  var _a, _b;
+  return (_b = (_a = q.internal).primaryKeys) != null ? _b : _a.primaryKeys = collectPrimaryKeys(q);
+};
+const collectPrimaryKeys = (q) => {
+  const primaryKeys = [];
+  const { shape } = q.q;
+  for (const key in shape) {
+    if (shape[key].data.primaryKey) {
+      primaryKeys.push(key);
+    }
+  }
+  if (q.internal.primaryKeys) {
+    primaryKeys.push(...q.internal.primaryKeys);
+  }
+  return primaryKeys;
+};
 
 var __defProp$a = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$b = Object.getOwnPropertySymbols;
 var __hasOwnProp$b = Object.prototype.hasOwnProperty;
 var __propIsEnum$b = Object.prototype.propertyIsEnumerable;
@@ -4031,7 +4110,7 @@ var __spreadValues$a = (a, b) => {
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 function setQueryOperators(query, operators) {
   const q = query.q;
   if (q.operators) {
@@ -4090,7 +4169,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$6(__spreadValues$a({}, base), {
+const boolean = __spreadProps$4(__spreadValues$a({}, base), {
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
@@ -4098,7 +4177,7 @@ const boolean = __spreadProps$6(__spreadValues$a({}, base), {
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
 });
-const numeric = __spreadProps$6(__spreadValues$a({}, base), {
+const numeric = __spreadProps$4(__spreadValues$a({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -4119,7 +4198,7 @@ const numeric = __spreadProps$6(__spreadValues$a({}, base), {
     )}`
   )
 });
-const text = __spreadProps$6(__spreadValues$a({}, base), {
+const text = __spreadProps$4(__spreadValues$a({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -4139,7 +4218,7 @@ const text = __spreadProps$6(__spreadValues$a({}, base), {
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue(value, ctx, quotedAs)}`
   )
 });
-const json = __spreadProps$6(__spreadValues$a({}, base), {
+const json = __spreadProps$4(__spreadValues$a({}, base), {
   jsonPath: make(
     (key, [path, op, value], ctx, quotedAs) => `jsonb_path_query_first(${key}, '${path}') #>> '{}' ${op} ${value === null ? "null" : quoteValue(value, ctx, quotedAs, true)}`
   ),
@@ -4333,8 +4412,8 @@ class BigSerialColumn extends NumberAsStringBaseColumn {
 }
 
 var __defProp$9 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
 var __hasOwnProp$a = Object.prototype.hasOwnProperty;
 var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
@@ -4350,7 +4429,7 @@ var __spreadValues$9 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 class TextBaseColumn extends ColumnType {
   constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
@@ -4709,8 +4788,11 @@ class UUIDColumn extends ColumnType {
     this.dataType = "uuid";
     this.operators = Operators.text;
   }
-  primaryKey() {
-    const column = super.primaryKey();
+  /**
+   * see {@link ColumnType.primaryKey}
+   */
+  primaryKey(name) {
+    const column = super.primaryKey(name);
     if (!column.data.default)
       column.data.default = uuidDefault;
     return column;
@@ -4723,7 +4805,7 @@ class UUIDColumn extends ColumnType {
       `uuid()`,
       m,
       // don't output the default default
-      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$5(__spreadValues$9({}, data), { default: void 0 }) : data
+      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$3(__spreadValues$9({}, data), { default: void 0 }) : data
     );
   }
 }
@@ -4795,8 +4877,6 @@ class DomainColumn extends CustomTypeColumn {
 }
 
 var __defProp$8 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
 var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
 var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -4812,19 +4892,11 @@ var __spreadValues$8 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
-const newTableData = () => ({});
-let tableData = newTableData();
-const getTableData = () => tableData;
-const resetTableData = (data = newTableData()) => {
-  tableData = data;
-};
-const getColumnTypes = (types, fn, nowSQL, language, data = newTableData()) => {
+const getColumnTypes = (types, fn, nowSQL, language) => {
   if (nowSQL)
     orchidCore.setDefaultNowFn(nowSQL);
   if (language)
     orchidCore.setDefaultLanguage(language);
-  resetTableData(data);
   return fn(types);
 };
 const makeColumnTypes = (schema) => {
@@ -4836,20 +4908,7 @@ const makeColumnTypes = (schema) => {
       orchidCore.setCurrentColumnName(name);
       return this;
     },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    sql(...args) {
-      const arg = args[0];
-      if (Array.isArray(arg)) {
-        return new RawSQL(args);
-      }
-      if (typeof args[0] === "string") {
-        return new RawSQL(args[0]);
-      }
-      if (args[1] !== void 0) {
-        return new RawSQL(args[1], arg);
-      }
-      return (...args2) => new RawSQL(args2, arg);
-    },
+    sql: sqlFn,
     smallint: schema.smallint,
     integer: schema.integer,
     bigint: schema.bigint,
@@ -4946,66 +5005,6 @@ const makeColumnTypes = (schema) => {
     },
     domain(dataType) {
       return new DomainColumn(schema, dataType);
-    },
-    primaryKey(columns, options) {
-      tableData.primaryKey = { columns, options };
-      return orchidCore.emptyObject;
-    },
-    index(columns, options = {}) {
-      var _a;
-      const index = {
-        columns: orchidCore.toArray(columns).map(
-          (column) => typeof column === "string" ? { column } : column
-        ),
-        options
-      };
-      ((_a = tableData.indexes) != null ? _a : tableData.indexes = []).push(index);
-      return orchidCore.emptyObject;
-    },
-    unique(columns, options) {
-      return this.index(columns, __spreadProps$4(__spreadValues$8({}, options), { unique: true }));
-    },
-    /**
-     * See {@link ColumnType.searchIndex}
-     */
-    searchIndex(columns, options) {
-      return this.index(columns, __spreadProps$4(__spreadValues$8({ using: "gin" }, options), { tsVector: true }));
-    },
-    constraint({ name, references, check, dropMode }) {
-      var _a;
-      ((_a = tableData.constraints) != null ? _a : tableData.constraints = []).push({
-        name,
-        references: references ? {
-          columns: references[0],
-          fnOrTable: references[1],
-          foreignColumns: references[2],
-          options: references[3]
-        } : void 0,
-        check,
-        dropMode
-      });
-      return orchidCore.emptyObject;
-    },
-    foreignKey(columns, fnOrTable, foreignColumns, options) {
-      var _a;
-      ((_a = tableData.constraints) != null ? _a : tableData.constraints = []).push({
-        name: options == null ? void 0 : options.name,
-        references: {
-          columns,
-          fnOrTable,
-          foreignColumns,
-          options
-        },
-        dropMode: options == null ? void 0 : options.dropMode
-      });
-      return orchidCore.emptyObject;
-    },
-    check(check, options) {
-      var _a;
-      ((_a = tableData.constraints) != null ? _a : tableData.constraints = []).push(__spreadProps$4(__spreadValues$8({}, options), {
-        check
-      }));
-      return orchidCore.emptyObject;
     }
   }, orchidCore.makeTimestampsHelpers(makeRegexToFindInSql));
 };
@@ -5252,8 +5251,8 @@ class TransactionAdapter {
 }
 
 var __defProp$7 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
 var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
 var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
@@ -5269,7 +5268,7 @@ var __spreadValues$7 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 class FnExpression extends orchidCore.Expression {
   /**
    * @param q - query object.
@@ -5326,7 +5325,7 @@ class FnExpression extends orchidCore.Expression {
       sql.push(" ");
     if (options.order) {
       pushOrderBySql(
-        __spreadProps$3(__spreadValues$7({}, ctx), { sql }),
+        __spreadProps$2(__spreadValues$7({}, ctx), { sql }),
         this.q.q,
         quotedAs,
         orchidCore.toArray(options.order)
@@ -6257,9 +6256,9 @@ class Create {
    *   password: '1234',
    * });
    *
-   * // When using `.onConflict().ignore()`,
+   * // When using `.onConflictDoNothing()`,
    * // the record may be not created and the `createdCount` will be 0.
-   * const createdCount = await db.table.insert(data).onConflict().ignore();
+   * const createdCount = await db.table.insert(data).onConflictDoNothing();
    *
    * await db.table.create({
    *   // raw SQL
@@ -6452,7 +6451,7 @@ class Create {
    *
    * Columns provided in `defaults` are marked as optional in the following `create`.
    *
-   * Default data is the same as in [create](#create) and [createMany](#createMany),
+   * Default data is the same as in {@link create} and {@link createMany},
    * so you can provide a raw SQL, or a query with a query.
    *
    * ```ts
@@ -6473,32 +6472,45 @@ class Create {
     return _queryDefaults(this.clone(), data);
   }
   /**
-   * A modifier for creating queries that specify alternative behavior in the case of a conflict.
-   * A conflict occurs when a table has a `PRIMARY KEY` or a `UNIQUE` index on a column
-   * (or a composite index on a set of columns) and a row being created has the same value as a row
-   * that already exists in the table in this column(s).
-   * The default behavior in case of conflict is to raise an error and abort the query.
+   * By default, violating unique constraint will cause the creative query to throw,
+   * you can define what to do on a conflict: to ignore it, or to merge the existing record with a new data.
+   *
+   * A conflict occurs when a table has a primary key or a unique index on a column,
+   * or a composite primary key unique index on a set of columns,
+   * and a row being created has the same value as a row that already exists in the table in this column(s).
+   *
+   * Use {@link onConflictDoNothing} to suppress the error and continue without updating the record,
+   * or the `merge` to update the record with new values automatically,
+   * or the `set` to specify own values for the update.
    *
-   * Use `onConflict` to either ignore the error by using `.onConflict().ignore()`,
-   * or to update the existing row with new data (perform an "UPSERT") by using `.onConflict().merge()`.
+   * `onConflict` only accepts column names that are defined in `primaryKey` or `unique` in the table definition.
+   * To specify a constraint, its name also must be explicitly set in `primaryKey` or `unique` in the table code.
+   *
+   * Postgres has a limitation that a single `INSERT` query can have only a single `ON CONFLICT` clause that can target only a single unique constraint
+   * for updating the record.
+   *
+   * If your table has multiple potential reasons for unique constraint violation, such as username and email columns in a user table,
+   * consider using `upsert` instead.
    *
    * ```ts
    * // leave `onConflict` without argument to ignore or merge on any conflict
-   * db.table.create(data).onConflict().ignore();
+   * db.table.create(data).onConflictDoNothing();
    *
    * // single column:
-   * db.table.create(data).onConfict('email');
+   * db.table.create(data).onConfict('email').merge();
    *
    * // array of columns:
-   * db.table.create(data).onConfict(['email', 'name']);
+   * db.table.create(data).onConfict(['email', 'name']).merge();
    *
-   * // raw expression:
-   * db.table.create(data).onConfict(db.table.sql`(email) where condition`);
-   * ```
+   * // constraint name
+   * db.table.create(data).onConfict({ constraint: 'unique_index_name' }).merge();
    *
-   * ::: info
-   * The column(s) given to the `onConflict` must either be the table's PRIMARY KEY or have a UNIQUE index on them, or the query will fail to execute.
-   * When specifying multiple columns, they must be a composite PRIMARY KEY or have a composite UNIQUE index.
+   * // raw SQL expression:
+   * db.table
+   *   .create(data)
+   *   .onConfict(db.table.sql`(email) where condition`)
+   *   .merge();
+   * ```
    *
    * You can use the db.table.sql function in onConflict.
    * It can be useful to specify a condition when you have a partial index:
@@ -6515,29 +6527,32 @@ class Create {
    *   .ignore();
    * ```
    *
-   * :::
+   * For `merge` and `set`, you can append `where` to update data only for the matching rows:
    *
-   * See the documentation on the .ignore() and .merge() methods for more details.
+   * ```ts
+   * const timestamp = Date.now();
+   *
+   * db.table
+   *   .create(data)
+   *   .onConflict('email')
+   *   .set({
+   *     name: 'John Doe',
+   *     updatedAt: timestamp,
+   *   })
+   *   .where({ updatedAt: { lt: timestamp } });
+   * ```
    *
    * @param arg - optionally provide an array of columns
    */
   onConflict(arg) {
     return new OnConflictQueryBuilder(this, arg);
   }
-}
-class OnConflictQueryBuilder {
-  constructor(query, onConflict) {
-    this.query = query;
-    this.onConflict = onConflict;
-  }
   /**
-   * Available only after `onConflict`.
-   *
-   * `ignore` modifies a create query, and causes it to be silently dropped without an error if a conflict occurs.
+   * Use `onConflictDoNothing` to suppress unique constraint violation error when creating a record.
    *
-   * Adds the `ON CONFLICT (columns) DO NOTHING` clause to the insert statement.
+   * Adds `ON CONFLICT (columns) DO NOTHING` clause to the insert statement, columns are optional.
    *
-   * It produces `ON CONFLICT DO NOTHING` when no `onConflict` argument provided.
+   * Can also accept a constraint name.
    *
    * ```ts
    * db.table
@@ -6545,40 +6560,38 @@ class OnConflictQueryBuilder {
    *     email: 'ignore@example.com',
    *     name: 'John Doe',
    *   })
-   *   .onConflict('email')
-   *   .ignore();
+   *   // on any conflict:
+   *   .onConflictDoNothing()
+   *   // or, for a specific column:
+   *   .onConflictDoNothing('email')
+   *   // or, for a specific constraint:
+   *   .onConflictDoNothing({ constraint: 'unique_index_name' });
    * ```
    *
-   *
-   * When there is a conflict, nothing can be returned from the database, that's why `ignore` has to add `| undefined` part to the response type.
-   *
-   * `create` returns a full record by default, it becomes `RecordType | undefined` after applying `ignore`.
+   * When there is a conflict, nothing can be returned from the database, so `onConflictDoNothing` adds `| undefined` part to the response type.
    *
    * ```ts
    * const maybeRecord: RecordType | undefined = await db.table
    *   .create(data)
-   *   .onConflict()
-   *   .ignore();
+   *   .onConflictDoNothing();
    *
    * const maybeId: number | undefined = await db.table
    *   .get('id')
    *   .create(data)
-   *   .onConflict()
-   *   .ignore();
+   *   .onConflictDoNothing();
    * ```
    *
-   * When creating many records, only the created records will be returned. If no records were created, array will be empty:
+   * When creating multiple records, only created records will be returned. If no records were created, array will be empty:
    *
    * ```ts
    * // array can be empty
-   * const arr = await db.table.createMany([data, data, data]).onConflict().ignore();
+   * const arr = await db.table.createMany([data, data, data]).onConflictDoNothing();
    * ```
    */
-  ignore() {
-    const q = this.query;
+  onConflictDoNothing(arg) {
+    const q = this.clone();
     q.q.onConflict = {
-      type: "ignore",
-      expr: this.onConflict
+      target: arg
     };
     if (q.q.returnType === "oneOrThrow") {
       q.q.returnType = "one";
@@ -6587,115 +6600,90 @@ class OnConflictQueryBuilder {
     }
     return q;
   }
+}
+class OnConflictQueryBuilder {
+  constructor(query, onConflict) {
+    this.query = query;
+    this.onConflict = onConflict;
+  }
   /**
    * Available only after `onConflict`.
    *
-   * Modifies a create query, to turn it into an 'upsert' operation.
-   *
-   * Adds an `ON CONFLICT (columns) DO UPDATE` clause to the insert statement.
-   *
-   * When no `onConflict` argument provided,
-   * it will automatically collect all table columns that have unique index and use them as a conflict target.
+   * Updates the record with a given data when conflict occurs.
    *
    * ```ts
-   * db.table
-   *   .create({
-   *     email: 'ignore@example.com',
-   *     name: 'John Doe',
-   *   })
-   *   .onConflict('email')
-   *   .merge();
+   * db.table.create(data).onConflict('column').set({
+   *   description: 'setting different data on conflict',
+   * });
    * ```
    *
-   * This also works with batch creates:
+   * The `set` can take a raw SQL expression:
    *
    * ```ts
    * db.table
-   *   .createMany([
-   *     { email: 'john@example.com', name: 'John Doe' },
-   *     { email: 'jane@example.com', name: 'Jane Doe' },
-   *     { email: 'alex@example.com', name: 'Alex Doe' },
-   *   ])
-   *   .onConflict('email')
-   *   .merge();
-   * ```
-   *
-   * It is also possible to specify a subset of the columns to merge when a conflict occurs.
-   * For example, you may want to set a `createdAt` column when creating but would prefer not to update it if the row already exists:
-   *
-   * ```ts
-   * const timestamp = Date.now();
+   *   .create(data)
+   *   .onConflict()
+   *   .set(db.table.sql`raw SQL expression`);
    *
+   * // update records only on certain conditions
    * db.table
-   *   .create({
-   *     email: 'ignore@example.com',
-   *     name: 'John Doe',
-   *     createdAt: timestamp,
-   *     updatedAt: timestamp,
-   *   })
+   *   .create(data)
    *   .onConflict('email')
-   *   // string argument for a single column:
-   *   .merge('email')
-   *   // array of strings for multiple columns:
-   *   .merge(['email', 'name', 'updatedAt']);
+   *   .set({ key: 'value' })
+   *   .where({ ...certainConditions });
    * ```
    *
-   * It is also possible to specify data to update separately from the data to create.
-   * This is useful if you want to make an update with different data than in creating.
-   * For example, you may want to change a value if the row already exists:
+   * @param set - object containing new column values, or raw SQL
+   */
+  set(set) {
+    this.query.q.onConflict = {
+      target: this.onConflict,
+      set
+    };
+    return this.query;
+  }
+  /**
+   * Available only after `onConflict`.
    *
-   * ```ts
-   * const timestamp = Date.now();
+   * Use this method to merge all the data you have passed into `create` to update the existing record on conflict.
    *
-   * db.table
-   *   .create({
-   *     email: 'ignore@example.com',
-   *     name: 'John Doe',
-   *     createdAt: timestamp,
-   *     updatedAt: timestamp,
-   *   })
-   *   .onConflict('email')
-   *   .merge({
-   *     name: 'John Doe The Second',
-   *   });
-   * ```
+   * If the table has columns with **dynamic** default values, such values will be applied as well.
    *
-   * It is also possible to add a WHERE clause to conditionally update only the matching rows:
+   * You can exclude certain columns from being merged by passing the `exclude` option.
    *
    * ```ts
-   * const timestamp = Date.now();
+   * // merge the full data
+   * db.table.create(data).onConflict('email').merge();
+   *
+   * // merge only a single column
+   * db.table.create(data).onConflict('email').merge('name');
+   *
+   * // merge multiple columns
+   * db.table.create(data).onConflict('email').merge(['name', 'quantity']);
    *
+   * // merge all columns except some
    * db.table
-   *   .create({
-   *     email: 'ignore@example.com',
-   *     name: 'John Doe',
-   *     createdAt: timestamp,
-   *     updatedAt: timestamp,
-   *   })
+   *   .create(data)
    *   .onConflict('email')
-   *   .merge({
-   *     name: 'John Doe',
-   *     updatedAt: timestamp,
-   *   })
-   *   .where({ updatedAt: { lt: timestamp } });
-   * ```
+   *   .merge({ except: ['name', 'quantity'] });
    *
-   * `merge` also accepts raw expression:
+   * // merge can be applied also for batch creates
+   * db.table.createMany([data1, data2, data2]).onConflict('email').merge();
    *
-   * ```ts
+   * // update records only on certain conditions
    * db.table
    *   .create(data)
-   *   .onConflict()
-   *   .merge(db.table.sql`raw SQL expression`);
+   *   .onConflict('email')
+   *   .merge()
+   *   .where({ ...certainConditions });
    * ```
    *
-   * @param update - column, or array of columns, or object for new column values, or raw SQL
+   * @param merge - no argument will merge all data, or provide a column(s) to merge, or provide `except` to update all except some.
    */
-  merge(update) {
+  merge(merge) {
     this.query.q.onConflict = {
-      type: "merge",
-      expr: this.onConflict,
-      update
+      target: this.onConflict,
+      merge
     };
     return this.query;
   }
@@ -7916,10 +7904,7 @@ class JsonModifiers {
         options
       ]
     };
-    return Object.assign(
-      pushQueryValue(q, "select", json),
-      json
-    );
+    return Object.assign(pushQueryValue(q, "select", json), json);
   }
   /**
    * Return a JSON value/object/array where a given value is inserted at the given JSON path. Value can be a single value or JSON object. If a value exists at the given path, the value is not replaced.
@@ -7967,10 +7952,7 @@ class JsonModifiers {
         options
       ]
     };
-    return Object.assign(
-      pushQueryValue(q, "select", json),
-      json
-    );
+    return Object.assign(pushQueryValue(q, "select", json), json);
   }
   /**
    * Return a JSON value/object/array where a given value is removed at the given JSON path.
@@ -8009,10 +7991,7 @@ class JsonModifiers {
         path
       ]
     };
-    return Object.assign(
-      pushQueryValue(q, "select", json),
-      json
-    );
+    return Object.assign(pushQueryValue(q, "select", json), json);
   }
   /**
    * Selects a value from JSON data using a JSON path.
@@ -8058,10 +8037,7 @@ class JsonModifiers {
     const json = {
       __json: ["pathQuery", as, type, column, path, options]
     };
-    return Object.assign(
-      pushQueryValue(q, "select", json),
-      json
-    );
+    return Object.assign(pushQueryValue(q, "select", json), json);
   }
 }
 class JsonMethods {
@@ -8078,10 +8054,7 @@ class JsonMethods {
    * @param coalesce
    */
   json(coalesce) {
-    return queryJson(
-      this.clone(),
-      coalesce
-    );
+    return queryJson(this.clone(), coalesce);
   }
 }
 
@@ -8208,8 +8181,8 @@ class MergeQueryMethods {
 }
 
 var __defProp$4 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
 var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
 var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
@@ -8225,7 +8198,7 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class With {
   /**
    * Add Common Table Expression (CTE) to the query.
@@ -8300,7 +8273,7 @@ class With {
     const query = typeof last === "function" ? last(q.queryBuilder) : last;
     const shape = args.length === 4 ? args[2] : orchidCore.isExpression(query) ? args[1] : query.q.shape;
     if ((options == null ? void 0 : options.columns) === true) {
-      options = __spreadProps$2(__spreadValues$4({}, options), {
+      options = __spreadProps$1(__spreadValues$4({}, options), {
         columns: Object.keys(shape)
       });
     }
@@ -9242,9 +9215,9 @@ const _queryUpdate = (query, arg) => {
   if (queries) {
     q.patchResult = async (_, queryResult) => {
       await Promise.all(queries.map(orchidCore.callWithThis, queryResult));
-      if (ctx.updateData) {
+      if (ctx.collect) {
         const t = query.baseQuery.clone();
-        const keys = query.primaryKeys;
+        const { keys } = ctx.collect;
         _queryWhereIn(
           t,
           keys,
@@ -9252,10 +9225,10 @@ const _queryUpdate = (query, arg) => {
         );
         _queryUpdate(
           t,
-          ctx.updateData
+          ctx.collect.data
         );
         for (const row of queryResult.rows) {
-          Object.assign(row, ctx.updateData);
+          Object.assign(row, ctx.collect.data);
         }
       }
     };
@@ -9688,8 +9661,8 @@ class Transaction {
 }
 
 var __defProp$2 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
 var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
 var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
@@ -9705,7 +9678,7 @@ var __spreadValues$2 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class Headline extends orchidCore.Expression {
   constructor(q, source, params) {
     super();
@@ -9927,7 +9900,7 @@ class SearchMethods {
     const q = this.clone();
     if (!arg.as) {
       const as = saveSearchAlias(q, "@q", "joinedShapes");
-      arg = __spreadProps$1(__spreadValues$2({}, arg), {
+      arg = __spreadProps(__spreadValues$2({}, arg), {
         as
       });
     }
@@ -10516,20 +10489,11 @@ class QueryMethods {
     );
   }
   /**
-   * The `find` method is available only for tables which has exactly one primary key.
-   * And also it can accept raw SQL template literal, then the primary key is not required.
-   *
-   * Finds a record by id, throws {@link NotFoundError} if not found:
+   * Finds a single record by the primary key (id), throws [NotFoundError](/guide/error-handling.html) if not found.
+   * Not available if the table has no or multiple primary keys.
    *
    * ```ts
-   * await db.table.find(1);
-   * ```
-   *
-   * ```ts
-   * await db.user.find`
-   *   age = ${age} AND
-   *   name = ${name}
-   * `;
+   * const result: TableType = await db.table.find(1);
    * ```
    *
    * @param value - primary key value to find by
@@ -10545,7 +10509,7 @@ class QueryMethods {
     return _queryTake(
       _queryWhere(q, [
         {
-          [q.singlePrimaryKey]: value
+          [q.internal.singlePrimaryKey]: value
         }
       ])
     );
@@ -10567,8 +10531,8 @@ class QueryMethods {
     return _queryTake(_queryWhereSql(q, args));
   }
   /**
-   * Find a single record by the primary key (id), adds `LIMIT 1`.
-   * Returns `undefined` when not found.
+   * Finds a single record by the primary key (id), returns `undefined` when not found.
+   * Not available if the table has no or multiple primary keys.
    *
    * ```ts
    * const result: TableType | undefined = await db.table.find(123);
@@ -10598,40 +10562,40 @@ class QueryMethods {
     );
   }
   /**
-   * The same as `where(conditions).take()`, takes the same arguments as {@link Where.where}, it will filter records and add a `LIMIT 1`.
-   * Throws `NotFoundError` if not found.
+   * Finds a single unique record, throws [NotFoundError](/guide/error-handling.html) if not found.
+   * It accepts values of primary keys or unique indexes defined on the table.
+   * `findBy`'s argument type is a union of all possible sets of unique conditions.
+   *
+   * You can use `where(...).take()` for non-unique conditions.
    *
    * ```ts
-   * const result: TableType = await db.table.findBy({ key: 'value' });
-   * // is equivalent to:
-   * db.table.where({ key: 'value' }).take()
+   * await db.table.findBy({ key: 'value' });
    * ```
    *
-   * @param args - `where` conditions
+   * @param uniqueColumnValues - is derived from primary keys and unique indexes in the table
    */
-  findBy(...args) {
-    return _queryFindBy(
-      this.clone(),
-      args
-    );
+  findBy(uniqueColumnValues) {
+    return _queryFindBy(this.clone(), [
+      uniqueColumnValues
+    ]);
   }
   /**
-   * The same as `where(conditions).takeOptional()`, it will filter records and add a `LIMIT 1`.
-   * Returns `undefined` when not found.
+   * Finds a single unique record, returns `undefined` if not found.
+   * It accepts values of primary keys or unique indexes defined on the table.
+   * `findBy`'s argument type is a union of all possible sets of unique conditions.
+   *
+   * You can use `where(...).takeOptional()` for non-unique conditions.
    *
    * ```ts
-   * const result: TableType | undefined = await db.table.findByOptional({
-   *   key: 'value',
-   * });
+   * await db.table.findByOptional({ key: 'value' });
    * ```
    *
-   * @param args - `where` conditions
+   * @param uniqueColumnValues - is derived from primary keys and unique indexes in the table
    */
-  findByOptional(...args) {
-    return _queryFindByOptional(
-      this.clone(),
-      args
-    );
+  findByOptional(uniqueColumnValues) {
+    return _queryFindByOptional(this.clone(), [
+      uniqueColumnValues
+    ]);
   }
   /**
    * Specifies the schema to be used as a prefix of a table name.
@@ -10777,9 +10741,9 @@ class QueryMethods {
    * Order by raw SQL expression.
    *
    * ```ts
-   * db.table.order`raw sql`;
+   * db.table.orderSql`raw sql`;
    * // or
-   * db.table.order(db.table.sql`raw sql`);
+   * db.table.orderSql(db.table.sql`raw sql`);
    * ```
    *
    * @param args - SQL expression
@@ -11021,9 +10985,86 @@ orchidCore.applyMixins(QueryMethods, [
   SoftDeleteMethods
 ]);
 
+const makeIndex = (columns, first, second) => {
+  if (typeof first === "string") {
+    const options = second != null ? second : {};
+    return {
+      index: { columns, options, name: first }
+    };
+  } else {
+    const options = first != null ? first : {};
+    return {
+      index: { columns, options }
+    };
+  }
+};
+const tableDataMethods = {
+  primaryKey(columns, name) {
+    return { primaryKey: { columns, name } };
+  },
+  unique(columns, ...[first, second]) {
+    const input = makeIndex(columns, first, second);
+    input.index.options.unique = true;
+    return input;
+  },
+  index: makeIndex,
+  searchIndex(columns, ...[first, second]) {
+    var _a, _b;
+    const input = makeIndex(columns, first, second);
+    (_b = (_a = input.index.options).using) != null ? _b : _a.using = "gin";
+    input.index.options.tsVector = true;
+    return input;
+  },
+  foreignKey(columns, fnOrTable, foreignColumns, options) {
+    return {
+      constraint: {
+        name: options == null ? void 0 : options.name,
+        references: { columns, fnOrTable, foreignColumns, options }
+      }
+    };
+  },
+  check(check, name) {
+    return { constraint: { check, name } };
+  },
+  sql: sqlFn
+};
+const parseTableData = (dataFn) => {
+  const tableData = {};
+  if (dataFn) {
+    const input = dataFn(tableDataMethods);
+    if (Array.isArray(input)) {
+      for (const item of input) {
+        parseTableDataInput(tableData, item);
+      }
+    } else {
+      parseTableDataInput(tableData, input);
+    }
+  }
+  return tableData;
+};
+const parseTableDataInput = (tableData, item) => {
+  var _a, _b, _c, _d;
+  if (item.primaryKey) {
+    tableData.primaryKey = item.primaryKey;
+  } else if (item.index) {
+    const index = item.index;
+    for (let i = index.columns.length - 1; i >= 0; i--) {
+      if (typeof index.columns[i] === "string") {
+        index.columns[i] = {
+          column: index.columns[i]
+        };
+      }
+    }
+    ((_a = tableData.indexes) != null ? _a : tableData.indexes = []).push(item.index);
+  } else if (item.constraint) {
+    ((_b = tableData.constraints) != null ? _b : tableData.constraints = []).push(item.constraint);
+    if ((_d = (_c = item.constraint.references) == null ? void 0 : _c.options) == null ? void 0 : _d.dropMode) {
+      item.constraint.dropMode = item.constraint.references.options.dropMode;
+    }
+  }
+};
+
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -11039,7 +11080,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -11054,24 +11094,24 @@ var __objRest = (source, exclude) => {
 };
 const anyShape = {};
 class Db {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = getTableData()) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = orchidCore.emptyObject) {
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
     this.table = table;
     this.shape = shape;
     this.columnTypes = columnTypes;
-    this.tableData = tableData;
-    var _a, _b;
+    var _a;
     const self = this;
     const { softDelete } = options;
     const scopes = options.scopes || softDelete ? {} : orchidCore.emptyObject;
-    this.internal = __spreadProps(__spreadValues({}, tableData), {
+    this.internal = {
       transactionStorage,
       scopes,
       snakeCase: options.snakeCase,
       noPrimaryKey: options.noPrimaryKey === "ignore",
-      comment: options.comment
-    });
+      comment: options.comment,
+      tableData
+    };
     this.baseQuery = this;
     const logger = options.logger || console;
     const parsers = {};
@@ -11132,20 +11172,21 @@ class Db {
       log: logParamToLogObject(logger, options.log),
       autoPreparedStatements: (_a = options.autoPreparedStatements) != null ? _a : false,
       parsers: hasParsers ? parsers : void 0,
-      language: options.language
+      language: options.language,
+      schema: options == null ? void 0 : options.schema
     };
-    if (options == null ? void 0 : options.schema) {
-      this.q.schema = options.schema;
+    let shapeHasPrimaryKey;
+    for (const key in shape) {
+      if (shape[key].data.primaryKey) {
+        shapeHasPrimaryKey = true;
+        if (this.internal.singlePrimaryKey) {
+          this.internal.singlePrimaryKey = void 0;
+          break;
+        }
+        this.internal.singlePrimaryKey = key;
+      }
     }
-    this.primaryKeys = Object.keys(shape).filter(
-      (key) => shape[key].data.primaryKey
-    );
-    const primaryKeysFromData = (_b = getTableData().primaryKey) == null ? void 0 : _b.columns;
-    if (primaryKeysFromData)
-      this.primaryKeys.push(...primaryKeysFromData);
-    if (this.primaryKeys.length === 1) {
-      this.singlePrimaryKey = this.primaryKeys[0];
-    } else if (this.primaryKeys.length === 0 && shape !== anyShape && options.noPrimaryKey !== "ignore") {
+    if (!shapeHasPrimaryKey && !tableData.primaryKey && shape !== anyShape && options.noPrimaryKey !== "ignore") {
       const message = `Table ${table} has no primary key`;
       if (options.noPrimaryKey === "error")
         throw new Error(message);
@@ -11341,14 +11382,15 @@ const createDb = (_a) => {
     commonOptions,
     options
   );
-  const tableConstructor = (table, shape, options2) => new Db(
+  const tableConstructor = (table, shape, dataFn, options2) => new Db(
     adapter,
     qb,
     table,
     typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
     ct,
     transactionStorage,
-    __spreadValues(__spreadValues({}, commonOptions), options2)
+    __spreadValues(__spreadValues({}, commonOptions), options2),
+    parseTableData(dataFn)
   );
   const db = Object.assign(tableConstructor, qb, {
     adapter,
@@ -11367,8 +11409,7 @@ const _initQueryBuilder = (adapter, columnTypes, transactionStorage, commonOptio
     anyShape,
     columnTypes,
     transactionStorage,
-    commonOptions,
-    orchidCore.emptyObject
+    commonOptions
   );
   if (options.extensions) {
     const arr = [];
@@ -11687,7 +11728,6 @@ exports.columnForeignKeysToCode = columnForeignKeysToCode;
 exports.columnIndexesToCode = columnIndexesToCode;
 exports.columnsShapeToCode = columnsShapeToCode;
 exports.constraintInnerToCode = constraintInnerToCode;
-exports.constraintPropsToCode = constraintPropsToCode;
 exports.constraintToCode = constraintToCode;
 exports.copyTableData = copyTableData;
 exports.countSelect = countSelect;
@@ -11698,10 +11738,9 @@ exports.foreignKeyArgumentToCode = foreignKeyArgumentToCode;
 exports.getClonedQueryData = getClonedQueryData;
 exports.getColumnInfo = getColumnInfo;
 exports.getColumnTypes = getColumnTypes;
-exports.getConstraintKind = getConstraintKind;
+exports.getPrimaryKeys = getPrimaryKeys;
 exports.getQueryAs = getQueryAs;
 exports.getShapeFromSelect = getShapeFromSelect;
-exports.getTableData = getTableData;
 exports.handleResult = handleResult;
 exports.identityToCode = identityToCode;
 exports.indexInnerToCode = indexInnerToCode;
@@ -11719,17 +11758,18 @@ exports.makeExpression = makeExpression;
 exports.makeFnExpression = makeFnExpression;
 exports.makeRegexToFindInSql = makeRegexToFindInSql;
 exports.makeSQL = makeSQL;
-exports.newTableData = newTableData;
 exports.parseRecord = parseRecord;
 exports.parseResult = parseResult;
+exports.parseTableData = parseTableData;
+exports.parseTableDataInput = parseTableDataInput;
 exports.primaryKeyInnerToCode = primaryKeyInnerToCode;
-exports.primaryKeyToCode = primaryKeyToCode;
 exports.processSelectArg = processSelectArg;
 exports.pushLimitSQL = pushLimitSQL;
 exports.pushQueryArray = pushQueryArray;
 exports.pushQueryOn = pushQueryOn;
 exports.pushQueryOrOn = pushQueryOrOn;
 exports.pushQueryValue = pushQueryValue;
+exports.pushTableDataCode = pushTableDataCode;
 exports.queryFrom = queryFrom;
 exports.queryFromSql = queryFromSql;
 exports.queryJson = queryJson;
@@ -11740,14 +11780,15 @@ exports.quote = quote;
 exports.quoteString = quoteString;
 exports.raw = raw;
 exports.referencesArgsToCode = referencesArgsToCode;
-exports.resetTableData = resetTableData;
 exports.resolveSubQueryCallback = resolveSubQueryCallback;
 exports.saveSearchAlias = saveSearchAlias;
 exports.setParserForSelectedString = setParserForSelectedString;
 exports.setQueryObjectValue = setQueryObjectValue;
 exports.setQueryOperators = setQueryOperators;
 exports.simplifyColumnDefault = simplifyColumnDefault;
+exports.sqlFn = sqlFn;
 exports.sqlQueryArgsToExpression = sqlQueryArgsToExpression;
+exports.tableDataMethods = tableDataMethods;
 exports.templateLiteralToSQL = templateLiteralToSQL;
 exports.testTransaction = testTransaction;
 exports.throwIfNoWhere = throwIfNoWhere;