@mikro-orm/sql 7.0.3-dev.12 → 7.0.3-dev.14

package/AbstractSqlDriver.js

@@ -1521,13 +1521,10 @@ export class AbstractSqlDriver extends DatabaseDriver {
             childAliases[childMeta.className] = childAlias;
             qb.addPropertyJoin(childMeta.tptInverseProp, baseAlias, childAlias, JoinType.leftJoin, `[tpt]${meta.className}`);
             // Add fields from this child (only ownProps, skip PKs)
-            for (const prop of childMeta.ownProps.filter(p => !p.primary && this.platform.shouldHaveColumn(p, []))) {
-                for (const fieldName of prop.fieldNames) {
-                    const field = `${childAlias}.${fieldName}`;
-                    const fieldAlias = `${childAlias}__${fieldName}`;
-                    fields.push(raw(`${this.platform.quoteIdentifier(field)} as ${this.platform.quoteIdentifier(fieldAlias)}`));
-                }
-            }
+            const schema = childMeta.schema === '*' ? '*' : this.getSchemaName(childMeta);
+            childMeta
+                .ownProps.filter(p => !p.primary && this.platform.shouldHaveColumn(p, []))
+                .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, childAlias, childMeta, schema)));
         }
         // Add computed discriminator (descendants already sorted by depth)
         if (meta.root.tptDiscriminatorColumn) {

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -311,10 +311,32 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                         : undefined,
                 comment: col.column_comment,
             };
-            if (nativeEnums?.[column.type]) {
+            let enumKey = column.type;
+            let enumEntry = nativeEnums?.[enumKey];
+            // for array enum columns, strip the [] suffix and try the base type,
+            // try schema-qualified key first for non-default schemas to avoid
+            // ambiguity when multiple schemas have enums with the same name
+            if (!enumEntry && enumKey.endsWith('[]')) {
+                const baseType = enumKey.slice(0, -2);
+                if (col.udt_schema && col.udt_schema !== this.platform.getDefaultSchemaName()) {
+                    const schemaKey = `${col.udt_schema}.${baseType}`;
+                    enumEntry = nativeEnums?.[schemaKey];
+                    if (enumEntry) {
+                        enumKey = schemaKey;
+                        column.type = `${schemaKey}[]`;
+                    }
+                }
+                if (!enumEntry) {
+                    enumEntry = nativeEnums?.[baseType];
+                    if (enumEntry) {
+                        enumKey = baseType;
+                    }
+                }
+            }
+            if (enumEntry) {
                 column.mappedType = Type.getType(EnumType);
-                column.nativeEnumName = column.type;
-                column.enumItems = nativeEnums[column.type]?.items;
+                column.nativeEnumName = enumKey;
+                column.enumItems = enumEntry.items;
             }
             ret[key].push(column);
         }

package/package.json

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