rake-db 2.18.1 → 2.19.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { quote, EnumColumn, defaultSchemaConfig, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, makeColumnTypes, makeColumnsByType, RawSQL, DomainColumn, CustomTypeColumn, ArrayColumn, instantiateColumn, primaryKeyToCode, indexToCode, constraintToCode, primaryKeyInnerToCode, indexInnerToCode, constraintInnerToCode, getConstraintKind, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn, TimestampColumn } from 'pqb';
-import { singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, setCurrentColumnName, consumeColumnName, setDefaultLanguage, deepCompare, getImportPath, pathToLog, getStackTrace, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+import { quote, EnumColumn, defaultSchemaConfig, getColumnTypes, parseTableData, tableDataMethods, ColumnType, parseTableDataInput, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, makeColumnTypes, makeColumnsByType, RawSQL, DomainColumn, CustomTypeColumn, ArrayColumn, instantiateColumn, pushTableDataCode, primaryKeyInnerToCode, indexInnerToCode, constraintInnerToCode, referencesArgsToCode, TimestampTZColumn, TimestampColumn } from 'pqb';
+import { singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, setCurrentColumnName, consumeColumnName, ColumnTypeBase, setDefaultLanguage, deepCompare, getImportPath, pathToLog, getStackTrace, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path, { join } from 'path';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import fs, { mkdir, writeFile, readdir, stat, readFile } from 'fs/promises';
@@ -118,6 +118,7 @@ const getColumnName = (item, key, snakeCase) => {
   return item.data.name || (snakeCase ? toSnakeCase(key) : key);
 };
 const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
+  var _a, _b;
   const line = [`"${name}" ${columnTypeToSql(item)}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
@@ -149,17 +150,14 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
   const { foreignKeys } = item.data;
   if (foreignKeys) {
     for (const foreignKey of foreignKeys) {
-      if (foreignKey.name) {
-        line.push(`CONSTRAINT "${foreignKey.name}"`);
+      if ((_a = foreignKey.options) == null ? void 0 : _a.name) {
+        line.push(`CONSTRAINT "${(_b = foreignKey.options) == null ? void 0 : _b.name}"`);
       }
       line.push(
         referencesToSql(
-          {
-            columns: foreignKey.columns,
-            fnOrTable: "fn" in foreignKey ? foreignKey.fn : foreignKey.table,
-            foreignColumns: foreignKey.columns,
-            options: foreignKey
-          },
+          __spreadValues$9({
+            columns: [name]
+          }, foreignKey),
           snakeCase
         )
       );
@@ -206,10 +204,9 @@ const sequenceOptionsToSql = (item) => {
 const addColumnIndex = (indexes, name, item) => {
   if (item.data.indexes) {
     indexes.push(
-      ...item.data.indexes.map((index) => ({
-        columns: [__spreadProps$7(__spreadValues$9({}, index), { column: name })],
-        options: index
-      }))
+      ...item.data.indexes.map((index) => __spreadValues$9({
+        columns: [__spreadProps$7(__spreadValues$9({}, index.options), { column: name })]
+      }, index))
     );
   }
 };
@@ -280,9 +277,9 @@ const referencesToSql = (references, snakeCase) => {
 const getIndexName = (table, columns) => {
   return `${table}_${columns.map((it) => "column" in it ? it.column : "expression").join("_")}_idx`;
 };
-const indexesToQuery = (up, { schema, name }, indexes, language) => {
-  return indexes.map(({ columns, options }) => {
-    const indexName = options.name || getIndexName(name, columns);
+const indexesToQuery = (up, { schema, name: tableName }, indexes, language) => {
+  return indexes.map(({ columns, options, name }) => {
+    const indexName = name || getIndexName(tableName, columns);
     if (!up) {
       return {
         text: `DROP INDEX "${indexName}"${options.dropMode ? ` ${options.dropMode}` : ""}`,
@@ -294,7 +291,7 @@ const indexesToQuery = (up, { schema, name }, indexes, language) => {
     if (options.unique) {
       sql.push("UNIQUE");
     }
-    sql.push(`INDEX "${indexName}" ON ${quoteTable(schema, name)}`);
+    sql.push(`INDEX "${indexName}" ON ${quoteTable(schema, tableName)}`);
     const u = options.using || options.tsVector && "GIN";
     if (u) {
       sql.push(`USING ${u}`);
@@ -365,11 +362,7 @@ const commentsToQuery = (schemaTable, comments) => {
   }));
 };
 const primaryKeyToSql = (primaryKey) => {
-  var _a;
-  const name = (_a = primaryKey.options) == null ? void 0 : _a.name;
-  return `${name ? `CONSTRAINT "${name}" ` : ""}PRIMARY KEY (${joinColumns(
-    primaryKey.columns
-  )})`;
+  return `${primaryKey.name ? `CONSTRAINT "${primaryKey.name}" ` : ""}PRIMARY KEY (${joinColumns(primaryKey.columns)})`;
 };
 
 const tableMethods = {
@@ -407,7 +400,7 @@ var __spreadValues$8 = (a, b) => {
   return a;
 };
 var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
-var __objRest = (source, exclude) => {
+var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
     if (__hasOwnProp$8.call(source, prop) && exclude.indexOf(prop) < 0)
@@ -419,8 +412,20 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-const createTable = async (migration, up, tableName, options, fn) => {
+const createTable = async (migration, up, tableName, first, second, third) => {
   var _a;
+  let options;
+  let fn;
+  let dataFn;
+  if (typeof first === "object") {
+    options = first;
+    fn = second;
+    dataFn = third;
+  } else {
+    options = emptyObject;
+    fn = first;
+    dataFn = second;
+  }
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
   const language = "language" in options ? options.language : migration.options.language;
   const types = Object.assign(
@@ -437,7 +442,7 @@ const createTable = async (migration, up, tableName, options, fn) => {
       (_a = migration.options.baseTable) == null ? void 0 : _a.nowSQL,
       language
     );
-    tableData = getTableData();
+    tableData = parseTableData(dataFn);
   } else {
     shape = tableData = emptyObject;
   }
@@ -452,17 +457,22 @@ const createTable = async (migration, up, tableName, options, fn) => {
   fn && validatePrimaryKey(ast);
   const queries = astToQueries$1(ast, snakeCase, language);
   for (const _b of queries) {
-    const _c = _b, { then } = _c, query = __objRest(_c, ["then"]);
+    const _c = _b, { then } = _c, query = __objRest$1(_c, ["then"]);
     const result = await migration.adapter.arrays(query);
     then == null ? void 0 : then(result);
   }
   let table;
   return {
     get table() {
-      return table != null ? table : table = migration(tableName, shape, {
-        noPrimaryKey: options.noPrimaryKey ? "ignore" : void 0,
-        snakeCase: options.snakeCase
-      });
+      return table != null ? table : table = migration(
+        tableName,
+        shape,
+        void 0,
+        {
+          noPrimaryKey: options.noPrimaryKey ? "ignore" : void 0,
+          snakeCase: options.snakeCase
+        }
+      );
     }
   };
 };
@@ -547,7 +557,7 @@ const astToQueries$1 = (ast, snakeCase, language) => {
     lines.push(
       `
   ${primaryKeyToSql({
-        options: ast.primaryKey.options,
+        name: ast.primaryKey.name,
         columns: ast.primaryKey.columns.map(
           (key) => getColumnName(shape[key], key, snakeCase)
         )
@@ -623,20 +633,6 @@ let changeTableData = newChangeTableData();
 const resetChangeTableData = () => {
   changeTableData = newChangeTableData();
 };
-const mergeTableData = (a, b) => {
-  if (b.primaryKey) {
-    if (!a.primaryKey) {
-      a.primaryKey = b.primaryKey;
-    } else {
-      a.primaryKey = {
-        columns: [...a.primaryKey.columns, ...b.primaryKey.columns],
-        options: __spreadValues$7(__spreadValues$7({}, a.primaryKey.options), b.primaryKey.options)
-      };
-    }
-  }
-  a.indexes = [...a.indexes || [], ...b.indexes || []];
-  a.constraints = [...a.constraints || [], ...b.constraints || []];
-};
 const addOrDropChanges = [];
 function add(item, options) {
   if (item instanceof ColumnType) {
@@ -645,21 +641,23 @@ function add(item, options) {
       return result;
     addOrDropChanges.push(result);
     return addOrDropChanges.length - 1;
-  } else if (item === emptyObject) {
-    mergeTableData(changeTableData.add, getTableData());
-    resetTableData();
-    return emptyObject;
-  } else {
-    const result = {};
-    for (const key in item) {
-      result[key] = {
-        type: "add",
-        item: item[key],
-        dropMode: options == null ? void 0 : options.dropMode
-      };
+  }
+  for (const key in item) {
+    if (item[key] instanceof ColumnTypeBase) {
+      const result = {};
+      for (const key2 in item) {
+        result[key2] = {
+          type: "add",
+          item: item[key2],
+          dropMode: options == null ? void 0 : options.dropMode
+        };
+      }
+      return result;
     }
-    return result;
+    parseTableDataInput(changeTableData.add, item);
+    break;
   }
+  return void 0;
 }
 const drop = function(item, options) {
   if (item instanceof ColumnType) {
@@ -668,21 +666,23 @@ const drop = function(item, options) {
       return result;
     addOrDropChanges.push(result);
     return addOrDropChanges.length - 1;
-  } else if (item === emptyObject) {
-    mergeTableData(changeTableData.drop, getTableData());
-    resetTableData();
-    return emptyObject;
-  } else {
-    const result = {};
-    for (const key in item) {
-      result[key] = {
-        type: "drop",
-        item: item[key],
-        dropMode: options == null ? void 0 : options.dropMode
-      };
+  }
+  for (const key in item) {
+    if (item[key] instanceof ColumnTypeBase) {
+      const result = {};
+      for (const key2 in item) {
+        result[key2] = {
+          type: "drop",
+          item: item[key2],
+          dropMode: options == null ? void 0 : options.dropMode
+        };
+      }
+      return result;
     }
-    return result;
+    parseTableDataInput(changeTableData.drop, item);
+    break;
   }
+  return void 0;
 };
 const addOrDrop = (type, item, options) => {
   const name = consumeColumnName();
@@ -732,7 +732,7 @@ const columnTypeToColumnChange = (item) => {
   return item.to;
 };
 const nameKey = Symbol("name");
-const tableChangeMethods = __spreadProps$5(__spreadValues$7({}, tableMethods), {
+const tableChangeMethods = __spreadProps$5(__spreadValues$7(__spreadValues$7({}, tableMethods), tableDataMethods), {
   name(name) {
     setCurrentColumnName(name);
     const types = Object.create(this);
@@ -779,7 +779,6 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
   const language = "language" in options ? options.language : migration.options.language;
   setDefaultLanguage(language);
-  resetTableData();
   resetChangeTableData();
   const tableChanger = Object.create(
     migration.columnTypes
@@ -850,7 +849,6 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
   }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
 };
 const astToQueries = (ast, snakeCase, language) => {
-  var _a;
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
@@ -888,11 +886,11 @@ const astToQueries = (ast, snakeCase, language) => {
     }
   }
   if (ast.add.primaryKey) {
-    addPrimaryKeys.options = ast.add.primaryKey.options;
+    addPrimaryKeys.name = ast.add.primaryKey.name;
     addPrimaryKeys.columns.push(...ast.add.primaryKey.columns);
   }
   if (ast.drop.primaryKey) {
-    dropPrimaryKeys.options = ast.drop.primaryKey.options;
+    dropPrimaryKeys.name = ast.drop.primaryKey.name;
     dropPrimaryKeys.columns.push(...ast.drop.primaryKey.columns);
   }
   const alterTable = [];
@@ -949,7 +947,7 @@ const astToQueries = (ast, snakeCase, language) => {
   }
   const prependAlterTable = [];
   if (ast.drop.primaryKey || dropPrimaryKeys.change || dropPrimaryKeys.columns.length > 1) {
-    const name = ((_a = dropPrimaryKeys.options) == null ? void 0 : _a.name) || `${ast.name}_pkey`;
+    const name = dropPrimaryKeys.name || `${ast.name}_pkey`;
     prependAlterTable.push(`DROP CONSTRAINT "${name}"`);
   }
   prependAlterTable.push(
@@ -963,7 +961,7 @@ const astToQueries = (ast, snakeCase, language) => {
     alterTable.push(
       `ADD ${primaryKeyToSql(
         snakeCase ? {
-          options: addPrimaryKeys.options,
+          name: addPrimaryKeys.name,
           columns: addPrimaryKeys.columns.map(toSnakeCase)
         } : addPrimaryKeys
       )}`
@@ -1029,7 +1027,7 @@ const handlePrerequisitesForTableItem = (key, item, queries, addPrimaryKeys, dro
   }
 };
 const handleTableItemChange = (key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addConstraints, dropConstraints, comments, snakeCase) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
   if (item.type === "add") {
     const column = item.item;
     const name = getColumnName(column, key, snakeCase);
@@ -1113,60 +1111,56 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     for (let i = 0; i < foreignKeysLen; i++) {
       const fromFkey = (_d = from.foreignKeys) == null ? void 0 : _d[i];
       const toFkey = (_e = to.foreignKeys) == null ? void 0 : _e[i];
-      if ((fromFkey || toFkey) && (!fromFkey || !toFkey || fromFkey.name !== toFkey.name || fromFkey.match !== toFkey.match || fromFkey.onUpdate !== toFkey.onUpdate || fromFkey.onDelete !== toFkey.onDelete || fromFkey.dropMode !== toFkey.dropMode || fromFkey.table !== toFkey.table || fromFkey.columns.join(",") !== toFkey.columns.join(","))) {
+      if ((fromFkey || toFkey) && (!fromFkey || !toFkey || ((_f = fromFkey.options) == null ? void 0 : _f.name) !== ((_g = toFkey.options) == null ? void 0 : _g.name) || ((_h = fromFkey.options) == null ? void 0 : _h.match) !== ((_i = toFkey.options) == null ? void 0 : _i.match) || ((_j = fromFkey.options) == null ? void 0 : _j.onUpdate) !== ((_k = toFkey.options) == null ? void 0 : _k.onUpdate) || ((_l = fromFkey.options) == null ? void 0 : _l.onDelete) !== ((_m = toFkey.options) == null ? void 0 : _m.onDelete) || ((_n = fromFkey.options) == null ? void 0 : _n.dropMode) !== ((_o = toFkey.options) == null ? void 0 : _o.dropMode) || fromFkey.fnOrTable !== toFkey.fnOrTable)) {
         if (fromFkey) {
           dropConstraints.push({
-            name: fromFkey.name,
-            dropMode: fromFkey.dropMode,
-            references: {
-              columns: [name],
-              fnOrTable: fromFkey.table,
-              foreignColumns: snakeCase ? fromFkey.columns.map(toSnakeCase) : fromFkey.columns,
-              options: fromFkey
-            }
+            name: (_p = fromFkey.options) == null ? void 0 : _p.name,
+            dropMode: (_q = fromFkey.options) == null ? void 0 : _q.dropMode,
+            references: __spreadProps$5(__spreadValues$7({
+              columns: [name]
+            }, fromFkey), {
+              foreignColumns: snakeCase ? fromFkey.foreignColumns.map(toSnakeCase) : fromFkey.foreignColumns
+            })
           });
         }
         if (toFkey) {
           addConstraints.push({
-            name: toFkey.name,
-            dropMode: toFkey.dropMode,
-            references: {
-              columns: [name],
-              fnOrTable: toFkey.table,
-              foreignColumns: snakeCase ? toFkey.columns.map(toSnakeCase) : toFkey.columns,
-              options: toFkey
-            }
+            name: (_r = toFkey.options) == null ? void 0 : _r.name,
+            dropMode: (_s = toFkey.options) == null ? void 0 : _s.dropMode,
+            references: __spreadProps$5(__spreadValues$7({
+              columns: [name]
+            }, toFkey), {
+              foreignColumns: snakeCase ? toFkey.foreignColumns.map(toSnakeCase) : toFkey.foreignColumns
+            })
           });
         }
       }
     }
     const indexesLen = Math.max(
-      ((_f = from.indexes) == null ? void 0 : _f.length) || 0,
-      ((_g = to.indexes) == null ? void 0 : _g.length) || 0
+      ((_t = from.indexes) == null ? void 0 : _t.length) || 0,
+      ((_u = to.indexes) == null ? void 0 : _u.length) || 0
     );
     for (let i = 0; i < indexesLen; i++) {
-      const fromIndex = (_h = from.indexes) == null ? void 0 : _h[i];
-      const toIndex = (_i = to.indexes) == null ? void 0 : _i[i];
-      if ((fromIndex || toIndex) && (!fromIndex || !toIndex || fromIndex.collate !== toIndex.collate || fromIndex.opclass !== toIndex.opclass || fromIndex.order !== toIndex.order || fromIndex.name !== toIndex.name || fromIndex.unique !== toIndex.unique || fromIndex.using !== toIndex.using || fromIndex.include !== toIndex.include || Array.isArray(fromIndex.include) && Array.isArray(toIndex.include) && fromIndex.include.join(",") !== toIndex.include.join(",") || fromIndex.with !== toIndex.with || fromIndex.tablespace !== toIndex.tablespace || fromIndex.where !== toIndex.where || fromIndex.dropMode !== toIndex.dropMode)) {
+      const fromIndex = (_v = from.indexes) == null ? void 0 : _v[i];
+      const toIndex = (_w = to.indexes) == null ? void 0 : _w[i];
+      if ((fromIndex || toIndex) && (!fromIndex || !toIndex || fromIndex.options.collate !== toIndex.options.collate || fromIndex.options.opclass !== toIndex.options.opclass || fromIndex.options.order !== toIndex.options.order || fromIndex.name !== toIndex.name || fromIndex.options.unique !== toIndex.options.unique || fromIndex.options.using !== toIndex.options.using || fromIndex.options.include !== toIndex.options.include || Array.isArray(fromIndex.options.include) && Array.isArray(toIndex.options.include) && fromIndex.options.include.join(",") !== toIndex.options.include.join(",") || fromIndex.options.with !== toIndex.options.with || fromIndex.options.tablespace !== toIndex.options.tablespace || fromIndex.options.where !== toIndex.options.where || fromIndex.options.dropMode !== toIndex.options.dropMode)) {
         if (fromIndex) {
-          dropIndexes.push({
+          dropIndexes.push(__spreadProps$5(__spreadValues$7({}, fromIndex), {
             columns: [
               __spreadValues$7({
                 column: name
-              }, fromIndex)
-            ],
-            options: fromIndex
-          });
+              }, fromIndex.options)
+            ]
+          }));
         }
         if (toIndex) {
-          addIndexes.push({
+          addIndexes.push(__spreadProps$5(__spreadValues$7({}, toIndex), {
             columns: [
               __spreadValues$7({
                 column: name
-              }, toIndex)
-            ],
-            options: toIndex
-          });
+              }, toIndex.options)
+            ]
+          }));
         }
       }
     }
@@ -1187,8 +1181,7 @@ const renameColumnSql = (from, to, snakeCase) => {
   return `RENAME COLUMN "${snakeCase ? toSnakeCase(from) : from}" TO "${snakeCase ? toSnakeCase(to) : to}"`;
 };
 const mapIndexesForSnakeCase = (indexes, snakeCase) => {
-  return (indexes == null ? void 0 : indexes.map((index) => ({
-    options: index.options,
+  return (indexes == null ? void 0 : indexes.map((index) => __spreadProps$5(__spreadValues$7({}, index), {
     columns: snakeCase ? index.columns.map(
       (item) => "column" in item ? __spreadProps$5(__spreadValues$7({}, item), { column: toSnakeCase(item.column) }) : item
     ) : index.columns
@@ -1316,15 +1309,11 @@ const createMigrationInterface = (tx, up, config) => {
   });
 };
 class Migration {
-  createTable(tableName, cbOrOptions, cb) {
-    const options = !cbOrOptions || typeof cbOrOptions === "function" ? {} : cbOrOptions;
-    const fn = typeof cbOrOptions === "function" ? cbOrOptions : cb;
-    return createTable(this, this.up, tableName, options, fn);
+  createTable(tableName, first, second, third) {
+    return createTable(this, this.up, tableName, first, second, third);
   }
-  dropTable(tableName, cbOrOptions, cb) {
-    const options = !cbOrOptions || typeof cbOrOptions === "function" ? {} : cbOrOptions;
-    const fn = typeof cbOrOptions === "function" ? cbOrOptions : cb;
-    return createTable(this, !this.up, tableName, options, fn);
+  dropTable(tableName, first, second, third) {
+    return createTable(this, !this.up, tableName, first, second, third);
   }
   changeTable(tableName, cbOrOptions, cb) {
     const [fn, options] = typeof cbOrOptions === "function" ? [cbOrOptions, {}] : [cb, cbOrOptions];
@@ -1398,7 +1387,7 @@ class Migration {
     return addColumn(this, this.up, tableName, columnName, fn);
   }
   /**
-   * Drop the schema, create it on rollback. See {@link addIndex}.
+   * Drop the schema, create it on rollback. See {@link addColumn}.
    *
    * @param tableName - name of the table to add the column to
    * @param columnName - name of the column to add
@@ -1430,20 +1419,20 @@ class Migration {
    *
    * @param tableName - name of the table to add the index for
    * @param columns - indexed columns
-   * @param options - index options
+   * @param args - index options, or an index name and then options
    */
-  addIndex(tableName, columns, options) {
-    return addIndex(this, this.up, tableName, columns, options);
+  addIndex(tableName, columns, ...args) {
+    return addIndex(this, this.up, tableName, columns, args);
   }
   /**
    * Drop the schema, create it on rollback. See {@link addIndex}.
    *
    * @param tableName - name of the table to add the index for
    * @param columns - indexed columns
-   * @param options - index options
+   * @param args - index options, or an index name and then options
    */
-  dropIndex(tableName, columns, options) {
-    return addIndex(this, !this.up, tableName, columns, options);
+  dropIndex(tableName, columns, ...args) {
+    return addIndex(this, !this.up, tableName, columns, args);
   }
   /**
    * Rename index:
@@ -1558,20 +1547,20 @@ class Migration {
    *
    * @param tableName - name of the table
    * @param columns - array of the columns
-   * @param options - object with a constraint name
+   * @param name - optionally, set a primary key constraint name
    */
-  addPrimaryKey(tableName, columns, options) {
-    return addPrimaryKey(this, this.up, tableName, columns, options);
+  addPrimaryKey(tableName, columns, name) {
+    return addPrimaryKey(this, this.up, tableName, columns, name);
   }
   /**
    * Drop the schema, create it on rollback. See {@link addPrimaryKey}.
    *
    * @param tableName - name of the table
    * @param columns - array of the columns
-   * @param options - object with a constraint name
+   * @param name - optionally, set a primary key constraint name
    */
-  dropPrimaryKey(tableName, columns, options) {
-    return addPrimaryKey(this, !this.up, tableName, columns, options);
+  dropPrimaryKey(tableName, columns, name) {
+    return addPrimaryKey(this, !this.up, tableName, columns, name);
   }
   /**
    * Add or drop a check for multiple columns.
@@ -1591,7 +1580,7 @@ class Migration {
     return addCheck(this, this.up, tableName, check);
   }
   /**
-   * Drop the schema, create it on rollback. See {@link addConstraint}.
+   * Drop the schema, create it on rollback. See {@link addCheck}.
    *
    * @param tableName - name of the table to add the check into
    * @param check - raw SQL for the check
@@ -1600,39 +1589,7 @@ class Migration {
     return addCheck(this, !this.up, tableName, check);
   }
   /**
-   * Add or drop a constraint with check and a foreign key references.
-   *
-   * See foreign key details in [foreign key](/guide/migration-column-methods.html#composite-foreign-key).
-   *
-   * ```ts
-   * import { change } from '../dbScript';
-   *
-   * change(async (db) => {
-   *   await db.addConstraint('tableName', {
-   *     name: 'constraintName',
-   *     check: db.sql`column > 123`,
-   *     references: [['id', 'name'], 'otherTable', ['otherId', 'otherName']],
-   *   });
-   * });
-   * ```
-   *
-   * @param tableName - name of the table to add the constraint to
-   * @param constraint - constraint config object
-   */
-  addConstraint(tableName, constraint) {
-    return addConstraint(this, this.up, tableName, constraint);
-  }
-  /**
-   * Drop the schema, create it on rollback. See {@link addConstraint}.
-   *
-   * @param tableName - name of the table to add the constraint to
-   * @param constraint - constraint config object
-   */
-  dropConstraint(tableName, constraint) {
-    return addConstraint(this, !this.up, tableName, constraint);
-  }
-  /**
-   * Rename a table constraint, such as primary key, or check.
+   * Rename a table constraint such as a primary key or a database check.
    *
    * ```ts
    * import { change } from '../dbScript';
@@ -2194,21 +2151,18 @@ const addColumn = (migration, up, tableName, columnName, fn) => {
     [columnName]: t.add(fn(t))
   }));
 };
-const addIndex = (migration, up, tableName, columns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.index(columns, options))));
+const addIndex = (migration, up, tableName, columns, args) => {
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.index(columns, ...args))));
 };
 const addForeignKey = (migration, up, tableName, columns, foreignTable, foreignColumns, options) => {
   return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.foreignKey(columns, foreignTable, foreignColumns, options))));
 };
-const addPrimaryKey = (migration, up, tableName, columns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.primaryKey(columns, options))));
+const addPrimaryKey = (migration, up, tableName, columns, name) => {
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.primaryKey(columns, name))));
 };
 const addCheck = (migration, up, tableName, check) => {
   return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.check(check))));
 };
-const addConstraint = (migration, up, tableName, constraint) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$6({}, t.add(t.constraint(constraint))));
-};
 const createSchema = async (migration, up, name) => {
   const ast = {
     type: "schema",
@@ -4053,6 +4007,18 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 const matchMap = {
   s: void 0,
   f: "FULL",
@@ -4239,13 +4205,15 @@ const tableToAst = (ctx, data, table, action, domains) => {
     primaryKey: primaryKey && primaryKey.columns.length > 1 ? primaryKey : void 0,
     indexes: indexes.reduce((acc, index) => {
       if (index.columns.length > 1 || index.columns.some((it) => "expression" in it)) {
+        const _a = makeIndexOptions(tableName, index), { name } = _a, options = __objRest(_a, ["name"]);
         acc.push({
           columns: index.columns.map((it) => __spreadProps$1(__spreadValues$2({}, "column" in it ? { column: it.column } : { expression: it.expression }), {
             collate: it.collate,
             opclass: it.opclass,
             order: it.order
           })),
-          options: makeIndexOptions(tableName, index)
+          options,
+          name
         });
       }
       return acc;
@@ -4267,7 +4235,7 @@ const getDbStructureTableData = (data, { name, schemaName }) => {
   return {
     primaryKey: (primaryKey == null ? void 0 : primaryKey.primaryKey) ? {
       columns: primaryKey.primaryKey,
-      options: primaryKey.name === `${name}_pkey` ? void 0 : { name: primaryKey.name }
+      name: primaryKey.name === `${name}_pkey` ? void 0 : primaryKey.name
     } : void 0,
     indexes: data.indexes.filter(
       (it) => it.tableName === name && it.schemaName === schemaName
@@ -4364,7 +4332,7 @@ const getDbTableColumnsChecks = (tableData) => tableData.constraints.reduce((acc
   return acc;
 }, {});
 const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, checks) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _f, _g, _h, _i, _j;
   let column = instantiateDbColumn(ctx, data, domains, item);
   if (item.identity) {
     column.data.identity = item.identity;
@@ -4379,24 +4347,28 @@ const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, ch
       (it) => it.columns.length === 1 && "column" in it.columns[0] && it.columns[0].column === item.name
     );
     for (const index of columnIndexes) {
-      const options = index.columns[0];
-      column = column.index(__spreadValues$2({
-        collate: options.collate,
-        opclass: options.opclass,
-        order: options.order
-      }, makeIndexOptions(tableName, index)));
+      const columnOptions = index.columns[0];
+      const _e = makeIndexOptions(tableName, index), { name } = _e, indexOptions = __objRest(_e, ["name"]);
+      ((_g = (_f = column.data).indexes) != null ? _g : _f.indexes = []).push({
+        options: __spreadValues$2({
+          collate: columnOptions.collate,
+          opclass: columnOptions.opclass,
+          order: columnOptions.order
+        }, indexOptions),
+        name
+      });
     }
   }
   if (table) {
     for (const it of data.constraints) {
-      if (it.tableName !== table.name || it.schemaName !== table.schemaName || it.check || ((_e = it.references) == null ? void 0 : _e.columns.length) !== 1 || it.references.columns[0] !== item.name || checkIfIsOuterRecursiveFkey(data, table, it.references)) {
+      if (it.tableName !== table.name || it.schemaName !== table.schemaName || it.check || ((_h = it.references) == null ? void 0 : _h.columns.length) !== 1 || it.references.columns[0] !== item.name || checkIfIsOuterRecursiveFkey(data, table, it.references)) {
         continue;
       }
       const c = dbConstraintToTableConstraint(ctx, table, it);
       column = column.foreignKey(
-        (_f = c.references) == null ? void 0 : _f.fnOrTable,
+        (_i = c.references) == null ? void 0 : _i.fnOrTable,
         it.references.foreignColumns[0],
-        (_g = c.references) == null ? void 0 : _g.options
+        (_j = c.references) == null ? void 0 : _j.options
       );
     }
   }
@@ -4611,7 +4583,7 @@ const astToGenerateItem = (ast, currentSchema) => {
   };
 };
 const analyzeTableColumns = (currentSchema, schema, table, deps, resolveType, columns) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   for (const [keys, name, change] of columns) {
     const { column } = change;
     if (column) {
@@ -4650,29 +4622,25 @@ const analyzeTableColumns = (currentSchema, schema, table, deps, resolveType, co
     if (foreignKeys) {
       for (const fkey of foreignKeys) {
         keys.push(
-          fkey.name ? `${schema}.${fkey.name}` : getConstraintName(table, {
-            references: { columns: [(_i = (_h = change.column) == null ? void 0 : _h.data.name) != null ? _i : name] }
+          ((_h = fkey.options) == null ? void 0 : _h.name) ? `${schema}.${fkey.options.name}` : getConstraintName(table, {
+            references: { columns: [(_j = (_i = change.column) == null ? void 0 : _i.data.name) != null ? _j : name] }
           })
         );
-        const [s = currentSchema, t] = getForeignKeyTable(
-          "table" in fkey ? fkey.table : fkey.fn
-        );
+        const [s = currentSchema, t] = getForeignKeyTable(fkey.fnOrTable);
         deps.push(`${s}.${t}`);
       }
     }
   }
 };
 const analyzeTableData = (currentSchema, schema, table, keys, deps, data) => {
-  var _a, _b;
   if (data.primaryKey) {
-    const name = (_a = data.primaryKey.options) == null ? void 0 : _a.name;
+    const name = data.primaryKey.name;
     keys.push(name ? `${schema}.${name}` : `${table}_pkey`);
   }
   if (data.indexes) {
     for (const index of data.indexes) {
-      const name = (_b = index.options) == null ? void 0 : _b.name;
       keys.push(
-        name ? `${schema}.${name}` : getIndexName(table, index.columns)
+        index.name ? `${schema}.${index.name}` : getIndexName(table, index.columns)
       );
     }
   }
@@ -4814,20 +4782,28 @@ ${group.map(
 };
 const astEncoders = {
   table(ast, config) {
+    var _a, _b;
     let code = [];
     const result = code;
     const hasOptions = Boolean(ast.comment || ast.noPrimaryKey === "ignore");
-    if (hasOptions) {
+    const hasTableData = Boolean(
+      ast.primaryKey || ((_a = ast.indexes) == null ? void 0 : _a.length) || ((_b = ast.constraints) == null ? void 0 : _b.length)
+    );
+    const isShifted = hasOptions || hasTableData;
+    if (isShifted) {
       addCode(code, `await db.${ast.action}Table(`);
       const inner = [`${quoteSchemaTable(ast)},`];
       code.push(inner);
       code = inner;
-      const options = [];
-      if (ast.comment)
-        options.push(`comment: ${JSON.stringify(ast.comment)},`);
-      if (ast.noPrimaryKey === "ignore")
-        options.push(`noPrimaryKey: true,`);
-      code.push("{", options, "},", "(t) => ({");
+      if (hasOptions) {
+        const options = [];
+        if (ast.comment)
+          options.push(`comment: ${JSON.stringify(ast.comment)},`);
+        if (ast.noPrimaryKey === "ignore")
+          options.push(`noPrimaryKey: true,`);
+        code.push("{", options, "},");
+      }
+      code.push("(t) => ({");
     } else {
       addCode(
         code,
@@ -4852,21 +4828,10 @@ const astEncoders = {
     if (timestamps.hasAnyTimestamps) {
       code.push([`...${timestampsToCode(config, timestamps)},`]);
     }
-    if (ast.primaryKey) {
-      code.push([primaryKeyToCode(ast.primaryKey, "t")]);
-    }
-    if (ast.indexes) {
-      for (const index of ast.indexes) {
-        code.push(indexToCode(index, "t"));
-      }
-    }
-    if (ast.constraints) {
-      for (const constraint of ast.constraints) {
-        code.push(constraintToCode(constraint, "t", true));
-      }
-    }
-    if (hasOptions) {
+    if (isShifted) {
       addCode(code, "}),");
+      if (hasTableData)
+        pushTableDataCode(code, ast);
       addCode(result, ");");
     } else {
       addCode(result, "}));");
@@ -5082,25 +5047,20 @@ const astEncoders = {
     ];
   },
   constraint(ast) {
-    const kind = getConstraintKind(ast);
     const table = quoteSchemaTable({
       schema: ast.tableSchema,
       name: ast.tableName
     });
-    if (kind === "foreignKey" && ast.references) {
+    if (ast.references) {
       return [
         `await db.addForeignKey(`,
         [`${table},`, ...referencesArgsToCode(ast.references, ast.name, true)],
         ");"
       ];
     }
-    if (kind === "check" && ast.check) {
-      return [`await db.addCheck(${table}, ${ast.check.toCode("t")});`];
-    }
+    const check = ast.check;
     return [
-      `await db.addConstraint(${table}, {`,
-      constraintPropsToCode("t", ast, true),
-      "});"
+      `await db.addCheck(${table}, ${check.toCode("t")}${ast.name ? `, ${singleQuote(ast.name)}` : ""});`
     ];
   },
   renameTableItem(ast) {