@mikro-orm/sql 7.1.5-dev.22 → 7.1.5-dev.24

package/AbstractSqlDriver.js

@@ -2214,6 +2214,20 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 const join = qb.getJoinForPath(path, { matchPopulateJoins: true });
                 const propAlias = qb.getAliasForJoinPath(join ?? path, { matchPopulateJoins: true }) ?? parentAlias;
                 if (!join) {
+                    // an owner to-one relation that is not joined (e.g. ordering a populated collection by such
+                    // a relation's primary key) can be ordered by its local FK columns, matching the `select-in`
+                    // and `balanced` strategies instead of silently dropping the clause
+                    if (prop.owner &&
+                        [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                        Utils.isPlainObject(childOrder)) {
+                        for (const childField of Utils.getObjectQueryKeys(childOrder)) {
+                            const idx = prop.referencedPKs.indexOf(childField);
+                            const order = childOrder[childField];
+                            if (idx !== -1 && order) {
+                                orderBy.push({ [`${parentAlias}.${prop.joinColumns[idx]}`]: order });
+                            }
+                        }
+                    }
                     continue;
                 }
                 if (join &&

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -603,7 +603,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             .map(p => {
             const dir = p.direction === 'in' ? '' : `${p.direction.toUpperCase()} `;
             const def = p.defaultRaw ? ` default ${p.defaultRaw}` : '';
-            return `${dir}${this.platform.quoteIdentifier(p.name)} ${p.type}${def}`;
+            const name = p.name ? `${this.platform.quoteIdentifier(p.name)} ` : '';
+            return `${dir}${name}${p.type}${def}`;
         })
             .join(', ');
     }
@@ -614,15 +615,16 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         return signature.split(/,(?![^()]*\))/).map(part => {
             const trimmed = part.trim();
             // INOUT before IN/OUT, with required trailing space so identifiers like `input` aren't
-            // mis-parsed as a direction keyword.
-            const match = /^(?:(INOUT|VARIADIC|IN|OUT)\s+)?(?:"((?:[^"]|"")+)"|([\w$]+))\s+(.+?)(?:\s+default\s+.+)?$/i.exec(trimmed);
+            // mis-parsed as a direction keyword. The name is optional — `pg_get_function_arguments`
+            // omits it for unnamed parameters (e.g. `text`), leaving just the type.
+            const match = /^(?:(INOUT|VARIADIC|IN|OUT)\s+)?(?:(?:"((?:[^"]|"")+)"|([\w$]+))\s+)?(.+?)(?:\s+default\s+.+)?$/i.exec(trimmed);
             /* v8 ignore next 3: defensive guard for unexpected `pg_get_function_arguments` output shapes */
             if (!match) {
                 throw new Error(`Could not parse PostgreSQL routine parameter signature: ${JSON.stringify(trimmed)}`);
             }
             const dirRaw = (match[1] ?? 'in').toLowerCase();
             const direction = dirRaw === 'inout' ? 'inout' : dirRaw === 'out' ? 'out' : 'in';
-            const name = match[2] != null ? match[2].replaceAll('""', '"') : match[3];
+            const name = match[2] != null ? match[2].replaceAll('""', '"') : (match[3] ?? '');
             return {
                 name,
                 type: match[4].trim(),

package/package.json

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