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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.2",
+  "version": "7.0.0-dev.3",
   "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": {
@@ -57,6 +57,6 @@
     "@mikro-orm/core": "^6.4.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.2"
+    "@mikro-orm/core": "7.0.0-dev.3"
   }
 }

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/schema/SqlSchemaGenerator.js

@@ -106,21 +106,10 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
             await this.driver.createQueryBuilder(meta.className, this.em?.getTransactionContext(), 'write', false)
                 .withSchema(options?.schema)
-                .truncate();
+                .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 = {}) {