rake-db 2.2.6 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # rake-db
 
+## 2.3.0
+
+### Minor Changes
+
+- Change index options: column or expression is required, operator renamed to opclass
+
+### Patch Changes
+
+- f1cd5db: Handle multiple indexes and foreignKeys of the column
+- Updated dependencies
+- Updated dependencies [f1cd5db]
+  - pqb@0.9.0
+
 ## 2.2.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -156,11 +156,11 @@ declare namespace RakeDbAst {
         comment?: string | null;
         compression?: string;
         primaryKey?: boolean;
-        foreignKey?: {
+        foreignKeys?: ({
             table: string;
             columns: string[];
-        } & ForeignKeyOptions;
-        index?: Omit<SingleColumnIndexOptions, 'column'>;
+        } & ForeignKeyOptions)[];
+        indexes?: Omit<SingleColumnIndexOptions, 'column' | 'expression'>[];
     };
     type RenameTable = {
         type: 'renameTable';

package/dist/index.esm.js

@@ -242,26 +242,28 @@ const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
       line.push(`DEFAULT ${quote(item.data.default)}`);
     }
   }
-  const { foreignKey } = item.data;
-  if (foreignKey) {
-    const [schema, table] = getForeignKeyTable(
-      "fn" in foreignKey ? foreignKey.fn : foreignKey.table
-    );
-    if (foreignKey.name) {
-      line.push(`CONSTRAINT "${foreignKey.name}"`);
+  const { foreignKeys } = item.data;
+  if (foreignKeys) {
+    for (const foreignKey of foreignKeys) {
+      const [schema, table] = getForeignKeyTable(
+        "fn" in foreignKey ? foreignKey.fn : foreignKey.table
+      );
+      if (foreignKey.name) {
+        line.push(`CONSTRAINT "${foreignKey.name}"`);
+      }
+      line.push(referencesToSql(schema, table, foreignKey.columns, foreignKey));
     }
-    line.push(referencesToSql(schema, table, foreignKey.columns, foreignKey));
   }
   return line.join(" ");
 };
 const addColumnIndex = (indexes, key, item) => {
-  if (item.data) {
-    if (item.data.index) {
-      indexes.push({
-        columns: [__spreadProps$4(__spreadValues$5({}, item.data.index), { column: key })],
-        options: item.data.index
-      });
-    }
+  if (item.data.indexes) {
+    indexes.push(
+      ...item.data.indexes.map((index) => ({
+        columns: [__spreadProps$4(__spreadValues$5({}, index), { column: key })],
+        options: index
+      }))
+    );
   }
 };
 const addColumnComment = (comments, key, item) => {
@@ -311,7 +313,11 @@ const referencesToSql = (schema, table, columns, foreignKey) => {
 };
 const indexesToQuery = (up, { schema, name }, indexes) => {
   return indexes.map(({ columns, options }) => {
-    const indexName = options.name || joinWords(name, ...columns.map(({ column }) => column), "index");
+    const indexName = options.name || joinWords(
+      name,
+      ...columns.filter((it) => "column" in it).map((it) => it.column),
+      "index"
+    );
     if (!up) {
       return {
         text: `DROP INDEX "${indexName}"${options.dropMode ? ` ${options.dropMode}` : ""}`,
@@ -330,13 +336,13 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
     const columnsSql = [];
     columns.forEach((column) => {
       const columnSql = [
-        `"${column.column}"${column.expression ? `(${column.expression})` : ""}`
+        "column" in column ? `"${column.column}"` : `(${column.expression})`
       ];
       if (column.collate) {
         columnSql.push(`COLLATE '${column.collate}'`);
       }
-      if (column.operator) {
-        columnSql.push(column.operator);
+      if (column.opclass) {
+        columnSql.push(column.opclass);
       }
       if (column.order) {
         columnSql.push(column.order);
@@ -612,8 +618,8 @@ const drop = (item, options) => {
 };
 const columnTypeToColumnChange = (item) => {
   if (item instanceof ColumnType) {
-    const foreignKey = item.data.foreignKey;
-    if (foreignKey && "fn" in foreignKey) {
+    const foreignKeys = item.data.foreignKeys;
+    if (foreignKeys == null ? void 0 : foreignKeys.some((it) => "fn" in it)) {
       throw new Error("Callback in foreignKey is not allowed in migration");
     }
     return __spreadProps$2(__spreadValues$3({
@@ -622,7 +628,7 @@ const columnTypeToColumnChange = (item) => {
       nullable: item.data.isNullable,
       primaryKey: item.isPrimaryKey
     }, item.data), {
-      foreignKey
+      foreignKeys
     });
   }
   return item.to;
@@ -702,7 +708,7 @@ const makeAst = (up, name, changeData, changeTableData2, options) => {
   }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
 };
 const astToQueries = (ast) => {
-  var _a;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const result = [];
   if (ast.comment !== void 0) {
     result.push({
@@ -784,48 +790,60 @@ const astToQueries = (ast) => {
           `ALTER COLUMN "${key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
         );
       }
-      const fromFkey = from.foreignKey;
-      const toFkey = to.foreignKey;
-      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) {
-          dropForeignKeys.push({
-            columns: [key],
-            fnOrTable: fromFkey.table,
-            foreignColumns: fromFkey.columns,
-            options: fromFkey
-          });
-        }
-        if (toFkey) {
-          addForeignKeys.push({
-            columns: [key],
-            fnOrTable: toFkey.table,
-            foreignColumns: toFkey.columns,
-            options: toFkey
-          });
+      const foreignKeysLen = Math.max(
+        ((_a = from.foreignKeys) == null ? void 0 : _a.length) || 0,
+        ((_b = to.foreignKeys) == null ? void 0 : _b.length) || 0
+      );
+      for (let i = 0; i < foreignKeysLen; i++) {
+        const fromFkey = (_c = from.foreignKeys) == null ? void 0 : _c[i];
+        const toFkey = (_d = to.foreignKeys) == null ? void 0 : _d[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) {
+            dropForeignKeys.push({
+              columns: [key],
+              fnOrTable: fromFkey.table,
+              foreignColumns: fromFkey.columns,
+              options: fromFkey
+            });
+          }
+          if (toFkey) {
+            addForeignKeys.push({
+              columns: [key],
+              fnOrTable: toFkey.table,
+              foreignColumns: toFkey.columns,
+              options: toFkey
+            });
+          }
         }
       }
-      const fromIndex = from.index;
-      const toIndex = to.index;
-      if ((fromIndex || toIndex) && (!fromIndex || !toIndex || fromIndex.expression !== toIndex.expression || fromIndex.collate !== toIndex.collate || fromIndex.operator !== toIndex.operator || 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)) {
-        if (fromIndex) {
-          dropIndexes.push({
-            columns: [
-              __spreadValues$3({
-                column: key
-              }, fromIndex)
-            ],
-            options: fromIndex
-          });
-        }
-        if (toIndex) {
-          addIndexes.push({
-            columns: [
-              __spreadValues$3({
-                column: key
-              }, toIndex)
-            ],
-            options: toIndex
-          });
+      const indexesLen = Math.max(
+        ((_e = from.indexes) == null ? void 0 : _e.length) || 0,
+        ((_f = to.indexes) == null ? void 0 : _f.length) || 0
+      );
+      for (let i = 0; i < indexesLen; i++) {
+        const fromIndex = (_g = from.indexes) == null ? void 0 : _g[i];
+        const toIndex = (_h = to.indexes) == null ? void 0 : _h[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)) {
+          if (fromIndex) {
+            dropIndexes.push({
+              columns: [
+                __spreadValues$3({
+                  column: key
+                }, fromIndex)
+              ],
+              options: fromIndex
+            });
+          }
+          if (toIndex) {
+            addIndexes.push({
+              columns: [
+                __spreadValues$3({
+                  column: key
+                }, toIndex)
+              ],
+              options: toIndex
+            });
+          }
         }
       }
       if (from.comment !== to.comment) {
@@ -837,7 +855,7 @@ const astToQueries = (ast) => {
   }
   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 = ((_i = dropPrimaryKeys.options) == null ? void 0 : _i.name) || `${ast.name}_pkey`;
     prependAlterTable.push(`DROP CONSTRAINT "${name}"`);
   }
   prependAlterTable.push(