@mikro-orm/knex 7.0.0-dev.2 → 7.0.0-dev.4

package/AbstractSqlDriver.js

@@ -252,6 +252,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 : meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, hint.children || []));
             const tz = this.platform.getTimezone();
             for (const prop of targetProps) {
+                if (prop.fieldNames.every(name => typeof root[`${relationAlias}__${name}`] === 'undefined')) {
+                    continue;
+                }
                 if (prop.fieldNames.length > 1) { // composite keys
                     const fk = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
                     const pk = Utils.mapFlatCompositePrimaryKey(fk, prop);
@@ -927,11 +930,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const fields = [];
         const populate = options.populate ?? [];
         const joinedProps = this.joinedProps(meta, populate, options);
-        const shouldHaveColumn = (prop, populate, fields) => {
+        const shouldHaveColumn = (meta, prop, populate, fields) => {
             if (!this.platform.shouldHaveColumn(prop, populate, options.exclude)) {
                 return false;
             }
-            if (!fields || fields.includes('*') || prop.primary) {
+            if (!fields || fields.includes('*') || prop.primary || meta.root.discriminatorColumn === prop.name) {
                 return true;
             }
             return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
@@ -941,7 +944,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (options.parentJoinPath) {
             // alias all fields in the primary table
             meta.props
-                .filter(prop => shouldHaveColumn(prop, populate, options.explicitFields))
+                .filter(prop => shouldHaveColumn(meta, prop, populate, options.explicitFields))
                 .forEach(prop => fields.push(...this.mapPropToFieldNames(qb, prop, options.parentTableAlias)));
         }
         for (const hint of joinedProps) {
@@ -1289,6 +1292,9 @@ export class AbstractSqlDriver extends DatabaseDriver {
             if (!options.fields.includes('*') && !options.fields.includes(`${qb.alias}.*`)) {
                 ret.unshift(...meta.primaryKeys.filter(pk => !options.fields.includes(pk)));
             }
+            if (meta.root.discriminatorColumn && !options.fields.includes(`${qb.alias}.${meta.root.discriminatorColumn}`)) {
+                ret.push(meta.root.discriminatorColumn);
+            }
         }
         else if (!Utils.isEmpty(options.exclude) || lazyProps.some(p => !p.formula && (p.kind !== '1:1' || p.owner))) {
             const props = meta.props.filter(prop => this.platform.shouldHaveColumn(prop, populate, options.exclude, false));

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -65,9 +65,11 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             this.params.push(...clause.fields.params);
         }
         else if (clause.fields.length > 0) {
-            // const fields = clause.fields.map(field => this.quote(field));
-            const conflictColumn = this.quote(clause.fields[0]);
-            this.parts.push(`on ${this.getTableName()}.${conflictColumn} = tsource.${conflictColumn}`);
+            const fields = clause.fields.map(field => {
+                const col = this.quote(field);
+                return `${this.getTableName()}.${col} = tsource.${col}`;
+            });
+            this.parts.push(`on ${fields.join(' and ')}`);
         }
         const sourceColumns = keys.map(field => `tsource.${this.quote(field)}`).join(', ');
         const destinationColumns = keys.map(field => this.quote(field)).join(', ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.2",
+  "version": "7.0.0-dev.4",
   "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.",
   "type": "module",
   "exports": {
@@ -54,9 +54,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.4.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.2"
+    "@mikro-orm/core": "7.0.0-dev.4"
   }
 }

package/query/CriteriaNode.js

@@ -69,16 +69,12 @@ export class CriteriaNode {
         let joinAlias = qb.getAliasForJoinPath(this.getPath());
         if (!joinAlias && this.parent && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(this.prop.kind) && this.prop.owner) {
             joinAlias = qb.getAliasForJoinPath(this.parent.getPath());
-            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
+            return Utils.getPrimaryKeyHash(this.prop.ownColumns.map(col => `${joinAlias ?? qb.alias}.${col}`));
         }
         const alias = joinAlias ?? qb.alias;
         if (this.prop.kind === ReferenceKind.MANY_TO_MANY) {
             return Utils.getPrimaryKeyHash(this.prop.inverseJoinColumns.map(col => `${alias}.${col}`));
         }
-        // if we found a matching join, we need to use the target table column names, as we use that alias instead of the root
-        if (!joinAlias && this.prop.owner && this.prop.joinColumns.length > 1) {
-            return Utils.getPrimaryKeyHash(this.prop.joinColumns.map(col => `${alias}.${col}`));
-        }
         return Utils.getPrimaryKeyHash(this.prop.referencedColumnNames.map(col => `${alias}.${col}`));
     }
     getPath(addIndex = false) {

package/query/QueryBuilder.d.ts

@@ -256,10 +256,6 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * Executes the query, returning both array of results and total count query (without offset and limit).
      */
     getResultAndCount(): Promise<[Entity[], number]>;
-    /**
-     * Provides promise-like interface so we can await the QB instance.
-     */
-    then<TResult1 = any, TResult2 = never>(onfulfilled?: ((value: any) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<Loaded<Entity, Hint>[] | number | QueryResult<Entity>>;
     /**
      * Returns native query builder instance with sub-query aliased with given alias.
      * You can provide `EntityName.propName` as alias, then the field name will be used based on the metadata
@@ -303,14 +299,12 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
 export interface RunQueryBuilder<Entity extends object> extends Omit<QueryBuilder<Entity, any, any>, 'getResult' | 'getSingleResult' | 'getResultList' | 'where'> {
     where(cond: QBFilterQuery<Entity> | string, params?: keyof typeof GroupOperator | any[], operator?: keyof typeof GroupOperator): this;
     execute<Result = QueryResult<Entity>>(method?: 'all' | 'get' | 'run', mapResults?: boolean): Promise<Result>;
-    then<TResult1 = QueryResult<Entity>, TResult2 = never>(onfulfilled?: ((value: QueryResult<Entity>) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<QueryResult<Entity>>;
 }
 export interface SelectQueryBuilder<Entity extends object = AnyEntity, RootAlias extends string = never, Hint extends string = never, Context extends object = never> extends QueryBuilder<Entity, RootAlias, Hint, Context> {
     execute<Result = Entity[]>(method?: 'all' | 'get' | 'run', mapResults?: boolean): Promise<Result>;
     execute<Result = Entity[]>(method: 'all', mapResults?: boolean): Promise<Result>;
     execute<Result = Entity>(method: 'get', mapResults?: boolean): Promise<Result>;
     execute<Result = QueryResult<Entity>>(method: 'run', mapResults?: boolean): Promise<Result>;
-    then<TResult1 = Entity[], TResult2 = never>(onfulfilled?: ((value: Loaded<Entity, Hint>[]) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<Loaded<Entity, Hint>[]>;
 }
 export interface CountQueryBuilder<Entity extends object> extends QueryBuilder<Entity, any, any> {
     execute<Result = {
@@ -325,7 +319,6 @@ export interface CountQueryBuilder<Entity extends object> extends QueryBuilder<E
     execute<Result = QueryResult<{
         count: number;
     }>>(method: 'run', mapResults?: boolean): Promise<Result>;
-    then<TResult1 = number, TResult2 = never>(onfulfilled?: ((value: number) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<number>;
 }
 export interface InsertQueryBuilder<T extends object> extends RunQueryBuilder<T> {
 }

package/query/QueryBuilder.js

@@ -753,26 +753,6 @@ export class QueryBuilder {
             await this.clone().getCount(),
         ];
     }
-    /**
-     * Provides promise-like interface so we can await the QB instance.
-     */
-    then(onfulfilled, onrejected) {
-        let type = this.type;
-        if (this.flags.has(QueryFlag.UPDATE_SUB_QUERY) || this.flags.has(QueryFlag.DELETE_SUB_QUERY)) {
-            type = QueryType.UPDATE;
-        }
-        switch (type) {
-            case QueryType.INSERT:
-            case QueryType.UPDATE:
-            case QueryType.DELETE:
-            case QueryType.UPSERT:
-            case QueryType.TRUNCATE:
-                return this.execute('run').then(onfulfilled, onrejected);
-            case QueryType.COUNT:
-                return this.getCount().then(onfulfilled, onrejected);
-            case QueryType.SELECT: return this.getResultList().then(onfulfilled, onrejected);
-        }
-    }
     /**
      * Returns native query builder instance with sub-query aliased with given alias.
      * You can provide `EntityName.propName` as alias, then the field name will be used based on the metadata

package/query/QueryBuilderHelper.js

@@ -39,9 +39,6 @@ export class QueryBuilderHelper {
                 const prop = this.getProperty(f, a);
                 const fkIdx2 = prop?.fieldNames.findIndex(name => name === f) ?? -1;
                 if (fkIdx2 !== -1) {
-                    if (prop?.ownColumns && !prop.ownColumns.includes(f)) {
-                        continue;
-                    }
                     parts.push(this.mapper(a !== this.alias ? `${a}.${prop.fieldNames[fkIdx2]}` : prop.fieldNames[fkIdx2], type, value, alias));
                 }
                 else if (prop) {
@@ -62,9 +59,6 @@ export class QueryBuilderHelper {
                     }
                 });
             }
-            if (parts.length === 1) {
-                return parts[0];
-            }
             return raw('(' + parts.map(part => this.platform.quoteIdentifier(part)).join(', ') + ')');
         }
         const rawField = RawQueryFragment.getKnownFragment(field);
@@ -473,8 +467,8 @@ export class QueryBuilderHelper {
             parts.push(sql);
             params.push(...params2);
         }
-        else if (op === '$in' && Array.isArray(value[op]) && value[op].length === 0) {
-            parts.push(`1 = 0`);
+        else if (['$in', '$nin'].includes(op) && Array.isArray(value[op]) && value[op].length === 0) {
+            parts.push(`1 = ${op === '$in' ? 0 : 1}`);
         }
         else if (value[op] instanceof RawQueryFragment || value[op] instanceof NativeQueryBuilder) {
             const query = value[op] instanceof NativeQueryBuilder ? value[op].toRaw() : value[op];

package/schema/SqlSchemaGenerator.js

@@ -103,24 +103,14 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
             return super.clearDatabase(options);
         }
         await this.execute(this.helper.disableForeignKeysSQL());
-        for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
+        const schema = options?.schema ?? this.config.get('schema', this.platform.getDefaultSchemaName());
+        for (const meta of this.getOrderedMetadata(schema).reverse()) {
             await this.driver.createQueryBuilder(meta.className, this.em?.getTransactionContext(), 'write', false)
-                .withSchema(options?.schema)
-                .truncate();
+                .withSchema(schema)
+                .truncate()
+                .execute();
         }
         await this.execute(this.helper.enableForeignKeysSQL());
-        // const parts: string[] = [this.helper.disableForeignKeysSQL()];
-        //
-        // for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
-        //   const query = this.driver.createQueryBuilder(meta.className, this.em?.getTransactionContext(), 'write', false)
-        //     .withSchema(options?.schema)
-        //     .truncate()
-        //     .getFormattedQuery();
-        //   parts.push(query);
-        // }
-        //
-        // parts.push(this.helper.enableForeignKeysSQL());
-        // await this.execute(parts.join(';\n'));
         this.clearIdentityMap();
     }
     async getDropSchemaSQL(options = {}) {