@mikro-orm/sql 7.0.3-dev.0 → 7.0.3-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.3-dev.0",
+  "version": "7.0.3-dev.2",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.0.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.3-dev.0"
+    "@mikro-orm/core": "7.0.3-dev.2"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaComparator.d.ts

@@ -57,6 +57,18 @@ export declare class SchemaComparator {
      */
     private compareArrays;
     diffExpression(expr1: string, expr2: string): boolean;
+    /**
+     * Compares two view expressions, with special handling for SELECT *.
+     * Databases like PostgreSQL and MySQL expand `SELECT *` to explicit column names
+     * in their stored view definitions, which makes diffExpression always detect changes.
+     * When SELECT * is present, we strip the first SELECT...FROM column list from both
+     * sides and compare only the structural parts (FROM clause onwards).
+     * Note: this means changes *within* subqueries in the SELECT list of a SELECT * view
+     * may not be detected — an acceptable tradeoff since SELECT * views are inherently
+     * column-list-agnostic.
+     * @see https://github.com/mikro-orm/mikro-orm/issues/7308
+     */
+    private diffViewExpression;
     parseJsonDefault(defaultValue?: string | null): Dictionary | string | null;
     hasSameDefaultValue(from: Column, to: Column): boolean;
     private mapColumnToProperty;

package/schema/SchemaComparator.js

@@ -123,7 +123,7 @@ export class SchemaComparator {
             }
             else {
                 const fromView = fromSchema.getView(toView.name) ?? fromSchema.getView(viewName);
-                if (fromView && this.diffExpression(fromView.definition, toView.definition)) {
+                if (fromView && this.diffViewExpression(fromView.definition, toView.definition)) {
                     diff.changedViews[viewName] = { from: fromView, to: toView };
                     this.log(`view ${viewName} changed`);
                 }
@@ -666,6 +666,28 @@ export class SchemaComparator {
         };
         return simplify(expr1) !== simplify(expr2);
     }
+    /**
+     * Compares two view expressions, with special handling for SELECT *.
+     * Databases like PostgreSQL and MySQL expand `SELECT *` to explicit column names
+     * in their stored view definitions, which makes diffExpression always detect changes.
+     * When SELECT * is present, we strip the first SELECT...FROM column list from both
+     * sides and compare only the structural parts (FROM clause onwards).
+     * Note: this means changes *within* subqueries in the SELECT list of a SELECT * view
+     * may not be detected — an acceptable tradeoff since SELECT * views are inherently
+     * column-list-agnostic.
+     * @see https://github.com/mikro-orm/mikro-orm/issues/7308
+     */
+    diffViewExpression(fromDef, toDef) {
+        if (!this.diffExpression(fromDef, toDef)) {
+            return false;
+        }
+        // If either expression uses SELECT *, the diff may be due to * expansion
+        if (/\bselect\s+\*/i.test(fromDef) || /\bselect\s+\*/i.test(toDef)) {
+            const stripColumns = (s) => s.replace(/\bselect\b[\s\S]*?\bfrom\b/i, 'select from');
+            return this.diffExpression(stripColumns(fromDef), stripColumns(toDef));
+        }
+        return true;
+    }
     parseJsonDefault(defaultValue) {
         /* v8 ignore next */
         if (!defaultValue) {