@mikro-orm/postgresql 6.6.10-dev.0 → 6.6.10-dev.1

package/PostgreSqlSchemaHelper.js

@@ -313,15 +313,9 @@ class PostgreSqlSchemaHelper extends knex_1.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;
-                /* istanbul ignore else */
-                if (m3) {
-                    items = m3.map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
-                }
-                else {
-                    items = m2[1].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
-                }
+                /* istanbul ignore next */
+                const parts = m2[1].match(/('(?:[^']|'')*'::\w[\w ]*)/g) ?? m2[1].split(',');
+                let items = parts.map((item) => item.trim().match(/^\(?'((?:[^']|'')*)'/)?.[1]?.replace(/''/g, "'"));
                 items = items.filter(item => item !== undefined);
                 if (items.length > 0) {
                     o[item.columnName] = items;
@@ -359,7 +353,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         if (changedProperties && column.mappedType instanceof core_1.EnumType && column.enumItems?.every(item => core_1.Utils.isString(item))) {
             const checkName = this.platform.getConfig().getNamingStrategy().indexName(fromTable.name, [column.name], 'check');
             if (changedProperties.has('enumItems') || (!column.nativeEnumName && fromTable.getColumn(column.name)?.nativeEnumName)) {
-                table.check(`${this.platform.quoteIdentifier(column.name)} in ('${(column.enumItems.join("', '"))}')`, {}, this.platform.quoteIdentifier(checkName));
+                table.check(`${this.platform.quoteIdentifier(column.name)} in (${column.enumItems.map(v => this.platform.quoteValue(v)).join(', ')})`, {}, this.platform.quoteIdentifier(checkName));
             }
             if (changedProperties.has('type')) {
                 return table.specificType(column.name, column.type);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.6.10-dev.0",
+  "version": "6.6.10-dev.1",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.6.10-dev.0",
+    "@mikro-orm/knex": "6.6.10-dev.1",
     "pg": "8.19.0",
     "postgres-array": "3.0.4",
     "postgres-date": "2.1.0",
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.6.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.10-dev.0"
+    "@mikro-orm/core": "6.6.10-dev.1"
   }
 }