internal/function: make UAST be able to use language results

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

integration_test.go

@@ -178,7 +178,7 @@ func TestUastQueries(t *testing.T) {
 	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 	_, iter, err := engine.Query(ctx, `
-		SELECT uast_xpath(uast(content, 'php'), '//*[@roleIdentifier]') as uast, name 
+		SELECT uast_xpath(uast(content, language(name, content)), '//*[@roleIdentifier]') as uast, name 
 		FROM tree_entries te
 		INNER JOIN blobs b
 		ON b.hash = te.entry_hash

internal/function/uast.go

@@ -155,7 +155,7 @@ func (f UAST) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			return nil, err
 		}
 
-		lang = lng.(string)
+		lang = strings.ToLower(lng.(string))
 	}
 
 	var xpath string

internal/function/uast_test.go

@@ -58,8 +58,8 @@ func TestUAST(t *testing.T) {
 		{"lang is nil", fn3, sql.NewRow([]byte{}, nil, nil), nil, nil},
 		{"xpath is nil", fn3, sql.NewRow([]byte{}, "Ruby", nil), nil, nil},
 		{"only blob, can't infer language", fn1, sql.NewRow([]byte(testCode)), nil, ErrParseBlob},
-		{"blob with lang", fn2, sql.NewRow([]byte(testCode), "python"), uast, nil},
-		{"blob with lang and xpath", fn3, sql.NewRow([]byte(testCode), "python", testXPath), filteredNodes, nil},
+		{"blob with lang", fn2, sql.NewRow([]byte(testCode), "Python"), uast, nil},
+		{"blob with lang and xpath", fn3, sql.NewRow([]byte(testCode), "Python", testXPath), filteredNodes, nil},
 	}
 
 	for _, tt := range testCases {