orchid-orm 1.58.6 → 1.58.7

package/dist/migrations/postgres-js.js

@@ -11,38 +11,42 @@ var postgresJs = require('rake-db/postgres-js');
 const compareSqlExpressions = async (tableExpressions, adapter) => {
   if (!tableExpressions.length) return;
   let id = 1;
-  await Promise.all(
-    tableExpressions.map(async ({ source, compare, handle }) => {
-      const viewName = `orchidTmpView${id++}`;
-      const values = [];
-      const combinedQueries = [
-        `CREATE TEMPORARY VIEW ${viewName} AS (SELECT ${compare.map(
-          ({ inDb, inCode }, i) => `${inDb} AS "*inDb-${i}*", ${inCode.map(
-            (s, j) => `(${typeof s === "string" ? s : s.toSQL({ values })}) "*inCode-${i}-${j}*"`
-          ).join(", ")}`
-        ).join(", ")} FROM ${source})`,
-        `SELECT pg_get_viewdef('${viewName}') v`,
-        `DROP VIEW ${viewName}`
-      ].join("; ");
-      const result = await adapter.query(combinedQueries, values).then(
-        (res) => res[1],
-        (err) => {
-          if (err.code !== "42704") {
-            throw err;
-          }
+  for (const { source, compare, handle } of tableExpressions) {
+    const viewName = `orchidTmpView${id++}`;
+    const values = [];
+    const combinedQueries = [
+      `SAVEPOINT "${viewName}"`,
+      `CREATE TEMPORARY VIEW ${viewName} AS (SELECT ${compare.map(
+        ({ inDb, inCode }, i) => `${inDb} AS "*inDb-${i}*", ${inCode.map(
+          (s, j) => `(${typeof s === "string" ? s : s.toSQL({ values })}) "*inCode-${i}-${j}*"`
+        ).join(", ")}`
+      ).join(", ")} FROM ${source})`,
+      `SELECT pg_get_viewdef('${viewName}') v`,
+      `DROP VIEW ${viewName}`,
+      `RELEASE SAVEPOINT "${viewName}"`
+    ].join("; ");
+    const result = await adapter.query(combinedQueries, values).then(
+      (res) => {
+        const results = res;
+        return results.length === 2 ? results[1] : results[2];
+      },
+      async (err) => {
+        await adapter.query(`ROLLBACK TO SAVEPOINT "${viewName}"`);
+        if (err.code !== "42704") {
+          throw err;
         }
-      );
-      if (!result) {
-        handle();
-        return;
       }
-      const match = compareSqlExpressionResult(
-        result.rows[0].v,
-        compare[0].inCode
-      );
-      handle(match);
-    })
-  );
+    );
+    if (!result) {
+      handle();
+      return;
+    }
+    const match = compareSqlExpressionResult(
+      result.rows[0].v,
+      compare[0].inCode
+    );
+    handle(match);
+  }
 };
 const compareSqlExpressionResult = (resultSql, inCode) => {
   let pos = 7;
@@ -607,27 +611,23 @@ const getColumnDbType = (column, currentSchema) => {
     const [schema = currentSchema, name] = rakeDb.getSchemaAndTableFromName(
       column.enumName
     );
-    return column.enumName = `${schema}.${name}`;
+    return `${schema}.${name}`;
   } else if (column instanceof pqb.ArrayColumn) {
     const { item } = column.data;
     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 {
+  } else if (column.data.isOfCustomType) {
     let type = column.dataType;
     const i = type.indexOf("(");
     if (i !== -1) {
       type = type.slice(0, i);
     }
-    return column.data.isOfCustomType ? type.includes(".") ? type : currentSchema + "." + type : type;
+    return type.includes(".") ? type : currentSchema + "." + type;
+  } else {
+    return column.dataType;
   }
 };
-const getColumnDbTypeQuoted = (column, currentSchema) => {
-  const [schema, type] = rakeDb.getSchemaAndTableFromName(
-    getColumnDbType(column, currentSchema)
-  );
-  return schema ? `"${schema}"."${type}"` : `"${type}"`;
-};
 const renameColumn = (columns, from, to) => {
   for (let i = 0; i < columns.length; i++) {
     if (columns[i] === from) {
@@ -1986,7 +1986,7 @@ const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStr
         const column = codeTable.shape[key];
         if (!column.dataType) continue;
         const name = column.data.name ?? key;
-        const type = getColumnDbTypeQuoted(column, currentSchema);
+        const type = getColumnDbTypeForComparison(column, currentSchema);
         if (!pendingDbTypes.set.has(type)) {
           names.push(name);
           types.push(type);
@@ -2000,6 +2000,29 @@ const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStr
     }
   }
 };
+const getColumnDbTypeForComparison = (column, currentSchema) => {
+  if (column instanceof pqb.EnumColumn) {
+    return "text";
+  }
+  if (column instanceof pqb.ArrayColumn) {
+    return getColumnDbTypeForComparison(column.data.item, currentSchema) + "[]".repeat(column.data.arrayDims);
+  }
+  let type = column.dataType;
+  const i = type.indexOf("(");
+  let append = "";
+  if (i !== -1) {
+    type = type.slice(0, i);
+    append = type.slice(i);
+  }
+  const j = type.indexOf(".");
+  if (j === -1) {
+    let result = `"${type}"${append}`;
+    if (column.data.isOfCustomType) result = `"${currentSchema}".${result}`;
+    return result;
+  } else {
+    return `"${type.slice(j)}"."${type.slice(0, j)}"${append}`;
+  }
+};
 const applyCompareSql = async (compareSql, adapter) => {
   if (compareSql.expressions.length) {
     const {