orchid-orm 1.50.0 → 1.50.2

package/dist/migrations.mjs

@@ -21,7 +21,7 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
             // 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(
+                ({ 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})`,
@@ -37,33 +37,41 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
           handle();
           return;
         }
-        const v = result.rows[0].v;
-        let pos = 7;
-        const rgx = /\s+AS\s+"\*(inDb-\d+|inCode-\d+-\d+)\*",?/g;
-        let match;
-        let inDb = "";
-        let codeI = 0;
-        const matches = compare[0].inCode.map(() => true);
-        while (match = rgx.exec(v)) {
-          const sql = v.slice(pos, rgx.lastIndex - match[0].length).trim();
-          const arr = match[1].split("-");
-          if (arr.length === 2) {
-            inDb = sql;
-            codeI = 0;
-          } else {
-            if (inDb !== sql) {
-              matches[codeI] = false;
-            }
-            codeI++;
-          }
-          pos = rgx.lastIndex;
-        }
-        const firstMatching = matches.indexOf(true);
-        handle(firstMatching === -1 ? void 0 : firstMatching);
+        const match = compareSqlExpressionResult(
+          result.rows[0].v,
+          compare[0].inCode
+        );
+        handle(match);
       })
     );
   }
 };
+const compareSqlExpressionResult = (resultSql, inCode) => {
+  let pos = 7;
+  const rgx = /\s+AS\s+"\*(inDb-\d+|inCode-\d+-\d+)\*",?/g;
+  let match;
+  let inDb = "";
+  let codeI = 0;
+  const matches = inCode.map(() => true);
+  while (match = rgx.exec(resultSql)) {
+    const sql = resultSql.slice(pos, rgx.lastIndex - match[0].length).trim();
+    const arr = match[1].split("-");
+    if (arr.length === 2) {
+      inDb = sql;
+      codeI = 0;
+    } else {
+      if (inDb !== sql && // Comparing `(sql) = sql` and `sql = (sql)` below.
+      // Could not reproduce this case in integration tests, but it was reported in #494.
+      !(inDb.startsWith("(") && inDb.endsWith(")") && inDb.slice(1, -1) === sql) && !(sql.startsWith("(") && sql.endsWith(")") && sql.slice(1, -1) === inDb)) {
+        matches[codeI] = false;
+      }
+      codeI++;
+    }
+    pos = rgx.lastIndex;
+  }
+  const firstMatching = matches.indexOf(true);
+  return firstMatching === -1 ? void 0 : firstMatching;
+};
 const promptCreateOrRename = (kind, name, drop, verifying) => {
   if (verifying) throw new AbortSignal();
   let hintPos = name.length + 4;