@mikro-orm/sql 7.2.6-dev.40 → 7.2.6-dev.42

package/AbstractSqlPlatform.js

@@ -96,7 +96,7 @@ export class AbstractSqlPlatform extends Platform {
             return this.formatQuery(value.sql, value.params);
         }
         if (Utils.isPlainObject(value) || value?.[JsonProperty]) {
-            return this.escape(JSON.stringify(value));
+            return this.escape(this.convertJsonToDatabaseValue(value));
         }
         return this.escape(value);
     }

package/dialects/mysql/BaseMySqlPlatform.d.ts

@@ -16,6 +16,8 @@ export declare class BaseMySqlPlatform extends AbstractSqlPlatform {
     };
     /** mysql and mariadb treat null as the lowest value when no placement is requested. */
     sortsNullsLowest(): boolean;
+    /** mysql reads backslashes in string literals as escapes, so defaults need the same escaping as values (minus the needless `\"`). */
+    quoteDefaultValue(value: string): string;
     supportsMultiColumnCountDistinct(): boolean;
     /** @internal */
     createNativeQueryBuilder(): MySqlNativeQueryBuilder;

package/dialects/mysql/BaseMySqlPlatform.js

@@ -22,6 +22,10 @@ export class BaseMySqlPlatform extends AbstractSqlPlatform {
     sortsNullsLowest() {
         return true;
     }
+    /** mysql reads backslashes in string literals as escapes, so defaults need the same escaping as values (minus the needless `\"`). */
+    quoteDefaultValue(value) {
+        return this.quoteValue(value).replaceAll('\\"', '"');
+    }
     supportsMultiColumnCountDistinct() {
         return true;
     }

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -63,7 +63,5 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     normalizeDefaultValue(defaultValue: string, length: number): string | number;
     protected wrap(val: string | null | undefined, type: Type<unknown>): string | null | undefined;
     /** Decodes the backslash escapes of an introspected string literal. */
-    protected unescapeDefault(val: string): string;
-    /** Metadata doubles embedded quotes and leaves `"` alone, so undo those two escapes of `quoteValue` while keeping the backslash form of control characters. */
-    protected quoteDefault(val: string): string;
+    unescapeDefault(val: string): string;
 }

package/dialects/mysql/MySqlSchemaHelper.js

@@ -607,18 +607,14 @@ export class MySqlSchemaHelper extends SchemaHelper {
         // text/blob literal defaults come back escaped twice with a charset introducer, e.g. `_utf8mb4\'it\\\'s\'` (JSON is parsed by the comparator)
         const expression = type instanceof JsonType ? null : /^_\w+\\'(.*)\\'$/s.exec(val);
         if (expression) {
-            return this.quoteDefault(this.unescapeDefault(expression[1].replace(/\\(.)/gs, '$1')));
+            return this.platform.quoteDefaultValue(this.unescapeDefault(expression[1].replace(/\\(.)/gs, '$1')));
         }
         const stringType = type instanceof StringType || type instanceof TextType || type instanceof EnumType;
-        return stringType ? this.quoteDefault(val) : val;
+        return stringType ? this.platform.quoteDefaultValue(val) : val;
     }
     /** Decodes the backslash escapes of an introspected string literal. */
     unescapeDefault(val) {
         const sqlEscapes = { 0: '\0', b: '\b', n: '\n', r: '\r', t: '\t', Z: '\x1a' };
         return val.replace(/\\(.)/gs, (_, char) => sqlEscapes[char] ?? char);
     }
-    /** Metadata doubles embedded quotes and leaves `"` alone, so undo those two escapes of `quoteValue` while keeping the backslash form of control characters. */
-    quoteDefault(val) {
-        return this.platform.quoteValue(val).replaceAll("\\'", "''").replaceAll('\\"', '"');
-    }
 }

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -1226,7 +1226,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         if (!defaultValue || typeof defaultValue !== 'string') {
             return super.normalizeDefaultValue(defaultValue, length, PostgreSqlSchemaHelper.DEFAULT_VALUES);
         }
