pqb 0.27.5 → 0.27.7

package/dist/index.js

@@ -141,9 +141,12 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * // primary key can be used by `find` later:
    * db.table.find('97ba9e78-7510-415a-9c03-23d440aec443');
    * ```
+   *
+   * @param options - to specify a constraint name
    */
-  primaryKey() {
-    return orchidCore.setColumnData(this, "isPrimaryKey", true);
+  primaryKey(options) {
+    var _a;
+    return orchidCore.setColumnData(this, "primaryKey", (_a = options == null ? void 0 : options.name) != null ? _a : 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);
@@ -156,9 +159,9 @@ class ColumnType extends orchidCore.ColumnTypeBase {
     return orchidCore.pushColumnData(this, "indexes", options);
   }
   /**
-   * `searchIndex` is designed for full text search.
+   * `searchIndex` is designed for [full text search](/guide/text-search).
    *
-   * It can accept the same options as a regular `index`, but it is `USING GIN` by default, and it is concatenating columns into a `tsvector`.
+   * It can accept the same options as a regular `index`, but it is `USING GIN` by default, and it is concatenating columns into a `tsvector` database type.
    *
    * ```ts
    * import { change } from '../dbScript';
@@ -166,8 +169,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * change(async (db) => {
    *   await db.createTable('table', (t) => ({
    *     id: t.identity().primaryKey(),
-   *     title: t.string(),
-   *     body: t.string(),
+   *     title: t.text(),
+   *     body: t.text(),
    *     ...t.searchIndex(['title', 'body']),
    *   }));
    * });
