Allow to use 'in' statement with 'order by'

Claudson Oliveira · Claudson Oliveira · commit aab37bdd66d0 · 2016-12-29T03:55:52.000-02:00
When we used query like `select * from commits where 'cloudson' in hash order by date asc` gitql has failed. This closes #20 .
diff --git a/runtime/commits.go b/runtime/commits.go
@@ -55,10 +55,8 @@ func walkCommits(n *parser.NodeProgram, visitor *RuntimeVisitor) (*TableData, er
 	if err != nil {
 		return nil, err
 	}
-	if usingOrder {
-		if counter > s.Limit {
-			counter = s.Limit
-		}
+	if usingOrder && counter > s.Limit {
+		counter = s.Limit
 		rowsSliced = rowsSliced[0:counter]
 	}
 	tableData := new(TableData)
diff --git a/runtime/reference.go b/runtime/reference.go
@@ -52,10 +52,8 @@ func walkReferences(n *parser.NodeProgram, visitor *RuntimeVisitor) (*TableData,
 	if err != nil {
 		return nil, err
 	}
-	if usingOrder {
-		if counter > s.Limit {
-			counter = s.Limit
-		}
+	if usingOrder && counter > s.Limit {
+		counter = s.Limit
 		rowsSliced = rowsSliced[0:counter]
 	}
 	tableData := new(TableData)
diff --git a/runtime/remotes.go b/runtime/remotes.go
@@ -54,10 +54,8 @@ func walkRemotes(n *parser.NodeProgram, visitor *RuntimeVisitor) (*TableData, er
 	if err != nil {
 		return nil, err
 	}
-	if usingOrder {
-		if counter > s.Limit {
-			counter = s.Limit
-		}
+	if usingOrder && counter > s.Limit {
+		counter = s.Limit
 		rowsSliced = rowsSliced[0:counter]
 	}
 	tableData := new(TableData)
diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go
@@ -104,3 +104,29 @@ func TestCanConvertToTypeFormats(t *testing.T) {
 	typeFormat := "json"
 	Run(ast, &typeFormat)
 }
+
+func TestNotFoundCommitWithInStatementAndSorting(t *testing.T) {
+	folder, errFile := filepath.Abs("../")
+
+	if errFile != nil {
+		t.Errorf(errFile.Error())
+	}
+
+	query := "select author from commits where 'thisisnotfound' in hash order by date desc"
+
+	parser.New(query)
+	ast, errGit := parser.AST()
+	if errGit != nil {
+		t.Errorf(errGit.Error())
+	}
+	ast.Path = &folder
+	errGit = semantical.Analysis(ast)
+	if errGit != nil {
+		t.Errorf(errGit.Error())
+	}
+
+	typeFormat := "table"
+	if errGit = Run(ast, &typeFormat); errGit != nil {
+		t.Errorf(errGit.Error())
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,8 @@ func walkCommits(n parser.NodeProgram, visitor RuntimeVisitor) (*TableData, er`
`55`	`55`	`if err != nil {`
`56`	`56`	`return nil, err`
`57`	`57`	`}`
`58`		`- if usingOrder {`
`59`		`- if counter > s.Limit {`
`60`		`- counter = s.Limit`
`61`		`- }`
	`58`	`+ if usingOrder && counter > s.Limit {`
	`59`	`+ counter = s.Limit`
`62`	`60`	`rowsSliced = rowsSliced[0:counter]`
`63`	`61`	`}`
`64`	`62`	`tableData := new(TableData)`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,8 @@ func walkReferences(n parser.NodeProgram, visitor RuntimeVisitor) (*TableData,`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, err`
`54`	`54`	`}`
`55`		`- if usingOrder {`
`56`		`- if counter > s.Limit {`
`57`		`- counter = s.Limit`
`58`		`- }`
	`55`	`+ if usingOrder && counter > s.Limit {`
	`56`	`+ counter = s.Limit`
`59`	`57`	`rowsSliced = rowsSliced[0:counter]`
`60`	`58`	`}`
`61`	`59`	`tableData := new(TableData)`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,8 @@ func walkRemotes(n parser.NodeProgram, visitor RuntimeVisitor) (*TableData, er`
`54`	`54`	`if err != nil {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
`57`		`- if usingOrder {`
`58`		`- if counter > s.Limit {`
`59`		`- counter = s.Limit`
`60`		`- }`
	`57`	`+ if usingOrder && counter > s.Limit {`
	`58`	`+ counter = s.Limit`
`61`	`59`	`rowsSliced = rowsSliced[0:counter]`
`62`	`60`	`}`
`63`	`61`	`tableData := new(TableData)`