orchid-orm 1.57.6 → 1.57.7

package/dist/migrations/postgres-js.js

@@ -10,43 +10,33 @@ var typescript = require('typescript');
 var postgresJs = require('rake-db/postgres-js');
 
 const compareSqlExpressions = async (tableExpressions, adapter) => {
-  if (tableExpressions.length) {
-    let id = 1;
-    await Promise.all(
-      tableExpressions.map(async ({ source, compare, handle }) => {
-        const viewName = `orchidTmpView${id++}`;
-        const values = [];
-        let result;
-        try {
-          const results = await adapter.query(
-            // It is important to run `CREATE TEMPORARY VIEW` and `DROP VIEW` on the same db connection,
-            // that's why SQLs are combined into a single query.
-            [
-              `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("; "),
-            values
-          );
-          result = results[1];
-        } catch {
-        }
-        if (!result) {
-          handle();
-          return;
-        }
-        const match = compareSqlExpressionResult(
-          result.rows[0].v,
-          compare[0].inCode
-        );
-        handle(match);
-      })
-    );
-  }
+  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], orchidCore.noop);
+      if (!result) {
+        handle();
+        return;
+      }
+      const match = compareSqlExpressionResult(
+        result.rows[0].v,
+        compare[0].inCode
+      );
+      handle(match);
+    })
+  );
 };
 const compareSqlExpressionResult = (resultSql, inCode) => {
   let pos = 7;
@@ -628,6 +618,12 @@ const getColumnDbType = (column, currentSchema) => {
     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) {
@@ -1977,7 +1973,7 @@ const applyChangeTables = async (adapter, changeTables, structureToAstCtx, dbStr
         if (!column.dataType) continue;
         const name = column.data.name ?? key;
         names.push(name);
-        types.push(getColumnDbType(column, currentSchema));
+        types.push(getColumnDbTypeQuoted(column, currentSchema));
       }
       const tableName = codeTable.table;
       const source = `(VALUES (${types.map((x) => `NULL::${x}`).join(", ")})) "${tableName}"(${names.map((x) => `"${x}"`).join(", ")})`;