@@ -176,10 +179,29 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * Produces the following index ('english' is a default language, see [full text search](/guide/text-search.html#language) for changing it):
    *
    * ```sql
-   * CREATE INDEX "table_title_body_idx" ON "table" USING GIN (to_tsvector('english', concat_ws(' ', "title", "body")))
+   * CREATE INDEX "table_title_body_idx" ON "table" USING GIN (to_tsvector('english', "title" || ' ' || "body"))
+   * ```
+   *
+   * You can set different search weights (`A` to `D`) on different columns inside the index:
+   *
+   * ```ts
+   * import { change } from '../dbScript';
+   *
+   * change(async (db) => {
+   *   await db.createTable('table', (t) => ({
+   *     id: t.identity().primaryKey(),
+   *     title: t.text(),
+   *     body: t.text(),
+   *     ...t.searchIndex([
+   *       { column: 'title', weight: 'A' },
+   *       { column: 'body', weight: 'B' },
+   *     ]),
+   *   }));
+   * });
    * ```
    *
-   * Also, it works well with a generated `tsvector` column:
+   * When the table has localized columns,
+   * you can define different indexes for different languages by setting the `language` parameter:
    *
    * ```ts
    * import { change } from '../dbScript';
@@ -187,8 +209,44 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * change(async (db) => {
    *   await db.createTable('table', (t) => ({
    *     id: t.identity().primaryKey(),
-   *     title: t.string(),
-   *     body: t.string(),
+   *     titleEn: t.text(),
+   *     bodyEn: t.text(),
+   *     titleFr: t.text(),
+   *     bodyFr: t.text(),
+   *     ...t.searchIndex(['titleEn', 'bodyEn'], { language: 'english' }),
+   *     ...t.searchIndex(['titleFr', 'bodyFr'], { language: 'french' }),
+   *   }));
+   * });
+   * ```
+   *
+   * Alternatively, different table records may correspond to a single language,
+   * then you can define a search index that relies on a language column by using `languageColumn` parameter:
+   *
+   * ```ts
+   * import { change } from '../dbScript';
+   *
+   * change(async (db) => {
+   *   await db.createTable('table', (t) => ({
+   *     id: t.identity().primaryKey(),
+   *     lang: t.type('regconfig'),
+   *     title: t.text(),
+   *     body: t.text(),
+   *     ...t.searchIndex(['title', 'body'], { languageColumn: 'lang' }),
+   *   }));
+   * });
+   * ```
+   *
+   * It can be more efficient to use a [generated](/guide/migration-column-methods.html#generated-column) column instead of indexing text column in the way described above,
+   * and to set a `searchIndex` on it:
+   *
+   * ```ts
+   * import { change } from '../dbScript';
+   *
+   * change(async (db) => {
+   *   await db.createTable('table', (t) => ({
+   *     id: t.identity().primaryKey(),
+   *     title: t.text(),
+   *     body: t.text(),
    *     generatedTsVector: t.tsvector().generated(['title', 'body']).searchIndex(),
    *   }));
    * });
@@ -269,14 +327,21 @@ const knownDefaults = {
 };
 const simplifyColumnDefault = (value) => {
   if (typeof value === "string") {
-    const lower = value.toLowerCase();
-    return new RawSQL(knownDefaults[lower] || value);
+    return new RawSQL([
+      [knownDefaults[value.toLowerCase()] || value]
+    ]);
   }
   return;
 };
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
+  const { dateTimePrecision } = params;
   Object.assign(column.data, __spreadProps$a(__spreadValues$g({}, params), {
+    dateTimePrecision: (
+      // 0 is default for date, 6 is default for timestamp
+      dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
+    ),
+    collate: params.collate,
     default: simplifyColumnDefault(params.default)
   }));
   return column;
@@ -317,7 +382,7 @@ const combineCodeElements = (input) => {
   }
   return output;
 };
-const columnsShapeToCode = (shape, tableData, t) => {
+const columnsShapeToCode = (shape, tableData, t, m) => {
   const hasTimestamps = "createdAt" in shape && isDefaultTimeStamp(shape.createdAt) && "updatedAt" in shape && isDefaultTimeStamp(shape.updatedAt);
   const code = [];
   for (const key in shape) {
@@ -345,19 +410,33 @@ const columnsShapeToCode = (shape, tableData, t) => {
   }
   if (constraints) {
     for (const item of constraints) {
-      code.push(...constraintToCode(item, t));
+      code.push(...constraintToCode(item, t, m));
     }
   }
   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)} }` : ""}),`;
+  return `${t}.primaryKey([${primaryKey.columns.map(orchidCore.singleQuote).join(", ")}]${name ? `, { name: ${orchidCore.singleQuote(name)} }` : ""})`;
 };
 const indexToCode = (index, t) => {
+  const code = indexInnerToCode(index, t);
+  code[0] = `...${code[0]}`;
+  const last = code[code.length - 1];
+  if (typeof last === "string" && !last.endsWith(","))
+    orchidCore.addCode(code, ",");
+  return code;
+};
+const indexInnerToCode = (index, t) => {
   const code = [];
-  code.push(`...${t}.index(`);
+  code.push(
+    `${t}.${index.options.tsVector ? "searchIndex" : index.options.unique ? "unique" : "index"}(`
+  );
+  const columnOptions = ["collate", "opclass", "order", "weight"];
   const columnsMultiline = index.columns.some((column) => {
     for (const key in column) {
       if (key !== "column" && column[key] !== void 0)
@@ -369,13 +448,13 @@ const indexToCode = (index, t) => {
     const objects = [];
     for (const column of index.columns) {
       const expr = "column" in column ? column.column : column.expression;
-      let hasOptions2 = false;
+      let hasOptions = false;
       for (const key in column) {
-        if (key !== "column" && key !== "expression") {
-          hasOptions2 = true;
+        if (key !== "column") {
+          hasOptions = true;
         }
       }
-      if (!hasOptions2) {
+      if (!hasOptions) {
         objects.push(`${orchidCore.singleQuote(expr)},`);
       } else {
         const props = [
@@ -383,14 +462,11 @@ const indexToCode = (index, t) => {
             expr
           )},`
         ];
-        if (column.collate !== void 0) {
-          props.push(`collate: ${orchidCore.singleQuote(column.collate)},`);
-        }
-        if (column.opclass !== void 0) {
-          props.push(`opclass: ${orchidCore.singleQuote(column.opclass)},`);
-        }
-        if (column.order !== void 0) {
-          props.push(`order: ${orchidCore.singleQuote(column.order)},`);
+        for (const key of columnOptions) {
+          const value = column[key];
+          if (value !== void 0) {
+            props.push(`${key}: ${orchidCore.singleQuote(value)},`);
+          }
         }
         objects.push("{", props, "},");
       }
@@ -402,8 +478,22 @@ const indexToCode = (index, t) => {
       `[${index.columns.map((it) => orchidCore.singleQuote(it.column)).join(", ")}]`
     );
   }
-  const hasOptions = orchidCore.objectHasValues(index.options);
-  if (hasOptions) {
+  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 (columnsMultiline) {
       const columns = code[code.length - 1];
       columns[columns.length - 1] += ",";
@@ -412,7 +502,7 @@ const indexToCode = (index, t) => {
       orchidCore.addCode(code, ", {");
     }
     const options = [];
-    for (const key in index.options) {
+    for (const key of indexOptionsKeys) {
       const value = index.options[key];
       if (value === null || value === void 0)
         continue;
@@ -430,25 +520,35 @@ const indexToCode = (index, t) => {
   if (columnsMultiline) {
     code.push("),");
   } else {
-    orchidCore.addCode(code, "),");
+    orchidCore.addCode(code, ")");
   }
   return code;
 };
-const constraintToCode = (item, t) => {
+const constraintToCode = (item, t, m) => {
+  const code = constraintInnerToCode(item, t, m);
+  code[0] = `...${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) {
     return [
-      `...${t}.foreignKey(`,
-      referencesArgsToCode(item.references, item.name),
+      `${t}.foreignKey(`,
+      referencesArgsToCode(item.references, item.name, m),
       "),"
     ];
   } else if (kind === "check" && item.check) {
-    return [`...${t}.check(${item.check.toCode(t)}),`];
+    return [
+      `${t}.check(${item.check.toCode(t)}${item.name ? `, { name: '${item.name}' }` : ""})`
+    ];
   } else {
-    return [`...${t}.constraint({`, constraintPropsToCode(t, item), "}),"];
+    return [`${t}.constraint({`, constraintPropsToCode(t, item, m), "}),"];
   }
 };
-const constraintPropsToCode = (t, item) => {
+const constraintPropsToCode = (t, item, m) => {
   const props = [];
   if (item.name) {
     props.push(`name: ${orchidCore.singleQuote(item.name)},`);
@@ -456,7 +556,7 @@ const constraintPropsToCode = (t, item) => {
   if (item.references) {
     props.push(
       `references: [`,
-      referencesArgsToCode(item.references, false),
+      referencesArgsToCode(item.references, false, m),
       "],"
     );
   }
@@ -470,9 +570,13 @@ const referencesArgsToCode = ({
   fnOrTable,
   foreignColumns,
   options
-}, name = (options == null ? void 0 : options.name) || false) => {
+}, name = (options == null ? void 0 : options.name) || false, m) => {
   const args = [];
   args.push(`${orchidCore.singleQuoteArray(columns)},`);
+  if (m && typeof fnOrTable !== "string") {
+    const { schema, table } = new (fnOrTable())();
+    fnOrTable = schema ? `${schema}.${table}` : table;
+  }
   args.push(
     `${typeof fnOrTable === "string" ? orchidCore.singleQuote(fnOrTable) : fnOrTable.toString()},`
   );
@@ -492,24 +596,27 @@ const referencesArgsToCode = ({
   }
   return args;
 };
-const columnForeignKeysToCode = (foreignKeys) => {
+const columnForeignKeysToCode = (foreignKeys, migration) => {
   const code = [];
   for (const foreignKey of foreignKeys) {
     orchidCore.addCode(code, `.foreignKey(`);
-    for (const part of foreignKeyArgumentToCode(foreignKey)) {
+    for (const part of foreignKeyArgumentToCode(foreignKey, migration)) {
       orchidCore.addCode(code, part);
     }
     orchidCore.addCode(code, ")");
   }
   return code;
 };
-const foreignKeyArgumentToCode = (foreignKey) => {
+const foreignKeyArgumentToCode = (foreignKey, migration) => {
   const code = [];
-  if ("fn" in foreignKey) {
-    code.push(foreignKey.fn.toString());
-  } else {
-    code.push(orchidCore.singleQuote(foreignKey.table));
+  let fnOrTable = "fn" in foreignKey ? foreignKey.fn : foreignKey.table;
+  if (migration && typeof fnOrTable !== "string") {
+    const { schema, table } = new (fnOrTable())();
+    fnOrTable = schema ? `${schema}.${table}` : table;
   }
+  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;
   if (hasOptions) {
@@ -564,8 +671,8 @@ const columnIndexesToCode = (indexes) => {
   }
   return code;
 };
-const columnCheckToCode = (t, check) => {
-  return `.check(${check.toCode(t)})`;
+const columnCheckToCode = (t, { sql, options }) => {
+  return `.check(${sql.toCode(t)}${(options == null ? void 0 : options.name) ? `, { name: '${options.name}' }` : ""})`;
 };
 const identityToCode = (identity, dataType) => {
   const code = [];
@@ -577,16 +684,18 @@ const identityToCode = (identity, dataType) => {
   const props = [];
   if (identity.always)
     props.push(`always: true,`);
-  if (identity.incrementBy)
-    props.push(`incrementBy: ${identity.incrementBy},`);
-  if (identity.startWith)
-    props.push(`startWith: ${identity.startWith},`);
+  if (identity.increment && identity.increment !== 1)
+    props.push(`increment: ${identity.increment},`);
+  if (identity.start && identity.start !== 1)
+    props.push(`start: ${identity.start},`);
   if (identity.min)
     props.push(`min: ${identity.min},`);
   if (identity.max)
     props.push(`max: ${identity.max},`);
-  if (identity.cache)
+  if (identity.cache && identity.cache !== 1)
     props.push(`cache: ${identity.cache},`);
+  if (identity.cycle)
+    props.push(`cycle: true,`);
   if (props.length) {
     orchidCore.addCode(code, "{");
     code.push(props, "}");
@@ -594,7 +703,7 @@ const identityToCode = (identity, dataType) => {
   orchidCore.addCode(code, ")");
   return code;
 };
-const columnCode = (type, t, code, data = type.data, skip) => {
+const columnCode = (type, t, code, migration, data = type.data, skip) => {
   code = orchidCore.toArray(code);
   let prepend = `${t}.`;
   if (data.name) {
@@ -605,10 +714,14 @@ const columnCode = (type, t, code, data = type.data, skip) => {
   } else {
     code[0].unshift(prepend);
   }
-  if (data.isPrimaryKey)
-    orchidCore.addCode(code, ".primaryKey()");
+  if (data.primaryKey) {
+    orchidCore.addCode(
+      code,
+      `.primaryKey(${data.primaryKey === true ? "" : `{ name: '${data.primaryKey}' }`})`
+    );
+  }
   if (data.foreignKeys) {
-    for (const part of columnForeignKeysToCode(data.foreignKeys)) {
+    for (const part of columnForeignKeysToCode(data.foreignKeys, migration)) {
       orchidCore.addCode(code, part);
     }
   }
@@ -622,7 +735,7 @@ const columnCode = (type, t, code, data = type.data, skip) => {
     orchidCore.addCode(code, `.parse(${type.parseFn.toString()})`);
   if (data.as)
     orchidCore.addCode(code, `.as(${data.as.toCode(t)})`);
-  if (data.default !== void 0) {
+  if (data.default !== void 0 && (!migration || typeof data.default !== "function")) {
     orchidCore.addCode(code, `.default(${orchidCore.columnDefaultArgumentToCode(t, data.default)})`);
   }
   if (data.indexes) {
@@ -824,8 +937,8 @@ class JSONColumn extends ColumnType {
     this.dataType = "jsonb";
     this.operators = Operators.json;
   }
-  toCode(t) {
-    return columnCode(this, t, `json()`, this.data, toCodeSkip);
+  toCode(t, m) {
+    return columnCode(this, t, `json()`, m, this.data, toCodeSkip);
   }
 }
 JSONColumn.prototype.encodeFn = JSON.stringify;
@@ -835,8 +948,8 @@ class JSONTextColumn extends ColumnType {
     this.dataType = "json";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `jsonText()`, this.data, toCodeSkip);
+  toCode(t, m) {
+    return columnCode(this, t, `jsonText()`, m, this.data, toCodeSkip);
   }
 }
 
@@ -1426,8 +1539,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
 };
 const makeJoinQueryBuilder = (joinedQuery, joinedShapes, joinTo) => {
   const q = joinedQuery.baseQuery.clone();
-  q.q.joinedShapes = joinedShapes;
   q.baseQuery = q;
+  q.q.as = joinedQuery.q.as;
+  q.q.joinedShapes = joinedShapes;
   q.q.joinTo = joinTo;
   return q;
 };
@@ -1605,11 +1719,12 @@ class DateColumn extends DateBaseColumn {
     super(...arguments);
     this.dataType = "date";
   }
-  toCode(t) {
+  toCode(t, m) {
     return columnCode(
       this,
       t,
-      `date()${orchidCore.dateDataToCode(this.data)}`,
+      `date()${orchidCore.dateDataToCode(this.data, m)}`,
+      m,
       this.data,
       skipDateMethodsFromToCode
     );
@@ -1636,7 +1751,7 @@ class DateTimeTzBaseClass extends DateTimeBaseClass {
     );
   }
 }
-const timestampToCode = (self, t) => {
+const timestampToCode = (self, t, m) => {
   const { dateTimePrecision: p } = self.data;
   const { defaultTimestamp } = self.data;
   if (defaultTimestamp) {
@@ -1648,7 +1763,8 @@ const timestampToCode = (self, t) => {
     const code = columnCode(
       self,
       t,
-      `timestamps${noTz}(${p && p !== 6 ? p : ""}).${defaultTimestamp}${orchidCore.dateDataToCode(self.data)}`,
+      `timestamps${noTz}(${p && p !== 6 ? p : ""}).${defaultTimestamp}${orchidCore.dateDataToCode(self.data, m)}`,
+      m,
       self.data,
       skipDateMethodsFromToCode
     );
@@ -1659,7 +1775,8 @@ const timestampToCode = (self, t) => {
     return columnCode(
       self,
       t,
-      `${self instanceof TimestampColumn ? "timestampNoTZ" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data)}`,
+      `${self instanceof TimestampColumn ? "timestampNoTZ" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data, m)}`,
+      m,
       self.data,
       skipDateMethodsFromToCode
     );
@@ -1670,8 +1787,8 @@ class TimestampColumn extends DateTimeBaseClass {
     super(...arguments);
     this.dataType = "timestamp";
   }
-  toCode(t) {
-    return timestampToCode(this, t);
+  toCode(t, m) {
+    return timestampToCode(this, t, m);
   }
 }
 class TimestampTZColumn extends DateTimeTzBaseClass {
@@ -1680,8 +1797,8 @@ class TimestampTZColumn extends DateTimeTzBaseClass {
     this.dataType = "timestamptz";
     this.baseDataType = "timestamp";
   }
-  toCode(t) {
-    return timestampToCode(this, t);
+  toCode(t, m) {
+    return timestampToCode(this, t, m);
   }
 }
 class TimeColumn extends ColumnType {
@@ -1691,12 +1808,13 @@ class TimeColumn extends ColumnType {
     this.operators = Operators.time;
     this.data.dateTimePrecision = dateTimePrecision;
   }
-  toCode(t) {
+  toCode(t, m) {
     const { dateTimePrecision } = this.data;
     return columnCode(
       this,
       t,
-      `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(this.data)}`,
+      `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(this.data, m)}`,
+      m,
       this.data,
       skipDateMethodsFromToCode
     );
@@ -1710,12 +1828,13 @@ class IntervalColumn extends ColumnType {
     this.data.fields = fields;
     this.data.precision = precision;
   }
-  toCode(t) {
+  toCode(t, m) {
     const { fields, precision } = this.data;
     return columnCode(
       this,
       t,
       `interval(${[fields && `'${fields}'`, precision && String(precision)].filter((part) => part).join(", ")})`,
+      m,
       this.data,
       skipDateMethodsFromToCode
     );
@@ -1738,9 +1857,9 @@ class EnumColumn extends ColumnType {
     this.dataType = "enum";
     this.inputSchema = this.outputSchema = this.querySchema = schemaType;
   }
-  toCode(t, migration) {
-    const options = migration ? "" : `, [${this.options.map((option) => `'${option}'`).join(", ")}]`;
-    return columnCode(this, t, `enum('${this.enumName}'${options})`);
+  toCode(t, m) {
+    const options = m ? "" : `, [${this.options.map((option) => `'${option}'`).join(", ")}]`;
+    return columnCode(this, t, `enum('${this.enumName}'${options})`, m);
   }
   toSQL() {
     const name = this.enumName;
@@ -1772,15 +1891,16 @@ class ArrayColumn extends ColumnType {
       }
     );
     this.data.item = item;
+    this.data.name = item.data.name;
   }
   toSQL() {
     return `${this.data.item.toSQL()}[]`;
   }
-  toCode(t) {
+  toCode(t, m) {
     const code = ["array("];
     orchidCore.addCode(code, this.data.item.toCode(t));
-    orchidCore.addCode(code, `)${orchidCore.arrayDataToCode(this.data)}`);
-    return columnCode(this, t, code);
+    orchidCore.addCode(code, `)${orchidCore.arrayDataToCode(this.data, m)}`);
+    return columnCode(this, t, code, m);
   }
 }
 const parseArray = (input, pos, len, entries, nested, item) => {
@@ -4063,16 +4183,18 @@ class DecimalColumn extends ColumnType {
   constructor(schema, numericPrecision, numericScale) {
     super(schema, schema.stringSchema());
     this.operators = Operators.number;
-    this.dataType = "decimal";
+    this.dataType = "numeric";
     this.data.numericPrecision = numericPrecision;
     this.data.numericScale = numericScale;
+    this.data.alias = "decimal";
   }
-  toCode(t) {
+  toCode(t, m) {
     const { numericPrecision, numericScale } = this.data;
     return columnCode(
       this,
       t,
-      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`
+      `decimal(${numericPrecision || ""}${numericScale ? `, ${numericScale}` : ""})`,
+      m
     );
   }
   toSQL() {
@@ -4084,49 +4206,52 @@ class DecimalColumn extends ColumnType {
   }
 }
 const skipNumberMethods = { int: true };
-const intToCode = (column, t) => {
+const intToCode = (column, t, alias, m) => {
   let code;
   if (column.data.identity) {
-    code = identityToCode(column.data.identity, column.dataType);
+    code = identityToCode(column.data.identity, alias);
   } else {
-    code = [`${column.dataType}()`];
+    code = [`${alias}()`];
   }
-  orchidCore.addCode(code, orchidCore.numberDataToCode(column.data, skipNumberMethods));
-  return columnCode(column, t, code);
+  orchidCore.addCode(code, orchidCore.numberDataToCode(column.data, m, skipNumberMethods));
+  return columnCode(column, t, code, m);
 };
 class SmallIntColumn extends IntegerBaseColumn {
-  constructor() {
-    super(...arguments);
-    this.dataType = "smallint";
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int2";
     this.parseItem = parseInt;
+    this.data.alias = "smallint";
   }
-  toCode(t) {
-    return intToCode(this, t);
+  toCode(t, m) {
+    return intToCode(this, t, "smallint", m);
   }
   identity(options = {}) {
     return orchidCore.setColumnData(this, "identity", options);
   }
 }
 class IntegerColumn extends IntegerBaseColumn {
-  constructor() {
-    super(...arguments);
-    this.dataType = "integer";
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int4";
     this.parseItem = parseInt;
+    this.data.alias = "integer";
   }
-  toCode(t) {
-    return intToCode(this, t);
+  toCode(t, m) {
+    return intToCode(this, t, "integer", m);
   }
   identity(options = {}) {
     return orchidCore.setColumnData(this, "identity", options);
   }
 }
 class BigIntColumn extends NumberAsStringBaseColumn {
-  constructor() {
-    super(...arguments);
-    this.dataType = "bigint";
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
   }
-  toCode(t) {
-    return intToCode(this, t);
+  toCode(t, m) {
+    return intToCode(this, t, "bigint", m);
   }
   identity(options = {}) {
     return orchidCore.setColumnData(this, "identity", options);
@@ -4135,68 +4260,75 @@ class BigIntColumn extends NumberAsStringBaseColumn {
 class RealColumn extends NumberBaseColumn {
   constructor(schema) {
     super(schema, schema.number());
-    this.dataType = "real";
+    this.dataType = "float4";
     this.parseItem = parseFloat;
+    this.data.alias = "real";
   }
-  toCode(t) {
-    return columnCode(this, t, `real()${orchidCore.numberDataToCode(this.data)}`);
+  toCode(t, m) {
+    return columnCode(this, t, `real()${orchidCore.numberDataToCode(this.data, m)}`, m);
   }
 }
 class DoublePrecisionColumn extends NumberAsStringBaseColumn {
-  constructor() {
-    super(...arguments);
-    this.dataType = "double precision";
+  constructor(schema) {
+    super(schema);
+    this.dataType = "float8";
+    this.data.alias = "doublePrecision";
   }
-  toCode(t) {
-    return columnCode(this, t, `doublePrecision()`);
+  toCode(t, m) {
+    return columnCode(this, t, `doublePrecision()`, m);
   }
 }
 class SmallSerialColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
-    this.dataType = "smallint";
+    this.dataType = "int2";
     this.parseItem = parseInt;
     this.data.int = true;
+    this.data.alias = "smallSerial";
   }
   toSQL() {
     return "smallserial";
   }
-  toCode(t) {
+  toCode(t, m) {
     return columnCode(
       this,
       t,
-      `smallSerial()${orchidCore.numberDataToCode(this.data, skipNumberMethods)}`
+      `smallSerial()${orchidCore.numberDataToCode(this.data, m, skipNumberMethods)}`,
+      m
     );
   }
 }
 class SerialColumn extends IntegerBaseColumn {
   constructor(schema) {
     super(schema);
-    this.dataType = "integer";
+    this.dataType = "int4";
     this.parseItem = parseInt;
     this.data.int = true;
+    this.data.alias = "serial";
   }
   toSQL() {
     return "serial";
   }
-  toCode(t) {
+  toCode(t, m) {
     return columnCode(
       this,
       t,
-      `serial()${orchidCore.numberDataToCode(this.data, skipNumberMethods)}`
+      `serial()${orchidCore.numberDataToCode(this.data, m, skipNumberMethods)}`,
+      m
     );
   }
 }
 class BigSerialColumn extends NumberAsStringBaseColumn {
-  constructor() {
-    super(...arguments);
-    this.dataType = "bigint";
+  constructor(schema) {
+    super(schema);
+    this.dataType = "int8";
+    this.data.alias = "bigint";
   }
   toSQL() {
     return "bigserial";
   }
-  toCode(t) {
-    return columnCode(this, t, `bigSerial()`);
+  toCode(t, m) {
+    return columnCode(this, t, `bigSerial()`, m);
   }
 }
 
@@ -4245,12 +4377,13 @@ class VarCharColumn extends LimitedTextBaseColumn {
     super(...arguments);
     this.dataType = "varchar";
   }
-  toCode(t) {
+  toCode(t, m) {
     const { maxChars } = this.data;
     return columnCode(
       this,
       t,
-      `varchar(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data)}`
+      `varchar(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data, m)}`,
+      m
     );
   }
 }
@@ -4258,14 +4391,15 @@ class StringColumn extends VarCharColumn {
   constructor(schema, limit = 255) {
     super(schema, limit);
   }
-  toCode(t) {
+  toCode(t, m) {
     let max = this.data.maxChars;
     if (max === 255)
       max = void 0;
     return columnCode(
       this,
       t,
-      `string(${max != null ? max : ""})${orchidCore.stringDataToCode(this.data)}`
+      `string(${max != null ? max : ""})${orchidCore.stringDataToCode(this.data, m)}`,
+      m
     );
   }
 }
@@ -4274,12 +4408,13 @@ class CharColumn extends LimitedTextBaseColumn {
     super(...arguments);
     this.dataType = "char";
   }
-  toCode(t) {
+  toCode(t, m) {
     const { maxChars } = this.data;
     return columnCode(
       this,
       t,
-      `char(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data)}`
+      `char(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data, m)}`,
+      m
     );
   }
 }
@@ -4291,7 +4426,7 @@ const setTextColumnData = (column, minArg, maxArg) => {
     }
   }
 };
-const textColumnToCode = (column, t) => {
+const textColumnToCode = (column, t, m) => {
   const data = __spreadValues$9({}, column.data);
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
@@ -4310,7 +4445,8 @@ const textColumnToCode = (column, t) => {
   return columnCode(
     column,
     t,
-    `${column.dataType}(${args})${orchidCore.stringDataToCode(data)}`
+    `${column.dataType}(${args})${orchidCore.stringDataToCode(data, m)}`,
+    m
   );
 };
 const minMaxToSchema = (schema, min, max) => min ? max ? schema.stringMinMax(min, max) : schema.stringMin(min) : schema.stringSchema();
@@ -4320,8 +4456,8 @@ class TextColumn extends TextBaseColumn {
     this.dataType = "text";
     setTextColumnData(this, min, max);
   }
-  toCode(t) {
-    return textColumnToCode(this, t);
+  toCode(t, m) {
+    return textColumnToCode(this, t, m);
   }
 }
 class ByteaColumn extends ColumnType {
@@ -4330,8 +4466,8 @@ class ByteaColumn extends ColumnType {
     this.dataType = "bytea";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `bytea()`);
+  toCode(t, m) {
+    return columnCode(this, t, `bytea()`, m);
   }
 }
 class PointColumn extends ColumnType {
@@ -4340,8 +4476,8 @@ class PointColumn extends ColumnType {
     this.dataType = "point";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `point()`);
+  toCode(t, m) {
+    return columnCode(this, t, `point()`, m);
   }
 }
 class LineColumn extends ColumnType {
@@ -4350,8 +4486,8 @@ class LineColumn extends ColumnType {
     this.dataType = "line";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `line()`);
+  toCode(t, m) {
+    return columnCode(this, t, `line()`, m);
   }
 }
 class LsegColumn extends ColumnType {
@@ -4360,8 +4496,8 @@ class LsegColumn extends ColumnType {
     this.dataType = "lseg";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `lseg()`);
+  toCode(t, m) {
+    return columnCode(this, t, `lseg()`, m);
   }
 }
 class BoxColumn extends ColumnType {
@@ -4370,8 +4506,8 @@ class BoxColumn extends ColumnType {
     this.dataType = "box";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `box()`);
+  toCode(t, m) {
+    return columnCode(this, t, `box()`, m);
   }
 }
 class PathColumn extends ColumnType {
@@ -4380,8 +4516,8 @@ class PathColumn extends ColumnType {
     this.dataType = "path";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `path()`);
+  toCode(t, m) {
+    return columnCode(this, t, `path()`, m);
   }
 }
 class PolygonColumn extends ColumnType {
@@ -4390,8 +4526,8 @@ class PolygonColumn extends ColumnType {
     this.dataType = "polygon";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `polygon()`);
+  toCode(t, m) {
+    return columnCode(this, t, `polygon()`, m);
   }
 }
 class CircleColumn extends ColumnType {
@@ -4400,8 +4536,8 @@ class CircleColumn extends ColumnType {
     this.dataType = "circle";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `circle()`);
+  toCode(t, m) {
+    return columnCode(this, t, `circle()`, m);
   }
 }
 class MoneyColumn extends NumberBaseColumn {
@@ -4417,8 +4553,8 @@ class MoneyColumn extends NumberBaseColumn {
       }
     );
   }
-  toCode(t) {
-    return columnCode(this, t, `money()`);
+  toCode(t, m) {
+    return columnCode(this, t, `money()`, m);
   }
 }
 class CidrColumn extends ColumnType {
@@ -4427,8 +4563,8 @@ class CidrColumn extends ColumnType {
     this.dataType = "cidr";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `cidr()`);
+  toCode(t, m) {
+    return columnCode(this, t, `cidr()`, m);
   }
 }
 class InetColumn extends ColumnType {
@@ -4437,8 +4573,8 @@ class InetColumn extends ColumnType {
     this.dataType = "inet";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `inet()`);
+  toCode(t, m) {
+    return columnCode(this, t, `inet()`, m);
   }
 }
 class MacAddrColumn extends ColumnType {
@@ -4447,8 +4583,8 @@ class MacAddrColumn extends ColumnType {
     this.dataType = "macaddr";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `macaddr()`);
+  toCode(t, m) {
+    return columnCode(this, t, `macaddr()`, m);
   }
 }
 class MacAddr8Column extends ColumnType {
@@ -4457,8 +4593,8 @@ class MacAddr8Column extends ColumnType {
     this.dataType = "macaddr8";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `macaddr8()`);
+  toCode(t, m) {
+    return columnCode(this, t, `macaddr8()`, m);
   }
 }
 class BitColumn extends ColumnType {
@@ -4468,9 +4604,9 @@ class BitColumn extends ColumnType {
     this.operators = Operators.text;
     this.data.length = length;
   }
-  toCode(t) {
+  toCode(t, m) {
     const { length } = this.data;
-    return columnCode(this, t, `bit(${length})`);
+    return columnCode(this, t, `bit(${length})`, m);
   }
   toSQL() {
     return orchidCore.joinTruthy(
@@ -4482,13 +4618,14 @@ class BitColumn extends ColumnType {
 class BitVaryingColumn extends ColumnType {
   constructor(schema, length) {
     super(schema, schema.bit(length));
-    this.dataType = "bit varying";
+    this.dataType = "varbit";
     this.operators = Operators.text;
     this.data.length = length;
+    this.data.alias = "bitVarying";
   }
-  toCode(t) {
+  toCode(t, m) {
     const { length } = this.data;
-    return columnCode(this, t, `bitVarying(${length != null ? length : ""})`);
+    return columnCode(this, t, `bitVarying(${length != null ? length : ""})`, m);
   }
   toSQL() {
     return orchidCore.joinTruthy(
@@ -4504,8 +4641,8 @@ class TsVectorColumn extends ColumnType {
     this.dataType = "tsvector";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `tsvector()`);
+  toCode(t, m) {
+    return columnCode(this, t, `tsvector()`, m);
   }
   /**
    * For `tsvector` column type, it can also accept language (optional) and columns:
@@ -4535,14 +4672,17 @@ class TsVectorColumn extends ColumnType {
     const first = args[0];
     if (typeof first === "string" || !("raw" in first)) {
       const target = typeof first === "string" ? args[1] : first;
+      const language = typeof first === "string" ? first : this.defaultLanguage;
       let sql;
       if (Array.isArray(target)) {
         const columns = target.length === 1 ? `"${target[0]}"` : target.map((column) => `coalesce("${column}", '')`).join(` || ' ' || `);
-        sql = `to_tsvector('${typeof first === "string" ? first : this.defaultLanguage}', ${columns})`;
+        sql = `to_tsvector('${language}', ${columns})`;
       } else {
         for (const key in target) {
-          sql = (sql ? sql + " || " : "") + `setweight(to_tsvector(coalesce("${key}", '')), '${target[key]}')`;
+          sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${key}", '')), '${target[key]}')`;
         }
+        if (sql)
+          sql += ")";
       }
       const arr = [sql];
       arr.raw = arr;
@@ -4557,8 +4697,8 @@ class TsQueryColumn extends ColumnType {
     this.dataType = "tsquery";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `tsquery()`);
+  toCode(t, m) {
+    return columnCode(this, t, `tsquery()`, m);
   }
 }
 const uuidDefaultSQL = "gen_random_uuid()";
@@ -4575,12 +4715,13 @@ class UUIDColumn extends ColumnType {
       column.data.default = uuidDefault;
     return column;
   }
-  toCode(t) {
+  toCode(t, m) {
     const { data } = this;
     return columnCode(
       this,
       t,
       `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
     );
@@ -4592,8 +4733,8 @@ class XMLColumn extends ColumnType {
     this.dataType = "xml";
     this.operators = Operators.text;
   }
-  toCode(t) {
-    return columnCode(this, t, `xml()`);
+  toCode(t, m) {
+    return columnCode(this, t, `xml()`, m);
   }
 }
 class CitextColumn extends TextBaseColumn {
@@ -4602,20 +4743,21 @@ class CitextColumn extends TextBaseColumn {
     this.dataType = "citext";
     setTextColumnData(this, min, max);
   }
-  toCode(t) {
-    return textColumnToCode(this, t);
+  toCode(t, m) {
+    return textColumnToCode(this, t, m);
   }
 }
 
 class BooleanColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.boolean());
-    this.dataType = "boolean";
+    this.dataType = "bool";
     this.operators = Operators.boolean;
     this.parseItem = (input) => input[0] === "t";
+    this.data.alias = "boolean";
   }
-  toCode(t) {
-    return columnCode(this, t, "boolean()");
+  toCode(t, m) {
+    return columnCode(this, t, "boolean()", m);
   }
 }
 
@@ -4631,8 +4773,8 @@ class CustomTypeColumn extends ColumnType {
     this.operators = Operators.any;
     this.data.isOfCustomType = true;
   }
-  toCode(t) {
-    return columnCode(this, t, `type(${orchidCore.singleQuote(this.dataType)})`);
+  toCode(t, m) {
+    return columnCode(this, t, `type(${orchidCore.singleQuote(this.dataType)})`, m);
   }
   as(column) {
     const c = orchidCore.setColumnData(
@@ -4647,8 +4789,8 @@ class CustomTypeColumn extends ColumnType {
   }
 }
 class DomainColumn extends CustomTypeColumn {
-  toCode(t) {
-    return columnCode(this, t, `domain(${orchidCore.singleQuote(this.dataType)})`);
+  toCode(t, m) {
+    return columnCode(this, t, `domain(${orchidCore.singleQuote(this.dataType)})`, m);
   }
 }
 
@@ -4827,7 +4969,7 @@ const makeColumnTypes = (schema) => {
      * See {@link ColumnType.searchIndex}
      */
     searchIndex(columns, options) {
-      return this.index(columns, __spreadProps$4(__spreadValues$8({}, options), { tsVector: true }));
+      return this.index(columns, __spreadProps$4(__spreadValues$8({ using: "gin" }, options), { tsVector: true }));
     },
     constraint({ name, references, check, dropMode }) {
       var _a;
@@ -4858,11 +5000,11 @@ const makeColumnTypes = (schema) => {
       });
       return orchidCore.emptyObject;
     },
-    check(check) {
+    check(check, options) {
       var _a;
-      ((_a = tableData.constraints) != null ? _a : tableData.constraints = []).push({
+      ((_a = tableData.constraints) != null ? _a : tableData.constraints = []).push(__spreadProps$4(__spreadValues$8({}, options), {
         check
-      });
+      }));
       return orchidCore.emptyObject;
     }
   }, orchidCore.makeTimestampsHelpers(makeRegexToFindInSql));
@@ -4981,6 +5123,8 @@ for (const key in types.builtins) {
   delete defaultTypeParsers[id];
 });
 const returnArg = (arg) => arg;
+const rollbackSql$1 = { text: "ROLLBACK" };
+const commitSql$1 = { text: "COMMIT" };
 class Adapter {
   constructor(_a) {
     var _b = _a, { types: types2 = defaultTypeParsers } = _b, config = __objRest$1(_b, ["types"]);
@@ -5022,7 +5166,7 @@ class Adapter {
   arrays(query, types2) {
     return performQuery$1(this, query, types2, "array");
   }
-  async transaction(begin, cb) {
+  async transaction(begin, cb, end = commitSql$1) {
     const client = await this.connect();
     try {
       await setSearchPath(client, this.schema);
@@ -5031,10 +5175,10 @@ class Adapter {
       try {
         result = await cb(new TransactionAdapter(this, client, this.types));
       } catch (err) {
-        await performQueryOnClient(client, { text: "ROLLBACK" }, this.types);
+        await performQueryOnClient(client, rollbackSql$1, this.types);
         throw err;
       }
-      await performQueryOnClient(client, { text: "COMMIT" }, this.types);
+      await performQueryOnClient(client, end, this.types);
       return result;
     } finally {
       client.release();
@@ -6046,12 +6190,15 @@ const _queryCreateMany = (q, data) => {
 };
 const _queryInsertMany = (q, data) => {
   const ctx = createCtx();
-  return insert(
+  let result = insert(
     q,
     handleManyData(q, data, ctx),
     "object",
     true
   );
+  if (!data.length)
+    result = result.none();
+  return result;
 };
 const _queryCreateRaw = (q, args) => {
   createSelect(q);
@@ -7949,7 +8096,7 @@ const makeMessage = (colors, timeColor, time, sqlColor, sql, valuesColor, values
   const elapsed = process.hrtime(time);
   const formattedTime = `(${elapsed[0] ? `${elapsed[0]}s ` : ""}${(elapsed[1] / 1e6).toFixed(1)}ms)`;
   const result = `${colors ? timeColor(formattedTime) : formattedTime} ${colors ? sqlColor(sql) : sql}`;
-  if (!values.length) {
+  if (!(values == null ? void 0 : values.length)) {
     return result;
   }
   const formattedValues = `[${values.map(quote).join(", ")}]`;
@@ -10720,7 +10867,7 @@ class QueryMethods {
    * ```
    */
   none() {
-    return extendQuery(this, noneMethods);
+    return this.then === noneMethods.then ? this : extendQuery(this, noneMethods);
   }
   /**
    * `modify` allows modifying the query with your function:
@@ -10907,21 +11054,23 @@ var __objRest = (source, exclude) => {
 };
 const anyShape = {};
 class Db {
-  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options) {
+  constructor(adapter, queryBuilder, table = void 0, shape = anyShape, columnTypes, transactionStorage, options, tableData = getTableData()) {
     this.adapter = adapter;
     this.queryBuilder = queryBuilder;
     this.table = table;
     this.shape = shape;
     this.columnTypes = columnTypes;
+    this.tableData = tableData;
     var _a, _b;
     const self = this;
     const { softDelete } = options;
     const scopes = options.scopes || softDelete ? {} : orchidCore.emptyObject;
-    const tableData = getTableData();
     this.internal = __spreadProps(__spreadValues({}, tableData), {
       transactionStorage,
       scopes,
-      snakeCase: options.snakeCase
+      snakeCase: options.snakeCase,
+      noPrimaryKey: options.noPrimaryKey === "ignore",
+      comment: options.comment
     });
     this.baseQuery = this;
     const logger = options.logger || console;
@@ -10989,7 +11138,7 @@ class Db {
       this.q.schema = options.schema;
     }
     this.primaryKeys = Object.keys(shape).filter(
-      (key) => shape[key].data.isPrimaryKey
+      (key) => shape[key].data.primaryKey
     );
     const primaryKeysFromData = (_b = getTableData().primaryKey) == null ? void 0 : _b.columns;
     if (primaryKeysFromData)
@@ -11185,16 +11334,13 @@ const createDb = (_a) => {
     ct[orchidCore.snakeCaseKey] = true;
   }
   const transactionStorage = new node_async_hooks.AsyncLocalStorage();
-  const qb = new Db(
+  const qb = _initQueryBuilder(
     adapter,
-    void 0,
-    void 0,
-    anyShape,
     ct,
     transactionStorage,
-    commonOptions
+    commonOptions,
+    options
   );
-  qb.queryBuilder = qb;
   const tableConstructor = (table, shape, options2) => new Db(
     adapter,
     qb,
@@ -11213,6 +11359,33 @@ const createDb = (_a) => {
   }
   return db;
 };
+const _initQueryBuilder = (adapter, columnTypes, transactionStorage, commonOptions, options) => {
+  const qb = new Db(
+    adapter,
+    void 0,
+    void 0,
+    anyShape,
+    columnTypes,
+    transactionStorage,
+    commonOptions,
+    orchidCore.emptyObject
+  );
+  if (options.extensions) {
+    const arr = [];
+    for (const x of options.extensions) {
+      if (typeof x === "string") {
+        arr.push({ name: x });
+      } else {
+        for (const key in x) {
+          arr.push({ name: key, version: x[key] });
+        }
+      }
+    }
+    qb.internal.extensions = arr;
+  }
+  qb.internal.domains = options.domains;
+  return qb.queryBuilder = qb;
+};
 
 class Rollback extends Error {
 }
@@ -11445,6 +11618,7 @@ exports.VirtualColumn = VirtualColumn;
 exports.Where = Where;
 exports.With = With;
 exports.XMLColumn = XMLColumn;
+exports._initQueryBuilder = _initQueryBuilder;
 exports._queryAfterSaveCommit = _queryAfterSaveCommit;
 exports._queryAll = _queryAll;
 exports._queryAs = _queryAs;
@@ -11512,6 +11686,7 @@ exports.columnCode = columnCode;
 exports.columnForeignKeysToCode = columnForeignKeysToCode;
 exports.columnIndexesToCode = columnIndexesToCode;
 exports.columnsShapeToCode = columnsShapeToCode;
+exports.constraintInnerToCode = constraintInnerToCode;
 exports.constraintPropsToCode = constraintPropsToCode;
 exports.constraintToCode = constraintToCode;
 exports.copyTableData = copyTableData;
@@ -11529,6 +11704,7 @@ exports.getShapeFromSelect = getShapeFromSelect;
 exports.getTableData = getTableData;
 exports.handleResult = handleResult;
 exports.identityToCode = identityToCode;
+exports.indexInnerToCode = indexInnerToCode;
 exports.indexToCode = indexToCode;
 exports.instantiateColumn = instantiateColumn;
 exports.isDefaultTimeStamp = isDefaultTimeStamp;
@@ -11546,6 +11722,7 @@ exports.makeSQL = makeSQL;
 exports.newTableData = newTableData;
 exports.parseRecord = parseRecord;
 exports.parseResult = parseResult;
+exports.primaryKeyInnerToCode = primaryKeyInnerToCode;
 exports.primaryKeyToCode = primaryKeyToCode;
 exports.processSelectArg = processSelectArg;
 exports.pushLimitSQL = pushLimitSQL;