Merge pull request #61 from jsixface/bug/NilStarSelect

Add validation for fields in where clauses.

runtime/commits_test.go

@@ -29,7 +29,7 @@ func getTableForQuery(query, directory string, t *testing.T) *TableData {
 	visitor := new(RuntimeVisitor)
 	err := visitor.Visit(ast)
 	failTestIfError(err, t)
-
+	findWalkType(ast)
 	tableData, err := walkCommits(ast, visitor)
 	failTestIfError(err, t)
 	return tableData

runtime/visitor.go

@@ -1,9 +1,11 @@
 package runtime
 
 import (
+	"fmt"
 	"reflect"
 
 	"github.com/cloudson/gitql/parser"
+	"github.com/cloudson/gitql/utilities"
 )
 
 func (v *RuntimeVisitor) Visit(n *parser.NodeProgram) error {
@@ -26,6 +28,11 @@ func (v *RuntimeVisitor) VisitSelect(n *parser.NodeSelect) error {
 			n.WildCard = false
 		}
 
+		err := testAllFieldsInExpr(n.Where, proxyTableName)
+		if err != nil {
+			return err
+		}
+
 		n.Tables[0] = proxy.table
 		var from, to string
 		for from, to = range proxy.fields {
@@ -60,6 +67,26 @@ func (v *RuntimeVisitor) VisitSelect(n *parser.NodeSelect) error {
 	// Because we will, at first, discover the current object
 }
 
+func testAllFieldsInExpr(expr parser.NodeExpr, tableName string) error {
+	var err error
+	if expr != nil {
+		switch expr.(type) {
+		case *parser.NodeAnd, *parser.NodeOr:
+			err = testAllFieldsInExpr(expr.LeftValue(), tableName)
+			if err == nil {
+				return testAllFieldsInExpr(expr.RightValue(), tableName)
+			}
+		case *parser.NodeEqual, *parser.NodeNotEqual, *parser.NodeGreater, *parser.NodeSmaller, *parser.NodeIn:
+			return testAllFieldsInExpr(expr.LeftValue(), tableName)
+		case *parser.NodeId:
+			field := expr.(*parser.NodeId).Value()
+			if !utilities.IsFieldPresentInArray(builder.possibleTables[tableName], field) {
+				return fmt.Errorf("Table '%s' has not field '%s'", tableName, field)
+			}
+		}
+	}
+	return err
+}
 func testAllFieldsFromTable(fields []string, table string) error {
 	for _, f := range fields {
 		err := builder.UseFieldFromTable(f, table)

runtime/visitor_test.go

@@ -0,0 +1,50 @@
+package runtime
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/cloudson/gitql/parser"
+	"github.com/cloudson/gitql/semantical"
+)
+
+func TestTestAllFieldsInExprBranches(t *testing.T) {
+	query := "select * from branches where name = 'something' and somthing > 'name'"
+	err := parseAndVisitQuery(query, "../", t)
+	if err == nil {
+		t.Error("Expected error, received none")
+	}
+}
+
+func TestTestAllFieldsInExprRefs(t *testing.T) {
+	query := "select * from refs where name = 'something' or type = 'asdfasdfsd'"
+	err := parseAndVisitQuery(query, "../", t)
+	if err != nil {
+		t.Errorf("Unexpedted error %s", err)
+	}
+}
+
+func TestTestAllFieldsInExprTags(t *testing.T) {
+	query := "select * from tags where type = 'blah'"
+	err := parseAndVisitQuery(query, "../", t)
+	if err == nil {
+		t.Errorf("Unexpedted error %s", err)
+	}
+}
+
+func parseAndVisitQuery(query, dir string, t *testing.T) error {
+	parser.New(query)
+	ast, errGit := parser.AST()
+	failTestIfError(errGit, t)
+
+	folder, errFile := filepath.Abs(dir)
+	failTestIfError(errFile, t)
+	ast.Path = &folder
+	errGit = semantical.Analysis(ast)
+	failTestIfError(errGit, t)
+
+	builder = GetGitBuilder(ast.Path)
+	visitor := new(RuntimeVisitor)
+	err := visitor.Visit(ast)
+	return err
+}