@mikro-orm/sql 7.0.6-dev.4 → 7.0.6-dev.6

package/dialects/postgresql/BasePostgreSqlPlatform.js

@@ -25,7 +25,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         return true;
     }
     getEnumArrayCheckConstraintExpression(column, items) {
-        return `${this.quoteIdentifier(column)} <@ array[${items.map(item => `'${item}'::text`).join(', ')}]`;
+        return `${this.quoteIdentifier(column)} <@ array[${items.map(item => `${this.quoteValue(item)}::text`).join(', ')}]`;
     }
     supportsMaterializedViews() {
         return true;

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -483,19 +483,13 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             const m1 = item.definition?.match(/check \(\(\("?(\w+)"?\)::/i) || item.definition?.match(/check \(\("?(\w+)"? = /i);
             const m2 = item.definition?.match(/\(array\[(.*)]\)/i) || item.definition?.match(/ = (.*)\)/i);
             if (item.columnName && m1 && m2) {
-                const m3 = m2[1].match(/('[^']*'::text)/g);
-                let items;
                 /* v8 ignore next */
-                if (m3) {
-                    items = m3.map((item) => /^\(?'(.*)'/.exec(item.trim())?.[1]);
-                }
-                else {
-                    items = m2[1].split(',').map((item) => /^\(?'(.*)'/.exec(item.trim())?.[1]);
-                }
+                const parts = m2[1].match(/('(?:[^']|'')*'::\w[\w ]*)/g) ?? m2[1].split(',');
+                let items = parts.map((item) => /^\(?'((?:[^']|'')*)'/.exec(item.trim())?.[1]?.replace(/''/g, "'"));
                 items = items.filter(item => item !== undefined);
                 if (items.length > 0) {
                     o[item.columnName] = items;
-                    item.expression = `${this.quote(item.columnName)} in ('${items.join("', '")}')`;
+                    item.expression = this.platform.getEnumCheckConstraintExpression(item.columnName, items);
                     item.definition = `check (${item.expression})`;
                 }
             }

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -332,7 +332,9 @@ export class SqliteSchemaHelper extends SchemaHelper {
             const match = /[`["']([^`\]"']+)[`\]"'] text check \(.* \((.*)\)/i.exec(item);
             /* v8 ignore next */
             if (match) {
-                o[match[1]] = match[2].split(',').map((item) => /^\(?'(.*)'/.exec(item.trim())[1]);
+                o[match[1]] = match[2]
+                    .split(/,(?=\s*'(?:[^']|'')*'(?:\s*\)|$))/)
+                    .map((item) => /^\(?'((?:[^']|'')*)'/.exec(item.trim())[1].replace(/''/g, "'"));
             }
             return o;
         }, {});

package/package.json

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