updated rules to allow for nested parenthesis and multiple binary expressions and concatenation operators within parenthesis. refs #2

Author: nwronski

TODO.md

@@ -5,29 +5,51 @@
 - [ ] Missing specs
 
 - [ ] Expression grouping issues
-  ``` sql
-  `anger` != null AND NOT `happiness`
-  ```
+  - [x] Grouping with unary and binary expressions
 
-  ``` sql
-  `happiness` NOT NULL AND `anger` > 0
-  ```
+    ``` sql
+    `anger` != null AND NOT `happiness`
+    ```
 
-  ``` sql
-  `happiness` IS NOT NULL AND `anger` > 0
-  ```
+    ``` sql
+    `happiness` NOT NULL AND `anger` > 0
+    ```
 
-  ``` sql
-  `happiness` ISNULL AND `anger` >
-  ```
+    ``` sql
+    `happiness` IS NOT NULL AND `anger` > 0
+    ```
 
-  ``` sql
-  `anger` > 0 AND `happiness` IS NOT NULL
-  ```
+    ``` sql
+    `happiness` ISNULL AND `anger` >
+    ```
 
-  ``` sql
-  NOT `happiness` AND `anger` > 0
-  ```
+    ``` sql
+    `anger` > 0 AND `happiness` IS NOT NULL
+    ```
+
+    ``` sql
+    NOT `happiness` AND `anger` > 0
+    ```
+
+    ``` sql
+    NOT `happiness` OR ~`ANGER` AND `anger` IS NOT 0
+    ```
+
+  - [ ] Grouping with parenthesis
+
+    ``` sql
+    SELECT *
+    FROM hats
+    WHERE
+      (1 != 2 OR 3 != 4) AND ( 3 == 3 )
+    ```
+
+    ``` sql
+    SELECT *
+    FROM hats
+    WHERE
+      hat OR (shirt AND (shoes OR wig) AND pants)
+    ```
 
 - [ ] Remove `modifier` key from all parts of AST and standardize as `conditions`
 

lib/sql-parser.js

@@ -56,7 +56,7 @@ expression_concat
   }
 
 expression_wrapped
-  = sym_popen o n:( expression_unary / expression_node / expression_value ) o sym_pclose
+  = sym_popen n:( expression ) o sym_pclose
   { return n; }
 
 expression_value
@@ -77,7 +77,7 @@ expression_unary
       'format': 'unary',
       'variant': 'operation',
       'expression': e,
-      'operator': o
+      'operator': _.key(o)
     };
   }