@mikro-orm/sql 7.0.17-dev.1 → 7.0.17-dev.10

package/AbstractSqlDriver.js

@@ -1676,18 +1676,19 @@ export class AbstractSqlDriver extends DatabaseDriver {
             });
         }
         const aliased = this.platform.quoteIdentifier(`${tableAlias}__${prop.fieldNames[0]}`);
+        const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
         if (prop.customTypes?.some(type => !!type?.convertToJSValueSQL)) {
             return prop.fieldNames.map((col, idx) => {
                 if (!prop.customTypes[idx]?.convertToJSValueSQL) {
                     return col;
                 }
-                const prefixed = this.platform.quoteIdentifier(`${tableAlias}.${col}`);
+                const prefixed = this.platform.quoteIdentifier(`${sourceAlias}.${col}`);
                 const aliased = this.platform.quoteIdentifier(`${tableAlias}__${col}`);
                 return raw(`${prop.customTypes[idx].convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`);
             });
         }
         if (prop.customType?.convertToJSValueSQL) {
-            const prefixed = this.platform.quoteIdentifier(`${tableAlias}.${prop.fieldNames[0]}`);
+            const prefixed = this.platform.quoteIdentifier(`${sourceAlias}.${prop.fieldNames[0]}`);
             return [raw(`${prop.customType.convertToJSValueSQL(prefixed, this.platform)} as ${aliased}`)];
         }
         if (prop.formula) {
@@ -1696,7 +1697,6 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const columns = meta.createColumnMappingObject(tableAlias);
             return [raw(`${this.evaluateFormula(prop.formula, columns, table)} as ${aliased}`)];
         }
-        const sourceAlias = qb.helper.getTPTAliasForProperty(prop.name, tableAlias);
         return prop.fieldNames.map(fieldName => {
             return raw('?? as ??', [`${sourceAlias}.${fieldName}`, `${tableAlias}__${fieldName}`]);
         });

package/dialects/mysql/MySqlSchemaHelper.js

