orchid-orm 1.38.1 → 1.38.2

package/dist/migrations.mjs

@@ -14,23 +14,30 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
       tableExpressions.map(async ({ source, compare, handle }) => {
         const viewName = `orchidTmpView${id++}`;
         const values = [];
+        let result;
         try {
-          const sql = `CREATE TEMPORARY VIEW ${viewName} AS (SELECT ${compare.map(
-            ({ inDb: inDb2, inCode }, i) => `${inDb2} AS "*inDb-${i}*", ${inCode.map(
-              (s, j) => `(${typeof s === "string" ? s : s.toSQL({ values })}) "*inCode-${i}-${j}*"`
-            ).join(", ")}`
-          ).join(", ")} FROM ${source})`;
-          await adapter.query({ text: sql, values });
-        } catch (err) {
+          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.
+            text: [
+              `CREATE TEMPORARY VIEW ${viewName} AS (SELECT ${compare.map(
+                ({ inDb: inDb2, inCode }, i) => `${inDb2} 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 {
-          rows: [{ v }]
-        } = await adapter.query(
-          `SELECT pg_get_viewdef('${viewName}') v`
-        );
-        await adapter.query(`DROP VIEW ${viewName}`);
+        const v = result.rows[0].v;
         let pos = 7;
         const rgx = /\s+AS\s+"\*(inDb-\d+|inCode-\d+-\d+)\*",?/g;
         let match;
@@ -1225,6 +1232,7 @@ const collectCodeComparableItemsType = (config, codeItems, key) => {
   });
 };
 const normalizeItem = (item) => {
+  if (item.using) item.using = item.using.toLowerCase();
   if (item.using === "btree") item.using = void 0;
   if (!item.unique) item.unique = void 0;
   if (item.nullsNotDistinct === false) item.nullsNotDistinct = void 0;