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

package/AbstractSqlDriver.d.ts

@@ -1,4 +1,4 @@
-import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type FormulaTable, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type ObjectQuery, type Options, type OrderDefinition, type PopulateOptions, type PopulatePath, type Primary, type QueryOrderMap, type QueryResult, type Raw, RawQueryFragment, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
+import { type AnyEntity, type Collection, type Configuration, type ConnectionType, type Constructor, type CountOptions, DatabaseDriver, type DeleteOptions, type Dictionary, type DriverMethodOptions, type EntityData, type EntityDictionary, type EntityField, EntityManagerType, type EntityMetadata, type EntityName, type EntityProperty, type FilterQuery, type FindOneOptions, type FindOptions, type FormulaTable, type LockOptions, type LoggingOptions, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type ObjectQuery, type Options, type OrderDefinition, type PopulateOptions, type Primary, type QueryOrderMap, type QueryResult, type Raw, RawQueryFragment, type StreamOptions, type Transaction, type UpsertManyOptions, type UpsertOptions } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from './AbstractSqlConnection.js';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform.js';
 import { type AnyQueryBuilder } from './query/QueryBuilder.js';
@@ -23,8 +23,8 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     private validateSqlOptions;
     createEntityManager(useContext?: boolean): this[typeof EntityManagerType];
     private createQueryBuilderFromOptions;
-    find<T extends object, P extends string = never, F extends string = PopulatePath.ALL, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOptions<T, P, F, E>): Promise<EntityData<T>[]>;
-    findOne<T extends object, P extends string = never, F extends string = PopulatePath.ALL, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOneOptions<T, P, F, E>): Promise<EntityData<T> | null>;
+    find<T extends object, P extends string = never, F extends string = never, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOptions<T, P, F, E>): Promise<EntityData<T>[]>;
+    findOne<T extends object, P extends string = never, F extends string = never, E extends string = never>(entityName: EntityName<T>, where: ObjectQuery<T>, options?: FindOneOptions<T, P, F, E>): Promise<EntityData<T> | null>;
     protected hasToManyJoins<T extends object>(hint: PopulateOptions<T>, meta: EntityMetadata<T>): boolean;
     findVirtual<T extends object>(entityName: EntityName<T>, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>): Promise<EntityData<T>[]>;
     countVirtual<T extends object>(entityName: EntityName<T>, where: ObjectQuery<T>, options: CountOptions<T, any>): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.3-dev.0",
+  "version": "7.0.3-dev.10",
   "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.10"
   },
   "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) {