rake-db 2.27.5 → 2.27.7

package/dist/index.mjs

@@ -418,7 +418,7 @@ const getIndexOrExcludeMainOptions = (tableName, item, getName, snakeCase) => {
   return {
     columns,
     include,
-    name: item.name || getName(tableName, columns)
+    name: item.options?.name || getName(tableName, columns)
   };
 };
 const commentsToQuery = (schemaTable, comments) => {
@@ -1510,20 +1510,20 @@ class Migration {
    *
    * @param tableName - name of the table to add the index for
    * @param columns - indexed columns
-   * @param args - index options, or an index name and then options
+   * @param args - index options
    */
   addIndex(tableName, columns, ...args) {
-    return addIndex(this, this.up, 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 args - index options, or an index name and then options
+   * @param args - index options
    */
   dropIndex(tableName, columns, ...args) {
-    return addIndex(this, !this.up, tableName, columns, args);
+    return addIndex(this, !this.up, tableName, columns, ...args);
   }
   /**
    * Rename index:
@@ -2248,7 +2248,7 @@ const addColumn = (migration, up, tableName, columnName, fn) => {
     [columnName]: t.add(fn(t))
   }));
 };
-const addIndex = (migration, up, tableName, columns, args) => {
+const addIndex = (migration, up, tableName, columns, ...args) => {
   return changeTable(migration, up, tableName, {}, (t) => ({
     ...t.add(t.index(columns, ...args))
   }));
@@ -4258,11 +4258,7 @@ const tableToAst = (ctx, data, table, action, domains) => {
 const indexesOrExcludesToAst = (tableName, tableData, key) => {
   return tableData[key].reduce((acc, item) => {
     if (item.columns.length > 1 || item.columns.some((it) => "expression" in it)) {
-      const { name, ...options } = makeIndexOrExcludeOptions(
-        tableName,
-        item,
-        key
-      );
+      const options = makeIndexOrExcludeOptions(tableName, item, key);
       acc.push({
         columns: item.columns.map((it, i) => ({
           with: "exclude" in item && item.exclude ? item.exclude[i] : void 0,
@@ -4274,8 +4270,7 @@ const indexesOrExcludesToAst = (tableName, tableData, key) => {
         options: {
           ...options,
           include: item.include?.map(toCamelCase)
-        },
-        name
+        }
       });
     }
     return acc;
@@ -4442,12 +4437,12 @@ const collectColumnIndexesOrExcludes = (dbColumn, column, tableName, tableData,
     ((_a = column.data)[key] ?? (_a[key] = [])).push({
       with: "exclude" in item && item.exclude ? item.exclude[0] : void 0,
       options: {
+        name,
         collate: columnOptions.collate,
         opclass: columnOptions.opclass,
         order: columnOptions.order,
         ...itemOptions
-      },
-      name
+      }
     });
   }
 };
@@ -4727,7 +4722,7 @@ const pushIndexOrExcludeKeys = (change, keys, schema, table, name, key) => {
     const getName = key === "indexes" ? getIndexName : getExcludeName;
     for (const x of items) {
       keys.push(
-        x.name ? `${schema}.${x.name}` : getName(table, [{ column: change.column?.data.name ?? name }])
+        x.options.name ? `${schema}.${x.options.name}` : getName(table, [{ column: change.column?.data.name ?? name }])
       );
     }
   }
@@ -4737,7 +4732,9 @@ const pushIndexesOrExcludesKeys = (keys, schema, table, data, key) => {
   if (arr) {
     const getName = key === "indexes" ? getIndexName : getExcludeName;
     for (const x of arr) {
-      keys.push(x.name ? `${schema}.${x.name}` : getName(table, x.columns));
+      keys.push(
+        x.options.name ? `${schema}.${x.options.name}` : getName(table, x.columns)
+      );
     }
   }
 };