fix issue with bigger array query returning zero results

#343
ujjwalguptaofficial · Aug 28, 2023 · 361a8b3 · 361a8b3
1 parent 27c20a9
commit 361a8b3
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 8 deletions.
diff --git a/src/worker/executors/select/index.ts b/src/worker/executors/select/index.ts
@@ -150,22 +150,23 @@ export class Select extends BaseFetch {
             else {
                 this.results = output;
             }
+            return promiseResolve();
         };
-        const executeWhere = (whereQuery) => {
+        const executeWhere = (whereQuery): Promise<any> => {
             const select = new Select({
                 from: this.query.from,
                 where: whereQuery as any
             }, this.util);
             return select.execute().then(results => {
                 this.results = results;
-                onSuccess();
+                return onSuccess();
             });
         };
-        const processFirstQry = () => {
+        const processFirstQry = (): Promise<any> => {
             let whereQueryToProcess = whereQuery.shift();
             const whereQueryOr = whereQueryToProcess[QUERY_OPTION.Or];
             if (whereQueryOr) {
-                if (Array.isArray(whereQueryOr)) {
+                if (isArray(whereQueryOr)) {
                     operation = QUERY_OPTION.Or;
                     return executeWhere(whereQueryOr);
                 }

diff --git a/src/worker/executors/select/join.ts b/src/worker/executors/select/join.ts
@@ -126,10 +126,10 @@ class Join {
                     whereQueryModified: whereQryParam
                 }
             }
-            const result = removeJoinColumn(whereQuery);
-            const whereQryAfterJoin = result.whereQryAfterJoin;
-            query.where = result.whereQueryModified;
-            if (result.isWhereEmpty) {
+            const removeJoinColumnResult = removeJoinColumn(whereQuery);
+            const whereQryAfterJoin = removeJoinColumnResult.whereQryAfterJoin;
+            query.where = removeJoinColumnResult.whereQueryModified;
+            if (removeJoinColumnResult.isWhereEmpty) {
                 delete query.where;
             }
             const joinQuery = this.joinQueryStack_[0];

diff --git a/test/cases/select/select_complex.js b/test/cases/select/select_complex.js
@@ -530,4 +530,75 @@ describe('Test select complex case', function () {
             done(err);
         })
     });
+
+    it(`SELECT Orders.OrderID, Customers.CustomerName, Orders.OrderDate
+    FROM Orders
+    where orderId<1000000 && shipperId=2 and ((employeeId=4 and customerId=34) or (employeeId=4 and customerId=76)) order by orderid asc        
+    `, function (done) {
+        con.select({
+            from: "Orders",
+            order: {
+                by: 'customerId',
+                type: 'asc' //supprted sort type is - asc,desc
+            },
+            where: [{
+                orderId: {
+                    '<': 1000000
+                }
+            }, {
+                shipperId: 2,
+            },
+            [{
+                employeeId: 4,
+                customerId: 34,
+            }, {
+                or: {
+                    employeeId: 4,
+                    customerId: 76
+                }
+            }],
+            ]
+        }).then(function (results) {
+            expect(results).to.be.an('array').length(3);
+            const expectedIds = results.map(result => result.orderId);
+            expect(expectedIds).eql([10250, 10252, 10302])
+            done();
+        }).catch(done)
+    });
+
+    it(`SELECT Orders.OrderID, Customers.CustomerName, Orders.OrderDate
+    FROM Orders
+    where shipperId=2 and ((employeeId=4 and customerId=34) or (employeeId=4 and customerId=76)) and orderId<1000000 order by orderid asc        
+    `, function (done) {
+        con.select({
+            from: "Orders",
+            order: {
+                by: 'customerId',
+                type: 'asc' //supprted sort type is - asc,desc
+            },
+            where: [{
+                shipperId: 2,
+            },
+            [{
+                employeeId: 4,
+                customerId: 34,
+            }, {
+                or: {
+                    employeeId: 4,
+                    customerId: 76
+                }
+            }],
+            {
+                orderId: {
+                    '<': 1000000
+                }
+            },
+            ]
+        }).then(function (results) {
+            expect(results).to.be.an('array').length(3);
+            const expectedIds = results.map(result => result.orderId);
+            expect(expectedIds).eql([10250, 10252, 10302])
+            done();
+        }).catch(done)
+    });
 });