-        const match = /^'(.*)'::(.*)$/.exec(defaultValue);
+        const match = /^'(.*)'::(.*)$/s.exec(defaultValue);
         if (match) {
             if (match[2] === 'integer') {
                 return +match[1];

package/package.json

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

package/query/QueryBuilder.js

@@ -1569,6 +1569,19 @@ export class QueryBuilder {
             if (prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
                 return;
             }
+            // the joined strategy selects by column name, which can collide with the name of another property
+            const shadowed = customAlias &&
+                prop &&
+                (prop.kind === ReferenceKind.EMBEDDED ||
+                    (customAlias.endsWith(`__${f}`) && (prop.persist === false || !prop.fieldNames.includes(f)))) &&
+                (this.#state.aliases[a]?.meta ?? this.mainAlias.meta).props.some(p => p !== prop &&
+                    p.persist !== false &&
+                    (p.kind !== ReferenceKind.EMBEDDED || p.object) &&
+                    p.fieldNames?.includes(f));
+            if (shadowed) {
+                ret.push(raw('?? as ??', [`${a}.${f}`, customAlias]));
+                return;
+            }
             if (prop?.persist === false && !prop.embedded && !prop.formula && type === 'where') {
                 return;
             }
@@ -1578,11 +1591,7 @@ export class QueryBuilder {
                 ret.push(getFieldName(aliased, customAlias));
                 return;
             }
-            // the joined strategy selects by column name, which can collide with an inline embedded property name
-            const shadowed = customAlias &&
-                prop?.kind === ReferenceKind.EMBEDDED &&
-                (this.#state.aliases[a]?.meta ?? this.mainAlias.meta).props.some(p => (p.kind !== ReferenceKind.EMBEDDED || p.object) && p.fieldNames?.includes(f));
-            if (prop?.kind === ReferenceKind.EMBEDDED && !shadowed) {
+            if (prop?.kind === ReferenceKind.EMBEDDED) {
                 if (customAlias) {
                     throw new Error(`Cannot use 'as ${customAlias}' alias on embedded property '${field}' because it expands to multiple columns. Alias individual fields instead (e.g. '${field}.propertyName as ${customAlias}').`);
                 }

package/schema/DatabaseTable.js

@@ -876,9 +876,9 @@ export class DatabaseTable {
             return +defaultValue;
         }
         // unquote string defaults if `raw = false`
-        const match = /^'(.*)'$/.exec('' + val);
+        const match = /^'(.*)'$/s.exec('' + val);
         if (!raw && match) {
-            return match[1].replaceAll("''", "'");
+            return schemaHelper.unescapeDefault(match[1]);
         }
         return '' + val;
     }

package/schema/SchemaHelper.d.ts

@@ -163,6 +163,8 @@ export declare abstract class SchemaHelper {
     getNamespaces(connection: AbstractSqlConnection, ctx?: Transaction): Promise<string[]>;
     protected mapIndexes(indexes: IndexDef[]): Promise<IndexDef[]>;
     mapForeignKeys(fks: any[], tableName: string, schemaName?: string): Dictionary;
+    /** Decodes the content of an introspected string literal, the inverse of `Platform.quoteDefaultValue()`. */
+    unescapeDefault(val: string): string;
     normalizeDefaultValue(defaultValue: string | RawQueryFragment, length?: number, defaultValues?: Dictionary<string[]>): string | number;
     getCreateDatabaseSQL(name: string): string;
     getDropDatabaseSQL(name: string): string;

package/schema/SchemaHelper.js

@@ -718,6 +718,10 @@ export class SchemaHelper {
             return ret;
         }, {});
     }
+    /** Decodes the content of an introspected string literal, the inverse of `Platform.quoteDefaultValue()`. */
+    unescapeDefault(val) {
+        return val.replaceAll("''", "'");
+    }
     normalizeDefaultValue(defaultValue, length, defaultValues = {}) {
         if (defaultValue == null) {
             return defaultValue;