Merge pull request #2 from PruvoNet/nested-filters

regevbr · web-flow · commit b3fd989d64fa · 2025-03-27T09:54:33.000+02:00
Nested filters
diff --git a/lib/sql.js b/lib/sql.js
@@ -1131,11 +1131,13 @@ SQLConnector.prototype._buildWhere = function(model, where) {
             branches.push(stmtForClause.sql);
           }
         }
-        stmt.merge({
-          sql: '(' + branches.join(' ' + key.toUpperCase() + ' ') + ')',
-          params: branchParams,
-        });
-        whereStmts.push(stmt);
+        if (branches.length > 0) {
+          stmt.merge({
+            sql: '(' + branches.join(' ' + key.toUpperCase() + ' ') + ')',
+            params: branchParams,
+          });
+          whereStmts.push(stmt);
+        }
         continue;
       }
       // The value is not an array, fall back to regular fields

Original file line number	Diff line number	Diff line change
`@@ -1131,11 +1131,13 @@ SQLConnector.prototype._buildWhere = function(model, where) {`
`1131`	`1131`	`branches.push(stmtForClause.sql);`
`1132`	`1132`	`}`
`1133`	`1133`	`}`
`1134`		`- stmt.merge({`
`1135`		`- sql: '(' + branches.join(' ' + key.toUpperCase() + ' ') + ')',`
`1136`		`- params: branchParams,`
`1137`		`- });`
`1138`		`- whereStmts.push(stmt);`
	`1134`	`+ if (branches.length > 0) {`
	`1135`	`+ stmt.merge({`
	`1136`	`+ sql: '(' + branches.join(' ' + key.toUpperCase() + ' ') + ')',`
	`1137`	`+ params: branchParams,`
	`1138`	`+ });`
	`1139`	`+ whereStmts.push(stmt);`
	`1140`	`+ }`
`1139`	`1141`	`continue;`
`1140`	`1142`	`}`
`1141`	`1143`	`// The value is not an array, fall back to regular fields`