@mikro-orm/sql 7.1.6-dev.1 → 7.1.6-dev.11

package/AbstractSqlDriver.js

@@ -494,6 +494,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (prop.fieldNames.every(name => typeof root[`${relationAlias}__${name}`] === 'undefined')) {
             return;
         }
+        // inline embeddables are mapped via their flattened child props; mapping the embedded root prop
+        // here would leak a raw column value into the snapshot and produce a phantom changeset
+        if (prop.kind === ReferenceKind.EMBEDDED && !prop.object && !meta.embeddable) {
+            return;
+        }
         if (prop.polymorphic && prop.kind !== ReferenceKind.EMBEDDED) {
             const discriminatorAlias = `${relationAlias}__${prop.fieldNames[0]}`;
             const discriminatorValue = root[discriminatorAlias];
@@ -2027,6 +2032,10 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const alias = '__p';
         const qb = this.createQueryBuilder(entityName, undefined, undefined, undefined, undefined, alias);
+        // Select a constant instead of the default `*` — otherwise non-lazy `@Formula` properties
+        // (and their embedded subqueries, which may contain their own `where`/cross-table refs)
+        // leak into the SQL and corrupt the predicate extracted below. Only `from ... where` matters here.
+        qb.select(raw('1'));
         qb.where(where);
         const sql = qb.getFormattedQuery();
         // Relation traversal produces join clauses whose aliased identifiers can't be inlined

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -9,6 +9,7 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     static readonly DEFAULT_VALUES: {
         'now()': string[];
         'current_timestamp(?)': string[];
+        'curdate()': string[];
         '0': string[];
     };
     private static readonly PARTIAL_INDEX_RE;

package/dialects/mysql/MySqlSchemaHelper.js

@@ -5,6 +5,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
     static DEFAULT_VALUES = {
         'now()': ['now()', 'current_timestamp'],
         'current_timestamp(?)': ['current_timestamp(?)'],
+        'curdate()': ['(current_date)', 'curdate()'],
         '0': ['0', 'false'],
     };
     // Greedy `(.+)` so nested CASE expressions inside the predicate don't trip the match on

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.6-dev.1",
+  "version": "7.1.6-dev.11",
   "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.1.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.6-dev.1"
+    "@mikro-orm/core": "7.1.6-dev.11"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaComparator.js

@@ -894,7 +894,8 @@ export class SchemaComparator {
         // e.g. quotes might be added (https://github.com/mikro-orm/mikro-orm/issues/3827)
         const simplify = (str) => {
             return (str
-                ?.replace(/_\w+'(.*?)'/g, '$1')
+                // lookbehind: only strip a real charset introducer, never an underscore inside a literal like 'a_b'
+                ?.replace(/(?<![\w'])_\w+'(.*?)'/g, '$1')
                 .replace(/!=/g, '<>')
                 .replace(/in\s*\((.*?)\)/gi, '= any (array[$1])')
                 // MySQL normalizes count(*) to count(0)

package/typings.d.ts

@@ -402,5 +402,5 @@ type ClassEntityColumnName<K, V, TOptions extends MikroKyselyPluginOptions = {}>
     readonly owner: object;
 } ? never : TOptions['columnNamingStrategy'] extends 'property' ? K : NV extends Scalar | readonly any[] ? K extends string ? SnakeCase<K> : never : K extends string ? ClassEntityJoinColumnName<SnakeCase<K>, NV> : never : never;
 type ClassEntityJoinColumnName<TName extends string, V> = PrimaryProperty<V> extends string ? `${TName}_${SnakeCase<PrimaryProperty<V>>}` : never;
-type ClassEntityColumnValue<V> = NonNullable<V> extends Scalar | readonly any[] ? V : Primary<NonNullable<V>>;
+type ClassEntityColumnValue<V> = NonNullable<V> extends Scalar | readonly any[] ? V : V extends NonNullable<V> ? Primary<NonNullable<V>> : Primary<NonNullable<V>> | null;
 export {};