@mikro-orm/core 6.3.14-dev.52 → 6.3.14-dev.54

package/decorators/ManyToOne.d.ts

@@ -15,6 +15,8 @@ export interface ManyToOneOptions<Owner, Target> extends ReferenceOptions<Owner,
     joinColumn?: string;
     /** Override the default database column name on the owning side (see {@doclink naming-strategy | Naming Strategy}). This option is suitable for composite keys, where one property is represented by multiple columns. */
     joinColumns?: string[];
+    /** When a part of a composite column is shared in other properties, use this option to specify what columns are considered as owned by this property. This is useful when your composite property is nullable, but parts of it are not. */
+    ownColumns?: string[];
     /** Override the default database column name on the target entity (see {@doclink naming-strategy | Naming Strategy}). This option is only for simple properties represented by a single column. */
     referenceColumnName?: string;
     /** Override the default database column name on the target entity (see {@doclink naming-strategy | Naming Strategy}). This option is suitable for composite keys, where one property is represented by multiple columns. */

package/drivers/DatabaseDriver.js

@@ -223,7 +223,7 @@ class DatabaseDriver {
             }
             if (prop.joinColumns?.length > 1 && data[k] == null) {
                 delete data[k];
-                prop.joinColumns.forEach((joinColumn, idx) => data[joinColumn] = null);
+                prop.ownColumns.forEach(joinColumn => data[joinColumn] = null);
                 return;
             }
             if (prop.customType && convertCustomTypes && !(prop.customType instanceof JsonType_1.JsonType && object) && !this.platform.isRaw(data[k])) {

package/metadata/MetadataDiscovery.d.ts

@@ -31,6 +31,7 @@ export declare class MetadataDiscovery {
     private saveToCache;
     private initNullability;
     private applyNamingStrategy;
+    private initOwnColumns;
     private initFieldName;
     private initManyToOneFieldName;
     private initManyToManyFieldName;

package/metadata/MetadataDiscovery.js

@@ -361,6 +361,22 @@ class MetadataDiscovery {
             this.initOneToManyFields(prop);
         }
     }
+    initOwnColumns(meta) {
+        meta.sync();
+        for (const prop of meta.props) {
+            if (!prop.joinColumns || prop.ownColumns) {
+                continue;
+            }
+            if (prop.joinColumns.length > 1) {
+                prop.ownColumns = prop.joinColumns.filter(col => {
+                    return !meta.props.find(p => p.name !== prop.name && (!p.fieldNames || p.fieldNames.includes(col)));
+                });
+            }
+            if (!prop.ownColumns || prop.ownColumns.length === 0) {
+                prop.ownColumns = prop.joinColumns;
+            }
+        }
+    }
     initFieldName(prop, object = false) {
         if (prop.fieldNames && prop.fieldNames.length > 0) {
             return;
@@ -469,6 +485,7 @@ class MetadataDiscovery {
             this.initColumnType(prop);
             this.initRelation(prop);
         }
+        this.initOwnColumns(meta);
         meta.simplePK = pks.length === 1 && pks[0].kind === enums_1.ReferenceKind.SCALAR && !pks[0].customType && pks[0].runtimeType !== 'Date';
         meta.serializedPrimaryKey = this.platform.getSerializedPrimaryKeyField(meta.primaryKeys[0]);
         const serializedPKProp = meta.properties[meta.serializedPrimaryKey];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.52",
+  "version": "6.3.14-dev.54",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.52",
+    "mikro-orm": "6.3.14-dev.54",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -365,6 +365,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     pivotTable: string;
     pivotEntity: string;
     joinColumns: string[];
+    ownColumns: string[];
     inverseJoinColumns: string[];
     referencedColumnNames: string[];
     referencedTableName: string;

package/utils/Configuration.d.ts

@@ -57,6 +57,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
         populateWhere: PopulateHint.ALL;
         connect: true;
         ignoreUndefinedInQuery: false;
+        onQuery: (sql: string) => string;
         autoJoinOneToOneOwner: true;
         autoJoinRefsForFilters: true;
         propagationOnPrototype: true;
@@ -323,6 +324,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     connect: boolean;
     verbose: boolean;
     ignoreUndefinedInQuery?: boolean;
+    onQuery: (sql: string, params: unknown[]) => string;
     autoJoinOneToOneOwner: boolean;
     autoJoinRefsForFilters: boolean;
     propagationOnPrototype: boolean;

package/utils/Configuration.js

@@ -51,6 +51,7 @@ class Configuration {
         populateWhere: enums_1.PopulateHint.ALL,
         connect: true,
         ignoreUndefinedInQuery: false,
+        onQuery: sql => sql,
         autoJoinOneToOneOwner: true,
         autoJoinRefsForFilters: true,
         propagationOnPrototype: true,