orchid-orm 1.58.3 → 1.58.5

package/dist/migrations/postgres-js.js

@@ -24,7 +24,14 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
         `SELECT pg_get_viewdef('${viewName}') v`,
         `DROP VIEW ${viewName}`
       ].join("; ");
-      const result = await adapter.query(combinedQueries, values).then((res) => res[1], pqb.noop);
+      const result = await adapter.query(combinedQueries, values).then(
+        (res) => res[1],
+        (err) => {
+          if (err.code !== "42704") {
+            throw err;
+          }
+        }
+      );
       if (!result) {
         handle();
         return;
@@ -606,15 +613,13 @@ const getColumnDbType = (column, currentSchema) => {
     let type = item instanceof pqb.EnumColumn ? item.enumName : item.dataType;
     type = type.startsWith(currentSchema + ".") ? type.slice(currentSchema.length + 1) : type;
     return type + "[]".repeat(column.data.arrayDims);
-  } else if (column.data.isOfCustomType) {
+  } else {
     let type = column.dataType;
     const i = type.indexOf("(");
     if (i !== -1) {
       type = type.slice(0, i);
     }
-    return type.includes(".") ? type : currentSchema + "." + type;
-  } else {
-    return column.dataType;
+    return column.data.isOfCustomType ? type.includes(".") ? type : currentSchema + "." + type : type;
   }
 };
 const getColumnDbTypeQuoted = (column, currentSchema) => {
@@ -636,7 +641,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
   structureToAstCtx,
   currentSchema,
   internal: { generatorIgnore }
-}) => {
+}, pendingDbTypes) => {
   const codeDomains = [];
   if (domains) {
     for (const { schemaName, name, column } of domains) {
@@ -723,6 +728,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
           toSchema: first.schemaName,
           to: first.name
         });
+        pendingDbTypes.add(first.schemaName, first.name);
       }
       codeDomains.splice(i, 1);
     } else {
@@ -732,6 +738,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
   for (const codeDomain of codeDomains) {
     if (!holdCodeDomains.has(codeDomain)) {
       ast.push(createAst(codeDomain));
+      pendingDbTypes.add(codeDomain.schemaName, codeDomain.name);
     }
   }
   if (tableExpressions.length) {
@@ -739,6 +746,7 @@ const processDomains = async (ast, adapter, domainsMap, dbStructure, {
     if (holdCodeDomains.size) {
       for (const codeDomain of holdCodeDomains.keys()) {
         ast.push(createAst(codeDomain));
+        pendingDbTypes.add(codeDomain.schemaName, codeDomain.name);
       }
     }
   }
@@ -821,7 +829,7 @@ const processEnums = async (ast, dbStructure, {
   currentSchema,
   verifying,
   internal: { generatorIgnore }
-}) => {
+}, pendingDbTypes) => {
   const createEnums = [];
   const dropEnums = [];
   for (const [, codeEnum] of enums) {
@@ -839,7 +847,7 @@ const processEnums = async (ast, dbStructure, {
     }
     const codeEnum = enums.get(`${dbEnum.schemaName}.${dbEnum.name}`);
     if (codeEnum) {
-      changeEnum(ast, dbEnum, codeEnum);
+      changeEnum(ast, dbEnum, codeEnum, pendingDbTypes);
       continue;
     }
     const i = createEnums.findIndex((x) => x.name === dbEnum.name);
@@ -857,7 +865,8 @@ const processEnums = async (ast, dbStructure, {
         toSchema,
         to: dbEnum.name
       });
-      changeEnum(ast, dbEnum, codeEnum2);
+      pendingDbTypes.add(toSchema, dbEnum.name);
+      changeEnum(ast, dbEnum, codeEnum2, pendingDbTypes);
       continue;
     }
     dropEnums.push(dbEnum);
@@ -895,7 +904,8 @@ const processEnums = async (ast, dbStructure, {
           toSchema,
           to
         });
-        changeEnum(ast, dbEnum, codeEnum);
+        pendingDbTypes.add(toSchema, to);
+        changeEnum(ast, dbEnum, codeEnum, pendingDbTypes);
         continue;
       }
     }
@@ -904,6 +914,7 @@ const processEnums = async (ast, dbStructure, {
       action: "create",
       ...codeEnum
     });
+    pendingDbTypes.add(codeEnum.schema, codeEnum.name);
   }
   for (const dbEnum of dropEnums) {
     ast.push({
@@ -915,7 +926,7 @@ const processEnums = async (ast, dbStructure, {
     });
   }
 };
-const changeEnum = (ast, dbEnum, codeEnum) => {
+const changeEnum = (ast, dbEnum, codeEnum, pendingDbTypes) => {
   const { values: dbValues } = dbEnum;
   const { values: codeValues, schema, name } = codeEnum;
   if (dbValues.length < codeValues.length) {
@@ -927,6 +938,7 @@ const changeEnum = (ast, dbEnum, codeEnum) => {
         name,
         values: codeValues.filter((value) => !dbValues.includes(value))
       });
+      pendingDbTypes.add(schema, name);
       return;
     }
   } else if (dbValues.length > codeValues.length) {
@@ -938,6 +950,7 @@ const changeEnum = (ast, dbEnum, codeEnum) => {
         name,
         values: dbValues.filter((value) => !codeValues.includes(value))
       });
+      pendingDbTypes.add(schema, name);
       return;
     }
   } else if (!dbValues.some((value) => !codeValues.includes(value))) {
@@ -950,6 +963,7 @@ const changeEnum = (ast, dbEnum, codeEnum) => {
     fromValues: dbValues,
     toValues: codeValues
   });
