orchid-orm 1.32.7 → 1.32.9

package/dist/migrations.js

@@ -397,172 +397,190 @@ const dropColumns = ({ changeTableAst: { shape } }, columnsToDrop) => {
   }
 };
 const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, domainsMap, ast, currentSchema, dbColumns, columnsToChange, compareSql, changeTableData, typeCastsCache, verifying) => {
-  var _a, _b, _c, _d, _e;
+  var _a;
   for (const [
     key,
     { key: codeKey, dbName, column: codeColumn }
   ] of columnsToChange) {
     const dbColumnStructure = dbColumns[dbName];
     const { shape } = changeTableData.changeTableAst;
-    let changed = false;
     const dbColumn = rakeDb.instantiateDbColumn(
       structureToAstCtx,
       dbStructure,
       domainsMap,
       dbColumnStructure
     );
-    const dbType = getColumnDbType(dbColumn, currentSchema);
-    const codeType = getColumnDbType(codeColumn, currentSchema);
-    if (dbType !== codeType) {
-      let typeCasts = typeCastsCache.value;
-      if (!typeCasts) {
-        const { rows } = await adapter.arrays(`SELECT s.typname, t.typname
+    const action = await compareColumns(
+      adapter,
+      domainsMap,
+      ast,
+      currentSchema,
+      compareSql,
+      changeTableData,
+      typeCastsCache,
+      verifying,
+      key,
+      dbColumn,
+      codeColumn
+    );
+    if (action === "change") {
+      changeColumn(shape, key, dbColumn, codeColumn);
+    } else if (action === "recreate") {
+      changeTableData.changeTableAst.shape[key] = [
+        {
+          type: "drop",
+          item: dbColumn
+        },
+        {
+          type: "add",
+          item: codeColumn
+        }
+      ];
+    } else if (action !== "recreate") {
+      const to = (_a = codeColumn.data.name) != null ? _a : codeKey;
+      if (dbName !== to) {
+        shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
+          type: "rename",
+          name: config.snakeCase ? to === orchidCore.toSnakeCase(codeKey) ? codeKey : to : to
+        };
+      }
+    }
+  }
+};
+const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbColumn, codeColumn) => {
+  var _a, _b, _c, _d;
+  const dbType = getColumnDbType(dbColumn, currentSchema);
+  const codeType = getColumnDbType(codeColumn, currentSchema);
+  if (dbColumn instanceof pqb.ArrayColumn && codeColumn instanceof pqb.ArrayColumn) {
+    dbColumn = dbColumn.data.item;
+    codeColumn = codeColumn.data.item;
+  }
+  if (dbType !== codeType) {
+    let typeCasts = typeCastsCache.value;
+    if (!typeCasts) {
+      const { rows } = await adapter.arrays(`SELECT s.typname, t.typname
 FROM pg_cast
 JOIN pg_type AS s ON s.oid = castsource
 JOIN pg_type AS t ON t.oid = casttarget`);
-        const directTypeCasts = /* @__PURE__ */ new Map();
-        for (const [source, target] of rows) {
-          const set = directTypeCasts.get(source);
-          if (set) {
-            set.add(target);
-          } else {
-            directTypeCasts.set(source, /* @__PURE__ */ new Set([target]));
-          }
-        }
-        typeCasts = /* @__PURE__ */ new Map();
-        for (const [type, directSet] of directTypeCasts.entries()) {
-          const set = new Set(directSet);
-          typeCasts.set(type, set);
-          for (const subtype of directSet) {
-            const subset = directTypeCasts.get(subtype);
-            if (subset) {
-              for (const type2 of subset) {
-                set.add(type2);
-              }
-            }
-          }
+      const directTypeCasts = /* @__PURE__ */ new Map();
+      for (const [source, target] of rows) {
+        const set = directTypeCasts.get(source);
+        if (set) {
+          set.add(target);
+        } else {
+          directTypeCasts.set(source, /* @__PURE__ */ new Set([target]));
         }
-        typeCastsCache.value = typeCasts;
       }
-      const dbBaseType = dbColumn instanceof pqb.DomainColumn ? (_a = domainsMap[dbColumn.dataType]) == null ? void 0 : _a.dataType : dbType;
-      const codeBaseType = codeColumn instanceof pqb.DomainColumn ? (_b = domainsMap[codeColumn.dataType]) == null ? void 0 : _b.dataType : codeType;
-      if (!((_c = typeCasts.get(dbBaseType)) == null ? void 0 : _c.has(codeBaseType))) {
-        if (!(dbColumn instanceof pqb.EnumColumn) || !(codeColumn instanceof pqb.EnumColumn) || !orchidCore.deepCompare(dbColumn.options, codeColumn.options)) {
-          if (verifying)
-            throw new AbortSignal();
-          const tableName = rakeDb.concatSchemaAndName(changeTableData.changeTableAst);
-          const abort = await rakeDb.promptSelect({
-            message: `Cannot cast type of ${tableName}'s column ${key} from ${dbType} to ${codeType}`,
-            options: [
-              `${rakeDb.colors.yellowBold(
-                `-/+`
-              )} recreate the column, existing data will be ${rakeDb.colors.red(
-                "lost"
-              )}`,
-              `write migration manually`
-            ]
-          });
-          if (abort) {
-            throw new AbortSignal();
-          }
-          dbColumn.data.name = codeColumn.data.name;
-          shape[key] = [
-            {
-              type: "drop",
-              item: dbColumn
-            },
-            {
-              type: "add",
-              item: codeColumn
+      typeCasts = /* @__PURE__ */ new Map();
+      for (const [type, directSet] of directTypeCasts.entries()) {
+        const set = new Set(directSet);
+        typeCasts.set(type, set);
+        for (const subtype of directSet) {
+          const subset = directTypeCasts.get(subtype);
+          if (subset) {
+            for (const type2 of subset) {
+              set.add(type2);
             }
-          ];
-          return;
-        }
-      }
-      changed = true;
-    }
-    const dbData = dbColumn.data;
-    const codeData = codeColumn.data;
-    if (!changed) {
-      if (!dbData.isNullable)
-        dbData.isNullable = void 0;
-      for (const key2 of ["isNullable", "comment"]) {
-        if (dbData[key2] !== codeData[key2]) {
-          changed = true;
-          break;
+          }
         }
       }
-    }
-    if (!changed) {
-      for (const key2 of [
-        "maxChars",
-        "collation",
-        "compression",
-        "numericPrecision",
-        "numericScale",
-        "dateTimePrecision"
-      ]) {
-        if (key2 in codeData && dbData[key2] !== codeData[key2]) {
-          changed = true;
-          break;
+      typeCastsCache.value = typeCasts;
+    }
+    const dbBaseType = dbColumn instanceof pqb.DomainColumn ? (_a = domainsMap[dbColumn.dataType]) == null ? void 0 : _a.dataType : dbType;
+    const codeBaseType = codeColumn instanceof pqb.DomainColumn ? (_b = domainsMap[codeColumn.dataType]) == null ? void 0 : _b.dataType : codeType;
+    if (!((_c = typeCasts.get(dbBaseType)) == null ? void 0 : _c.has(codeBaseType))) {
+      if (!(dbColumn instanceof pqb.EnumColumn) || !(codeColumn instanceof pqb.EnumColumn) || !orchidCore.deepCompare(dbColumn.options, codeColumn.options)) {
+        if (verifying)
+          throw new AbortSignal();
+        const tableName = rakeDb.concatSchemaAndName(changeTableData.changeTableAst);
+        const abort = await rakeDb.promptSelect({
+          message: `Cannot cast type of ${tableName}'s column ${key} from ${dbType} to ${codeType}`,
+          options: [
+            `${rakeDb.colors.yellowBold(
+              `-/+`
+            )} recreate the column, existing data will be ${rakeDb.colors.red(
+              "lost"
+            )}`,
+            `write migration manually`
+          ]
+        });
+        if (abort) {
+          throw new AbortSignal();
         }
+        dbColumn.data.name = codeColumn.data.name;
+        return "recreate";
       }
     }
-    if (!changed && !orchidCore.deepCompare(
-      dbData.identity,
-      codeData.identity ? __spreadValues$6({
-        always: false,
-        start: 1,
-        increment: 1,
-        cache: 1,
-        cycle: false
-      }, (_d = codeData.identity) != null ? _d : {}) : void 0
-    )) {
-      changed = true;
-    }
-    if (!changed && dbData.default !== void 0 && dbData.default !== null && codeData.default !== void 0 && codeData.default !== null) {
-      const valuesBeforeLen = compareSql.values.length;
-      const dbDefault = rakeDb.encodeColumnDefault(
-        dbData.default,
-        compareSql.values,
-        dbColumn
-      );
-      const dbValues = compareSql.values.slice(valuesBeforeLen);
-      const codeDefault = rakeDb.encodeColumnDefault(
-        codeData.default,
-        compareSql.values,
-        codeColumn
-      );
-      const codeValues = compareSql.values.slice(valuesBeforeLen);
-      if (dbValues.length !== codeValues.length || dbValues.length && JSON.stringify(dbValues) !== JSON.stringify(codeValues)) {
-        changed = true;
-        compareSql.values.length = valuesBeforeLen;
-      } else if (dbDefault !== codeDefault && dbDefault !== `(${codeDefault})`) {
-        compareSql.expressions.push({
-          inDb: dbDefault,
-          inCode: codeDefault,
-          change: () => {
-            changeColumn(shape, key, dbColumn, codeColumn);
-            if (!changeTableData.pushedAst) {
-              changeTableData.pushedAst = true;
-              ast.push(changeTableData.changeTableAst);
-            }
+    return "change";
+  }
+  const dbData = dbColumn.data;
+  const codeData = codeColumn.data;
+  for (const key2 of ["isNullable", "comment"]) {
+    if (dbData[key2] !== codeData[key2]) {
+      return "change";
+    }
+  }
+  for (const key2 of [
+    "maxChars",
+    "collation",
+    "compression",
+    "numericPrecision",
+    "numericScale",
+    "dateTimePrecision"
+  ]) {
+    if (key2 in codeData && dbData[key2] !== codeData[key2]) {
+      return "change";
+    }
+  }
+  if (!orchidCore.deepCompare(
+    dbData.identity,
+    codeData.identity ? __spreadValues$6({
+      always: false,
+      start: 1,
+      increment: 1,
+      cache: 1,
+      cycle: false
+    }, (_d = codeData.identity) != null ? _d : {}) : void 0
+  )) {
+    return "change";
+  }
+  if (dbData.default !== void 0 && dbData.default !== null && codeData.default !== void 0 && codeData.default !== null) {
+    const valuesBeforeLen = compareSql.values.length;
+    const dbDefault = rakeDb.encodeColumnDefault(
+      dbData.default,
+      compareSql.values,
+      dbColumn
+    );
+    const dbValues = compareSql.values.slice(valuesBeforeLen);
+    const codeDefault = rakeDb.encodeColumnDefault(
+      codeData.default,
+      compareSql.values,
+      codeColumn
+    );
+    const codeValues = compareSql.values.slice(valuesBeforeLen);
+    if (dbValues.length !== codeValues.length || dbValues.length && JSON.stringify(dbValues) !== JSON.stringify(codeValues)) {
+      compareSql.values.length = valuesBeforeLen;
+      return "change";
+    } else if (dbDefault !== codeDefault && dbDefault !== `(${codeDefault})`) {
+      compareSql.expressions.push({
+        inDb: dbDefault,
+        inCode: codeDefault,
+        change: () => {
+          changeColumn(
+            changeTableData.changeTableAst.shape,
+            key,
+            dbColumn,
+            codeColumn
+          );
+          if (!changeTableData.pushedAst) {
+            changeTableData.pushedAst = true;
+            ast.push(changeTableData.changeTableAst);
           }
-        });
-      }
-    }
-    if (changed) {
-      changeColumn(shape, key, dbColumn, codeColumn);
-    } else {
-      const to = (_e = codeColumn.data.name) != null ? _e : codeKey;
-      if (dbName !== to) {
-        shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
-          type: "rename",
-          name: config.snakeCase ? to === orchidCore.toSnakeCase(codeKey) ? codeKey : to : to
-        };
-      }
+        }
+      });
     }
   }
+  return;
 };
 const changeColumn = (shape, name, dbColumn, codeColumn) => {
   dbColumn.data.as = codeColumn.data.as = void 0;
@@ -578,6 +596,8 @@ const getColumnDbType = (column, currentSchema) => {
       column.enumName
     );
     return column.enumName = `${schema}.${name}`;
+  } else if (column instanceof pqb.ArrayColumn) {
+    return column.data.item.dataType + "[]".repeat(column.data.arrayDims);
   } else {
     return column.dataType;
   }
@@ -614,7 +634,7 @@ const processDomains = async (ast, adapter, structureToAstCtx, domainsMap, dbStr
         name: domain.name,
         typeSchema: domain.typeSchema,
         type: domain.type,
-        isArray: domain.isArray,
+        arrayDims: domain.arrayDims,
         default: domain.default,
         isNullable: domain.isNullable,
         collate: domain.collate,
@@ -695,12 +715,12 @@ const processDomains = async (ast, adapter, structureToAstCtx, domainsMap, dbStr
 };
 const makeComparableDomain = (currentSchema, schemaName, name, column) => {
   var _a;
-  let isArray = false;
+  let arrayDims = 0;
   const isNullable = (_a = column.data.isNullable) != null ? _a : false;
   let inner = column;
-  if (column instanceof pqb.ArrayColumn) {
-    inner = column.data.item;
-    isArray = true;
+  while (inner instanceof pqb.ArrayColumn) {
+    inner = inner.data.item;
+    arrayDims++;
   }
   const fullType = getColumnDbType(inner, currentSchema);
   const [typeSchema = "pg_catalog", type] = rakeDb.getSchemaAndTableFromName(fullType);
@@ -711,7 +731,7 @@ const makeComparableDomain = (currentSchema, schemaName, name, column) => {
     compare: {
       type,
       typeSchema,
-      isArray,
+      arrayDims,
       isNullable,
       maxChars: inner.data.maxChars,
       numericPrecision: inner.data.numericPrecision,
@@ -2483,7 +2503,9 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
     }
     for (const key2 in table.shape) {
       const column = table.shape[key2];
-      if (column instanceof pqb.DomainColumn) {
+      if (column.data.computed) {
+        delete table.shape[key2];
+      } else if (column instanceof pqb.DomainColumn) {
         const [schemaName = currentSchema, name2] = rakeDb.getSchemaAndTableFromName(
           column.dataType
         );