Fix query translator.

Author: clems4ever

internal/knowledge/query_sql.go

@@ -321,6 +321,7 @@ func (sqt *SQLQueryTranslator) Translate(query *query.QueryCypher) (*SQLTranslat
 	var from []string
 
 	filterExpressions := AndOrExpression{And: true}
+	whereExpressions := AndOrExpression{And: true}
 	for _, x := range query.QuerySinglePartQuery.QueryMatches {
 		parser := NewPatternParser(&sqt.QueryGraph)
 		for _, y := range x.PatternElements {
@@ -330,17 +331,6 @@ func (sqt *SQLQueryTranslator) Translate(query *query.QueryCypher) (*SQLTranslat
 			}
 		}
 
-		// Build the constraints for the patterns in MATCH clause
-		expr, f, err := buildSQLConstraintsFromPatterns(&sqt.QueryGraph, constrainedNodes, MatchScope)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to build SQL constraints from patterns in the MATCH clause: %v", err)
-		}
-		from = f
-
-		if expr.Expression != "" || len(expr.Children) > 0 {
-			filterExpressions.Children = append(filterExpressions.Children, *expr)
-		}
-
 		if x.Where != nil {
 			whereVisitor := NewQueryWhereVisitor(&sqt.QueryGraph)
 			whereExpression, err := whereVisitor.ParseExpression(x.Where)
@@ -357,12 +347,27 @@ func (sqt *SQLQueryTranslator) Translate(query *query.QueryCypher) (*SQLTranslat
 
 			// We only append the expression if it's not empty
 			if whereExpression != "" {
-				filterExpressions.Children = append(filterExpressions.Children,
-					AndOrExpression{Expression: whereExpression})
+				whereExpressions.Children = append(whereExpressions.Children,
+					AndOrExpression{And: true, Expression: whereExpression})
 			}
 		}
 	}
 
+	// Build the constraints for the patterns in MATCH clause
+	expr, f, err := buildSQLConstraintsFromPatterns(&sqt.QueryGraph, constrainedNodes, MatchScope)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to build SQL constraints from patterns in the MATCH clause: %v", err)
+	}
+	from = f
+
+	if expr.Expression != "" || len(expr.Children) > 0 {
+		filterExpressions.Children = append(filterExpressions.Children, *expr)
+	}
+
+	if whereExpressions.Expression != "" || len(whereExpressions.Children) > 0 {
+		filterExpressions.Children = append(filterExpressions.Children, whereExpressions)
+	}
+
 	projections := make([]string, 0)
 	projectionTypes := make([]Projection, 0)
 

internal/knowledge/query_sql_test.go

@@ -243,7 +243,6 @@ RETURN ip`,
 SELECT a0.id, a0.value, a0.type FROM assets a0, assets a1, relations r0
 WHERE ((((a0.type = 'ip' AND a1.type = 'device') AND r0.type = 'observed') AND (r0.from_id = a1.id AND r0.to_id = a0.id)) AND NOT EXISTS (SELECT 1 FROM assets aw0, assets aw2, relations rw1
 WHERE (aw0.id = a0.id AND aw2.type = 'task' AND rw1.type = 'scanned' AND (rw1.from_id = aw2.id AND rw1.to_id = aw0.id))))`,
-			Selected: true,
 		},
 		{
 			Description: "Combine a pattern and a simple comparison expression in the WHERE clause",
@@ -255,7 +254,6 @@ RETURN ip`,
 SELECT a0.id, a0.value, a0.type FROM assets a0, assets a1, relations r0
 WHERE ((((a0.type = 'ip' AND a1.type = 'device') AND r0.type = 'observed') AND (r0.from_id = a1.id AND r0.to_id = a0.id)) AND EXISTS (SELECT 1 FROM assets aw0, assets aw2, relations rw1
 WHERE (aw0.id = a0.id AND aw2.type = 'task' AND rw1.type = 'scanned' AND (rw1.from_id = aw2.id AND rw1.to_id = aw0.id))) AND a0.value = '127.0.0.1')`,
-			Selected: true,
 		},
 	}
 

internal/query/query_test.go

@@ -1,32 +1,34 @@
 package query
 
-import "testing"
+import (
+	"testing"
 
-import "github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/require"
+)
 
 type TestCase struct {
 	Query string
 	Error string
 }
 
 var testCases = []TestCase{
-	TestCase{
+	{
 		Query: "MATCH",
 		Error: "Parsing errors detected: line 1:5 - no viable alternative at input 'MATCH'",
 	},
-	TestCase{
+	{
 		Query: "MATCH (n) RETURN ",
 		Error: "Parsing errors detected: line 1:17 - no viable alternative at input ' '",
 	},
-	TestCase{
+	{
 		Query: "MATCH (n) RETURN c, n,",
 		Error: "Parsing errors detected: line 1:22 - mismatched input '<EOF>' expecting {'(', '[', '+', '-', '{', '$', ALL, NOT, NULL, COUNT, ANY, NONE, SINGLE, TRUE, FALSE, EXISTS, CASE, StringLiteral, HexInteger, DecimalInteger, OctalInteger, HexLetter, ExponentDecimalReal, RegularDecimalReal, FILTER, EXTRACT, UnescapedSymbolicName, EscapedSymbolicName, SP}",
 	},
-	TestCase{
+	{
 		Query: "MATCH (n)-[r]-> RETURN c",
 		Error: "Parsing errors detected: line 1:16 - no viable alternative at input 'MATCH (n)-[r]-> RETURN'",
 	},
-	TestCase{
+	{
 		Query: "MATCH (n)->[r]-(n) RETURN c",
 		Error: "Parsing errors detected: line 1:10 - no viable alternative at input 'MATCH (n)->'",
 	},