rake-db 2.22.8 → 2.22.9

package/dist/index.js

@@ -1212,7 +1212,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     for (let i = 0; i < indexesLen; i++) {
       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 || toIndex) && (!fromIndex || !toIndex || !orchidCore.deepCompare(fromIndex, toIndex))) {
         if (fromIndex) {
           dropIndexes.push(__spreadProps$5(__spreadValues$7({}, fromIndex), {
             columns: [
@@ -4984,11 +4984,17 @@ const astEncoders = {
       ast.shape.createdAt,
       ast.shape.updatedAt
     );
+    const toCodeCtx = {
+      t: "t",
+      table: ast.name,
+      migration: true,
+      snakeCase: config.snakeCase
+    };
     for (const key in ast.shape) {
       if (timestamps.hasAnyTimestamps && (key === "createdAt" || key === "updatedAt"))
         continue;
       const line = [`${orchidCore.quoteObjectKey(key)}: `];
-      const columnCode = orchidCore.columnToCode(key, ast.shape[key], config.snakeCase);
+      const columnCode = ast.shape[key].toCode(toCodeCtx, key);
       for (const part of columnCode) {
         orchidCore.addCode(line, part);
       }
@@ -5038,6 +5044,12 @@ const astEncoders = {
         );
       }
     );
+    const toCodeCtx = {
+      t: "t",
+      table: ast.name,
+      migration: true,
+      snakeCase: config.snakeCase
+    };
     for (const key in ast.shape) {
       const changes = orchidCore.toArray(ast.shape[key]);
       for (const change of changes) {
@@ -5050,7 +5062,7 @@ const astEncoders = {
               (_a = change.item.data.name) != null ? _a : key
             )})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
           ];
-          const columnCode = orchidCore.columnToCode(key, change.item, config.snakeCase);
+          const columnCode = change.item.toCode(toCodeCtx, key);
           for (let i = 0; i < columnCode.length; i++) {
             let part = columnCode[i];
             if (recreate && !i)
@@ -5065,16 +5077,20 @@ const astEncoders = {
           const line = [
             `${orchidCore.quoteObjectKey(key)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
           ];
-          const fromCode = orchidCore.columnToCode(
-            key,
-            change.from.column,
-            config.snakeCase
+          const fromCode = change.from.column.toCode(
+            {
+              t: "t",
+              table: ast.name,
+              migration: true,
+              snakeCase: config.snakeCase
+            },
+            key
           );
           for (const part of fromCode) {
             orchidCore.addCode(line, part);
           }
           orchidCore.addCode(line, ", ");
-          const toCode = orchidCore.columnToCode(key, change.to.column, config.snakeCase);
+          const toCode = change.to.column.toCode(toCodeCtx, key);
           for (const part of toCode) {
             orchidCore.addCode(line, part);
           }
@@ -5198,9 +5214,13 @@ const astEncoders = {
     )}, [${ast.fromValues.map(orchidCore.singleQuote).join(", ")}], [${ast.toValues.map(orchidCore.singleQuote).join(", ")}]);`;
   },
   domain(ast) {
+    var _a;
     return `await db.${ast.action}Domain(${quoteSchemaTable(
       ast
-    )}, (t) => ${ast.baseType.toCode("t")});`;
+    )}, (t) => ${ast.baseType.toCode(
+      { t: "t", table: ast.name },
+      (_a = ast.baseType.data.name) != null ? _a : ""
+    )});`;
   },
   collation(ast) {
     const params = [];