@mikro-orm/sql 7.2.6-dev.38 → 7.2.6-dev.39

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -62,4 +62,8 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     protected getChecksSQL(tables: Table[]): string;
     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;
 }

package/dialects/mysql/MySqlSchemaHelper.js

@@ -607,11 +607,18 @@ 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) {
-            const unescape = (str, escapes = {}) => str.replace(/\\(.)/gs, (_, char) => escapes[char] ?? char);
-            const sqlEscapes = { 0: '\0', b: '\b', n: '\n', r: '\r', t: '\t', Z: '\x1a' };
-            return this.platform.quoteValue(unescape(unescape(expression[1]), sqlEscapes));
+            return this.quoteDefault(this.unescapeDefault(expression[1].replace(/\\(.)/gs, '$1')));
         }
         const stringType = type instanceof StringType || type instanceof TextType || type instanceof EnumType;
-        return stringType ? this.platform.quoteValue(val) : val;
+        return stringType ? this.quoteDefault(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/package.json

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

package/schema/DatabaseTable.js

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