@@ -150,36 +150,34 @@ export class MySqlSchemaHelper extends SchemaHelper {
      * MySQL requires collation to be specified as an expression: (column_name COLLATE collation_name)
      */
     getIndexColumns(index) {
-        if (index.columns?.length) {
-            return index.columns
-                .map(col => {
-                const quotedName = this.quote(col.name);
-                // MySQL supports collation via expression: (column_name COLLATE collation_name)
-                // When collation is specified, wrap in parentheses as an expression
-                if (col.collation) {
-                    let expr = col.length ? `${quotedName}(${col.length})` : quotedName;
-                    expr = `(${expr} collate ${col.collation})`;
-                    // Sort order comes after the expression
-                    if (col.sort) {
-                        expr += ` ${col.sort}`;
-                    }
-                    return expr;
-                }
-                // Standard column definition without collation
-                let colDef = quotedName;
-                // MySQL supports prefix length
-                if (col.length) {
-                    colDef += `(${col.length})`;
-                }
-                // MySQL supports sort order
+        return index.columnNames
+            .map(name => {
+            const col = index.columns?.find(c => c.name === name);
+            const quotedName = this.quote(name);
+            // MySQL supports collation via expression: (column_name COLLATE collation_name)
+            // When collation is specified, wrap in parentheses as an expression
+            if (col?.collation) {
+                let expr = col.length ? `${quotedName}(${col.length})` : quotedName;
+                expr = `(${expr} collate ${col.collation})`;
+                // Sort order comes after the expression
                 if (col.sort) {
-                    colDef += ` ${col.sort}`;
+                    expr += ` ${col.sort}`;
                 }
-                return colDef;
-            })
-                .join(', ');
-        }
-        return index.columnNames.map(c => this.quote(c)).join(', ');
+                return expr;
+            }
+            // Standard column definition without collation
+            let colDef = quotedName;
+            // MySQL supports prefix length
+            if (col?.length) {
+                colDef += `(${col.length})`;
+            }
+            // MySQL supports sort order
+            if (col?.sort) {
+                colDef += ` ${col.sort}`;
+            }
+            return colDef;
+        })
+            .join(', ');
     }
     /**
      * Append MySQL-specific index suffixes like INVISIBLE.

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -687,27 +687,25 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
      * Build the column list for a PostgreSQL index.
      */
     getIndexColumns(index) {
-        if (index.columns?.length) {
-            return index.columns
-                .map(col => {
-                let colDef = this.quote(col.name);
-                // PostgreSQL supports collation with double quotes
-                if (col.collation) {
-                    colDef += ` collate ${this.quote(col.collation)}`;
-                }
-                // PostgreSQL supports sort order
-                if (col.sort) {
-                    colDef += ` ${col.sort}`;
-                }
-                // PostgreSQL supports NULLS FIRST/LAST
-                if (col.nulls) {
-                    colDef += ` nulls ${col.nulls}`;
-                }
-                return colDef;
-            })
-                .join(', ');
-        }
-        return index.columnNames.map(c => this.quote(c)).join(', ');
+        return index.columnNames
+            .map(name => {
+            const col = index.columns?.find(c => c.name === name);
+            let colDef = this.quote(name);
+            // PostgreSQL supports collation with double quotes
+            if (col?.collation) {
+                colDef += ` collate ${this.quote(col.collation)}`;
+            }
+            // PostgreSQL supports sort order
+            if (col?.sort) {
+                colDef += ` ${col.sort}`;
+            }
+            // PostgreSQL supports NULLS FIRST/LAST
+            if (col?.nulls) {
+                colDef += ` nulls ${col.nulls}`;
+            }
+            return colDef;
+        })
+            .join(', ');
     }
     /**
      * PostgreSQL-specific index options like fill factor.

package/package.json

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

package/query/QueryBuilder.js

@@ -1641,13 +1641,13 @@ export class QueryBuilder {
         }
         const types = Object.values(meta.root.discriminatorMap).map(cls => this.metadata.get(cls));
         const children = [];
-        const lookUpChildren = (ret, type) => {
-            const children = types.filter(meta2 => meta2.extends === type);
-            children.forEach(m => lookUpChildren(ret, m.class));
+        const lookUpChildren = (ret, parent) => {
+            const children = types.filter(meta2 => meta2.extends && this.metadata.find(meta2.extends) === parent);
+            children.forEach(m => lookUpChildren(ret, m));
             ret.push(...children.filter(c => c.discriminatorValue));
             return children;
         };
-        lookUpChildren(children, meta.class);
+        lookUpChildren(children, meta);
         this.andWhere({
             [meta.root.discriminatorColumn]: children.length > 0
                 ? { $in: [meta.discriminatorValue, ...children.map(c => c.discriminatorValue)] }

package/schema/SchemaHelper.js

@@ -132,27 +132,25 @@ export class SchemaHelper {
      * Note: Prefix length is only supported by MySQL/MariaDB which override this method.
      */
     getIndexColumns(index) {
-        if (index.columns?.length) {
-            return index.columns
-                .map(col => {
-                let colDef = this.quote(col.name);
-                // Collation comes after column name (SQLite syntax: column COLLATE name)
-                if (col.collation) {
-                    colDef += ` collate ${col.collation}`;
-                }
-                // Sort order
-                if (col.sort) {
-                    colDef += ` ${col.sort}`;
-                }
-                // NULLS ordering (PostgreSQL)
-                if (col.nulls) {
-                    colDef += ` nulls ${col.nulls}`;
-                }
-                return colDef;
-            })
-                .join(', ');
-        }
-        return index.columnNames.map(c => this.quote(c)).join(', ');
+        return index.columnNames
+            .map(name => {
+            const col = index.columns?.find(c => c.name === name);
+            let colDef = this.quote(name);
+            // Collation comes after column name (SQLite syntax: column COLLATE name)
+            if (col?.collation) {
+                colDef += ` collate ${col.collation}`;
+            }
+            // Sort order
+            if (col?.sort) {
+                colDef += ` ${col.sort}`;
+            }
+            // NULLS ordering (PostgreSQL)
+            if (col?.nulls) {
+                colDef += ` nulls ${col.nulls}`;
+            }
+            return colDef;
+        })
+            .join(', ');
     }
     /** Returns SQL to drop an index. */
     getDropIndexSQL(tableName, index) {