@mikro-orm/sql 7.2.2-dev.9 → 7.3.0-dev.0

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -419,7 +419,11 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             if ((col.udt_name === 'geometry' || col.udt_name === 'geography') && col.format_type) {
                 type = col.format_type;
             }
-            if (type === 'vector' && col.length == null && col.custom_length != null && col.custom_length !== -1) {
+            // pgvector stores the dimension in atttypmod for all three of its vector types
+            if (['vector', 'halfvec', 'sparsevec'].includes(type) &&
+                col.length == null &&
+                col.custom_length != null &&
+                col.custom_length !== -1) {
                 col.length = col.custom_length;
             }
             if (col.length != null && !type.endsWith(`(${col.length})`) && !['text', 'date'].includes(type)) {

package/package.json

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

package/query/NativeQueryBuilder.d.ts

@@ -127,7 +127,7 @@ export declare class NativeQueryBuilder implements Subquery {
     as(alias: string): this;
     toRaw(): RawQueryFragment;
     protected compileSelect(): void;
-    /** Whether this COUNT query needs a subquery wrapper for multi-column distinct. */
+    /** Whether this COUNT query needs a subquery wrapper: multi-column distinct, or `distinct on` (keeps the null group). */
     protected needsCountSubquery(): boolean;
     protected getFields(countSubquery?: boolean): string;
     protected compileInsert(): void;

package/query/NativeQueryBuilder.js

@@ -330,12 +330,12 @@ export class NativeQueryBuilder {
             this.parts.push(`)${asKeyword}${this.quote('dcnt')}`);
         }
     }
-    /** Whether this COUNT query needs a subquery wrapper for multi-column distinct. */
+    /** Whether this COUNT query needs a subquery wrapper: multi-column distinct, or `distinct on` (keeps the null group). */
     needsCountSubquery() {
         return (this.type === QueryType.COUNT &&
             !!this.options.distinct &&
-            this.options.select.length > 1 &&
-            !this.platform.supportsMultiColumnCountDistinct());
+            ((this.options.select.length > 1 && !this.platform.supportsMultiColumnCountDistinct()) ||
+                !!this.options.distinctOn));
     }
     getFields(countSubquery) {
         if (!this.options.select || this.options.select.length === 0) {

package/query/QueryBuilder.js

@@ -257,7 +257,11 @@ export class QueryBuilder {
         if (field) {
             this.#state.fields = Utils.asArray(field);
         }
-        else if (distinct || this.hasToManyJoins()) {
+        else if (this.#state.distinctOn) {
+            this.#state.fields = this.#state.distinctOn;
+            distinct = true;
+        }
+        else if (distinct || this.#state.flags.has(QueryFlag.DISTINCT) || this.hasToManyJoins()) {
             this.#state.fields = this.mainAlias.meta.primaryKeys;
         }
         else {
@@ -1566,7 +1570,7 @@ export class QueryBuilder {
                 return;
             }
             if (prop?.embedded || (prop?.kind === ReferenceKind.EMBEDDED && prop.object)) {
-                const name = prop.embeddedPath?.join('.') ?? prop.fieldNames[0];
+                const name = prop.formula ? prop.name : (prop.embeddedPath?.join('.') ?? prop.fieldNames[0]);
                 const aliased = this.#state.aliases[a] ? `${a}.${name}` : name;
                 ret.push(getFieldName(aliased, customAlias));
                 return;
@@ -1581,11 +1585,11 @@ export class QueryBuilder {
                 }
                 const nest = (prop) => {
                     for (const childProp of Object.values(prop.embeddedProps)) {
-                        if (childProp.persist === false) {
+                        if (childProp.persist === false && !childProp.formula) {
                             continue;
                         }
                         if (childProp.fieldNames && (childProp.kind !== ReferenceKind.EMBEDDED || childProp.object)) {
-                            const name = childProp.fieldNames[0];
+                            const name = childProp.formula ? childProp.name : childProp.fieldNames[0];
                             ret.push(getFieldName(this.#state.aliases[a] ? `${a}.${name}` : name));
                         }
                         else {
@@ -1666,7 +1670,8 @@ export class QueryBuilder {
                         return `${currentAlias}.${embeddedProp.fieldNames[0]}`;
                     }
                 }
-                return `${currentAlias}.${embeddedProp?.fieldNames?.[0] ?? propName}`;
+                const name = embeddedProp?.formula ? embeddedProp.name : (embeddedProp?.fieldNames?.[0] ?? propName);
+                return `${currentAlias}.${name}`;
             }
             // Handle relations - auto-join if not the last part
             if (prop.kind === ReferenceKind.MANY_TO_ONE ||
@@ -1759,6 +1764,9 @@ export class QueryBuilder {
             case QueryType.COUNT: {
                 const fields = this.#state.fields.map(f => this.helper.mapper(f, this.type, undefined, undefined, schema));
                 qb.count(fields, this.#state.flags.has(QueryFlag.DISTINCT));
+                if (this.#state.distinctOn && this.#state.flags.has(QueryFlag.DISTINCT)) {
+                    qb.distinctOn(this.prepareFields(this.#state.distinctOn, 'where', schema));
+                }
                 this.helper.processJoins(qb, this.#state.joins, joinSchema, schemaOverride);
                 break;
             }
@@ -2322,7 +2330,10 @@ export class QueryBuilder {
                     const fieldName = this.helper.mapper(field, this.type, undefined, null);
                     // virtual fields (e.g. `qb.as(...)`) have no column to reference inside `min()`; inline their
                     // expression instead, as a select alias is not resolvable there on some dialects (e.g. PostgreSQL)
-                    const virtual = !prop?.persist && !prop?.formula && !prop?.hasConvertToJSValueSQL && !pks.includes(fieldName)
+                    const virtual = (!prop || prop.persist === false) &&
+                        !prop?.formula &&
+                        !prop?.hasConvertToJSValueSQL &&
+                        !pks.includes(fieldName)
                         ? this.resolveVirtualField(f, fieldName)
                         : undefined;
                     const expr = virtual ? virtual.expr : this.platform.quoteIdentifier(fieldName);

package/query/QueryBuilderHelper.js

@@ -112,7 +112,7 @@ export class QueryBuilderHelper {
         const aliasPrefix = isTableNameAliasRequired ? resolvedAlias + '.' : '';
         const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
         const fkIdx = fkIdx2 === -1 ? 0 : fkIdx2;
-        if (a === prop?.embedded?.[0]) {
+        if (a === prop?.embedded?.[0] && !prop.formula) {
             return aliasPrefix + prop.fieldNames[fkIdx];
         }
         const noPrefix = prop?.persist === false;
@@ -120,12 +120,13 @@ export class QueryBuilderHelper {
             return raw(this.prefix(field, isTableNameAliasRequired));
         }
         if (prop?.formula) {
-            const alias2 = this.#platform.quoteIdentifier(a).toString();
+            const formulaAlias = isTableAlias ? a : this.#alias;
+            const alias2 = this.#platform.quoteIdentifier(formulaAlias).toString();
             const aliasName = alias === undefined ? prop.fieldNames[0] : alias;
             const as = aliasName === null ? '' : ` as ${this.#platform.quoteIdentifier(aliasName)}`;
             const meta = this.#aliasMap[a]?.meta ?? this.#metadata.get(this.#entityName);
             const table = this.createFormulaTable(alias2, meta, schema);
-            const columns = meta.createColumnMappingObject(p => this.getTPTAliasForProperty(p.name, a), alias2);
+            const columns = meta.createColumnMappingObject(p => this.getTPTAliasForProperty(p.name, formulaAlias), alias2);
             let value = this.#driver.evaluateFormula(prop.formula, columns, table);
             if (!this.isTableNameAliasRequired(type)) {
                 value = value.replaceAll(alias2 + '.', '');