fix: fix NOT operator sometimes producing incorrect queries (#17044)

sequelize · Feb 5, 2024 · 63ba367 · 63ba367
1 parent 68be977
commit 63ba367
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/core/src/dialects/abstract/where-sql-builder.ts b/packages/core/src/dialects/abstract/where-sql-builder.ts
@@ -879,10 +879,6 @@ function wrapWithNot(sql: string): string {
     return '';
   }
 
-  if (sql.startsWith('(') && sql.endsWith(')')) {
-    return `NOT ${sql}`;
-  }
-
   return `NOT (${sql})`;
 }
 

diff --git a/packages/core/test/unit/sql/where.test.ts b/packages/core/test/unit/sql/where.test.ts
@@ -2696,6 +2696,23 @@ Caused by: "undefined" cannot be escaped`),
         default: 'NOT ([intAttr1] = 1 AND [intAttr2] = 2)',
       });
 
+      testSql({
+        [Op.not]: {
+          [Op.or]: {
+            [Op.and]: {
+              intAttr1: 1,
+              intAttr2: 2,
+            },
+            [Op.or]: {
+              intAttr1: 1,
+              intAttr2: 2,
+            },
+          },
+        },
+      }, {
+        default: 'NOT (([intAttr1] = 1 AND [intAttr2] = 2) OR ([intAttr1] = 1 OR [intAttr2] = 2))',
+      });
+
       // Op.not, Op.and, Op.or can reside on the same object as attributes
       testSql({
         intAttr1: 1,