Fixed precedence parenthesis

Author: dantleech

tests/06_Query/QOM/ConvertQueriesBackAndForthTest.php

@@ -53,18 +53,16 @@ public function testBackAndForth()
         foreach ($this->qomQueries as $name => $originalQomQuery) {
             $originalSql2Query = $this->sql2Queries[$name];
             if (is_array($originalSql2Query)) {
-                $passed = false;
-                foreach ($originalSql2Query as $query) {
-                    $qom = $this->sql2Parser->parse($query);
-                    if ($originalQomQuery->getStatement() == $qom->getStatement()) {
-                        $sql2 = $this->qomParser->convert($qom);
-                        if ($sql2 == $query) {
-                            $passed = true;
-                            break;
-                        }
-                    }
-                }
-                $this->assertTrue($passed, "QOM-->SQL2->QOM: Original query variation = ".$query);
+                $sourceQuery = $originalSql2Query[0];
+                $targetQuery = $originalSql2Query[1];
+
+                $qom = $this->sql2Parser->parse($sourceQuery);
+                $sqlResult = $sql2 = $this->qomParser->convert($qom);
+                $this->assertEquals(
+                    $targetQuery,
+                    $sqlResult,
+                    $name
+                );
             } else {
                 $qom = $this->sql2Parser->parse($originalSql2Query);
                 $this->assertEquals($originalQomQuery, $qom, "QOM-->SQL2: Original query = $originalSql2Query");

tests/06_Query/QOM/Sql2TestQueries.php

@@ -59,7 +59,7 @@ public static function getQueries()
 
         $queries['6.7.12.Constraint.Precedence.3'] = array(
             'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 = \'1\' OR file.prop2 = \'2\' AND NOT file.prop3 = \'3\'',
-            'SELECT * FROM [nt:file] AS file WHERE (NOT file.prop1 = \'1\' OR (file.prop2 = \'2\' AND NOT file.prop3 = \'3\'))',
+            'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 = \'1\') OR (file.prop2 = \'2\' AND (NOT file.prop3 = \'3\')))',
         );
 
         $queries['6.7.12.Constraint.Precedence.4'] = array(
@@ -77,7 +77,7 @@ public static function getQueries()
                 NOT file.prop1 IS NOT NULL AND NOT NOT file.prop2 IS NOT NULL
                 OR NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'',
 
-            'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 IS NOT NULL AND NOT NOT file.prop2 IS NOT NULL) OR (NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'))',
+            'SELECT * FROM [nt:file] AS file WHERE (((NOT file.prop1 IS NOT NULL) AND (NOT (NOT file.prop2 IS NOT NULL))) OR ((NOT file.prop3 = \'hello\') AND file.prop4 <> \'hello\'))',
         );
 
         /**