@mikro-orm/knex 6.0.2-dev.0 → 6.0.2-dev.10

package/AbstractSqlDriver.js

@@ -130,7 +130,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         return res;
     }
     async wrapVirtualExpressionInSubquery(meta, expression, where, options, type) {
-        const qb = this.createQueryBuilder(meta.className, options?.ctx, options.connectionType, options.convertCustomTypes)
+        const qb = this.createQueryBuilder(meta.className, options?.ctx, options.connectionType, options.convertCustomTypes, options.logging)
             .indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments);
@@ -285,7 +285,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (meta?.virtual) {
             return this.countVirtual(entityName, where, options);
         }
-        const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false)
+        const qb = this.createQueryBuilder(entityName, options.ctx, options.connectionType, false, options.logging)
             .indexHint(options.indexHint)
             .comment(options.comments)
             .hintComment(options.hintComments)
@@ -664,7 +664,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const pivotProp2 = pivotMeta.relations[prop.owner ? 0 : 1];
         const ownerMeta = this.metadata.find(pivotProp2.type);
         options = { ...options };
-        const qb = this.createQueryBuilder(prop.pivotEntity, ctx, options.connectionType)
+        const qb = this.createQueryBuilder(prop.pivotEntity, ctx, options.connectionType, undefined, options?.logging)
             .withSchema(this.getSchemaName(pivotMeta, options))
             .indexHint(options.indexHint)
             .comment(options.comments)
@@ -972,7 +972,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     }
     async lockPessimistic(entity, options) {
         const meta = (0, core_1.helper)(entity).__meta;
-        const qb = this.createQueryBuilder(entity.constructor.name, options.ctx).withSchema(options.schema ?? meta.schema);
+        const qb = this.createQueryBuilder(entity.constructor.name, options.ctx, undefined, undefined, options.logging).withSchema(options.schema ?? meta.schema);
         const cond = core_1.Utils.getPrimaryKeyCond(entity, meta.primaryKeys);
         qb.select((0, core_1.raw)('1')).where(cond).setLockMode(options.lockMode, options.lockTableAliases);
         await this.rethrow(qb.execute());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.2-dev.0",
+  "version": "6.0.2-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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^6.0.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.2-dev.0"
+    "@mikro-orm/core": "6.0.2-dev.10"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -27,8 +27,11 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                         throw new Error('Mixing collection operators with other filters is not allowed.');
                     }
                     const payload = this.payload[key].unwrap();
-                    const sub = qb.clone(true).innerJoin(this.key, qb.getNextAlias(this.prop.type));
-                    sub.select(this.prop.targetMeta.primaryKeys);
+                    const sub = qb
+                        .clone(true)
+                        .from(this.parent.entityName)
+                        .innerJoin(this.key, qb.getNextAlias(this.prop.type))
+                        .select(this.prop.targetMeta.primaryKeys);
                     if (key === '$every') {
                         sub.where({ $not: { [this.key]: payload } });
                     }

package/schema/DatabaseTable.js

@@ -153,7 +153,7 @@ class DatabaseTable {
     }
     getEntityDeclaration(namingStrategy, schemaHelper, scalarPropertiesForRelations) {
         const { fksOnColumnProps, fksOnStandaloneProps, columnFks, fkIndexes, nullableForeignKeys, skippedColumnNames, } = this.foreignKeysToProps(namingStrategy, scalarPropertiesForRelations);
-        let name = namingStrategy.getClassName(this.name, '_');
+        let name = namingStrategy.getEntityName(this.name, this.schema);
         name = name.match(/^\d/) ? 'E' + name : name;
         const schema = new core_1.EntitySchema({ name, collection: this.name, schema: this.schema });
         const compositeFkIndexes = {};
@@ -561,7 +561,7 @@ class DatabaseTable {
     }
     getPropertyTypeForForeignKey(namingStrategy, fk) {
         const parts = fk.referencedTableName.split('.', 2);
-        return namingStrategy.getClassName(parts.length > 1 ? parts[1] : parts[0], '_');
+        return namingStrategy.getEntityName(...parts.reverse());
     }
     getPropertyTypeForColumn(namingStrategy, column, fk) {
         if (fk) {

package/typings.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import type { CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag } from '@mikro-orm/core';
+import type { CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag, AnyEntity, EntityName } from '@mikro-orm/core';
 import type { JoinType, QueryType } from './query/enums';
 import type { DatabaseSchema, DatabaseTable } from './schema';
 export interface Table {
@@ -120,6 +120,7 @@ export interface IQueryBuilder<T> {
     _fields?: Field<T>[];
     select(fields: Field<T> | Field<T>[], distinct?: boolean): this;
     addSelect(fields: string | string[]): this;
+    from<T extends AnyEntity<T> = AnyEntity>(target: EntityName<T> | IQueryBuilder<T>, aliasName?: string): IQueryBuilder<T>;
     insert(data: any): this;
     update(data: any): this;
     delete(cond?: QBFilterQuery): this;