@mikro-orm/sql 7.1.4-dev.0 → 7.1.4-dev.2

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -486,10 +486,13 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             seen.add(dedupeKey);
             ret[key] ??= [];
             // CHECK: unwrap the `CHECK ((<predicate>))` shell and drop pg-added `::type` casts so the
-            // inner predicate matches the user's metadata. EXCLUDE bodies are kept verbatim — the user's
-            // `@Check` expression is the full body (see SchemaHelper.createCheck).
+            // inner predicate matches the user's metadata. Bare boolean bodies (e.g. a top-level CASE)
+            // are emitted as the single-paren `CHECK (<predicate>)` form, which we unwrap too. EXCLUDE
+            // bodies are kept verbatim — the user's `@Check` expression is the full body (see
+            // SchemaHelper.createCheck).
             const m = /^check \(\((.*)\)\)$/is.exec(check.expression);
-            const def = m ? m[1].replace(/\((.*?)\)::\w+/g, '$1') : check.expression;
+            const single = m ? null : /^check \((.*)\)$/is.exec(check.expression);
+            const def = m ? m[1].replace(/\((.*?)\)::\w+/g, '$1') : single ? single[1] : check.expression;
             ret[key].push({
                 name: check.name,
                 columnName: check.column_name,
@@ -765,11 +768,11 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
     }
     async getNativeEnumDefinitions(connection, schemas, ctx) {
         const uniqueSchemas = Utils.unique(schemas);
-        const res = await connection.execute(`select t.typname as enum_name, n.nspname as schema_name, array_agg(e.enumlabel order by e.enumsortorder) as enum_value
+        const res = await connection.execute(`select t.typname as enum_name, n.nspname as schema_name, array_remove(array_agg(e.enumlabel order by e.enumsortorder), null) as enum_value
         from pg_type t
-        join pg_enum e on t.oid = e.enumtypid
+        left join pg_enum e on t.oid = e.enumtypid
         join pg_catalog.pg_namespace n on n.oid = t.typnamespace
-        where n.nspname in (${Array(uniqueSchemas.length).fill('?').join(', ')})
+        where t.typtype = 'e' and n.nspname in (${Array(uniqueSchemas.length).fill('?').join(', ')})
         group by t.typname, n.nspname`, uniqueSchemas, 'all', ctx);
         return res.reduce((o, row) => {
             let name = row.enum_name;
@@ -825,7 +828,9 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             // `CHECK ((("enumTest")::text = ANY ((ARRAY['a'::character varying, 'b'::character varying, 'c'::character varying])::text[])))`
             // `CHECK ((type = 'a'::text))`
             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);
+            // the single-value form must compare against a quoted literal (`= 'a'::text`); anything else
+            // (e.g. a JSON `->>` extraction like `name = data->>'name'`) is not an enum constraint
+            const m2 = item.definition?.match(/\(array\[(.*)]\)/i) || item.definition?.match(/ = ('(?:[^']|'')*'::[\w ]+)\)/i);
             if (item.columnName && m1 && m2) {
                 /* v8 ignore next */
                 const parts = m2[1].match(/('(?:[^']|'')*'::\w[\w ]*)/g) ?? m2[1].split(',');

package/package.json

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