+  pendingDbTypes.add(schema, name);
 };
 const renameColumnsTypeSchema = (dbStructure, from, to) => {
   for (const table of dbStructure.tables) {
@@ -1828,7 +1842,7 @@ const processTables = async (ast, domainsMap, adapter, dbStructure, config, {
   currentSchema,
   internal: { generatorIgnore },
   verifying
-}) => {
+}, pendingDbTypes) => {
   const createTables = collectCreateTables(
     tables,
     dbStructure,
@@ -1866,7 +1880,8 @@ const processTables = async (ast, domainsMap, adapter, dbStructure, config, {
     config,
     compareSql,
     tableExpressions,
-    verifying
+    verifying,
+    pendingDbTypes
   );
   processForeignKeys(config, ast, changeTables, currentSchema, tableShapes);
   await Promise.all([
@@ -1944,7 +1959,7 @@ const applyChangeTableSchemas = (changeTableSchemas, currentSchema, ast) => {
     });
   }
 };
-const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStructure, domainsMap, ast, currentSchema, config, compareSql, tableExpressions, verifying) => {
+const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStructure, domainsMap, ast, currentSchema, config, compareSql, tableExpressions, verifying, pendingDbTypes) => {
   const compareExpressions = [];
   const typeCastsCache = {};
   for (const changeTableData of changeTables) {
@@ -1971,8 +1986,11 @@ const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStr
         const column = codeTable.shape[key];
         if (!column.dataType) continue;
         const name = column.data.name ?? key;
-        names.push(name);
-        types.push(getColumnDbTypeQuoted(column, currentSchema));
+        const type = getColumnDbTypeQuoted(column, currentSchema);
+        if (!pendingDbTypes.set.has(type)) {
+          names.push(name);
+          types.push(type);
+        }
       }
       const tableName = codeTable.table;
       const source = `(VALUES (${types.map((x) => `NULL::${x}`).join(", ")})) "${tableName}"(${names.map((x) => `"${x}"`).join(", ")})`;
@@ -2117,14 +2135,38 @@ const processTableChange = async (adapter, structureToAstCtx, dbStructure, domai
   }
 };
 
+class PendingDbTypes {
+  constructor() {
+    this.set = /* @__PURE__ */ new Set();
+  }
+  add(schemaName = "public", name) {
+    this.set.add(`"${schemaName}"."${name}"`);
+  }
+}
 const composeMigration = async (adapter, config, ast, dbStructure, params) => {
   const { structureToAstCtx, currentSchema } = params;
   const domainsMap = rakeDb.makeDomainsMap(structureToAstCtx, dbStructure);
   await processSchemas(ast, dbStructure, params);
   processExtensions(ast, dbStructure, params);
-  await processDomains(ast, adapter, domainsMap, dbStructure, params);
-  await processEnums(ast, dbStructure, params);
-  await processTables(ast, domainsMap, adapter, dbStructure, config, params);
+  const pendingDbTypes = new PendingDbTypes();
+  await processDomains(
+    ast,
+    adapter,
+    domainsMap,
+    dbStructure,
+    params,
+    pendingDbTypes
+  );
+  await processEnums(ast, dbStructure, params, pendingDbTypes);
+  await processTables(
+    ast,
+    domainsMap,
+    adapter,
+    dbStructure,
+    config,
+    params,
+    pendingDbTypes
+  );
   return rakeDb.astToMigration(currentSchema, config, ast);
 };