@strapi/database 5.12.0-beta.1 → 5.12.0

package/dist/index.js

@@ -5324,7 +5324,8 @@ const createQueryBuilder = (uid, db, initialState = {})=>{
         decrements: [],
         aliasCounter: 0,
         filters: null,
-        search: null
+        search: null,
+        processed: false
     }, initialState);
     const getAlias = ()=>{
         const alias = `t${state.aliasCounter}`;
@@ -5529,13 +5530,17 @@ const createQueryBuilder = (uid, db, initialState = {})=>{
             ].includes(state.type) && state.joins.length > 0;
         },
         runSubQuery () {
+            const originalType = state.type;
             this.select('id');
             const subQB = this.getKnexQuery();
             const nestedSubQuery = db.getConnection().select('id').from(subQB.as('subQuery'));
             const connection = db.getConnection(tableName);
-            return connection[state.type]().whereIn('id', nestedSubQuery);
+            return connection[originalType]().whereIn('id', nestedSubQuery);
         },
         processState () {
+            if (this.state.processed) {
+                return;
+            }
             state.orderBy = processOrderBy(state.orderBy, {
                 qb: this,
                 uid,
@@ -5568,6 +5573,7 @@ const createQueryBuilder = (uid, db, initialState = {})=>{
             });
             state.data = toRow(meta, state.data);
             this.processSelect();
+            this.state.processed = true;
         },
         shouldUseDistinct () {
             return state.joins.length > 0 && _.isEmpty(state.groupBy);
@@ -5613,10 +5619,12 @@ const createQueryBuilder = (uid, db, initialState = {})=>{
             }
             const aliasedTableName = this.mustUseAlias() ? `${tableName} as ${this.alias}` : tableName;
             const qb = db.getConnection(aliasedTableName);
+            // The state should always be processed before calling shouldUseSubQuery as it
+            // relies on the presence or absence of joins to determine the need of a subquery
+            this.processState();
             if (this.shouldUseSubQuery()) {
                 return this.runSubQuery();
             }
-            this.processState();
             switch(state.type){
                 case 'select':
                     {
@@ -6770,7 +6778,9 @@ const createEntityManager = (db)=>{
                 params
             });
             const { where } = params;
-            const deletedRows = await this.createQueryBuilder(uid).where(where).delete().execute();
+            const deletedRows = await this.createQueryBuilder(uid).where(where).delete().execute({
+                mapResults: false
+            });
             const result = {
                 count: deletedRows
             };