fixes after upgrade

Signed-off-by: Miguel Molina <[email protected]>
src-d · Apr 12, 2019 · 9cc39b9 · 9cc39b9
1 parent 413f166
commit 9cc39b9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/cmd/gitbase/command/server.go b/cmd/gitbase/command/server.go
@@ -219,7 +219,7 @@ func (c *Server) buildDatabase() error {
 	c.engine.Catalog.SetCurrentDatabase(c.Name)
 	logrus.WithField("db", c.Name).Debug("registered database to catalog")
 
-	c.engine.Catalog.RegisterFunctions(function.Functions)
+	c.engine.Catalog.MustRegister(function.Functions...)
 	logrus.Debug("registered all available functions in catalog")
 
 	if err := c.registerDrivers(); err != nil {

diff --git a/integration_test.go b/integration_test.go
@@ -21,7 +21,6 @@ import (
 	"gopkg.in/src-d/go-mysql-server.v0/auth"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
-	sqlfunction "gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
 )
 
@@ -956,12 +955,9 @@ func setup(t testing.TB) (*sqle.Engine, *gitbase.RepositoryPool, func()) {
 
 func newSquashEngine(pool *gitbase.RepositoryPool) *sqle.Engine {
 	engine := newBaseEngine(pool)
-
-	engine.Catalog.RegisterFunctions(sqlfunction.Defaults)
 	engine.Analyzer = analyzer.NewBuilder(engine.Catalog).
 		AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins).
 		Build()
-
 	return engine
 }
 
@@ -971,6 +967,6 @@ func newBaseEngine(pool *gitbase.RepositoryPool) *sqle.Engine {
 	engine := command.NewDatabaseEngine(au, "test", 0, false)
 
 	engine.AddDatabase(foo)
-	engine.Catalog.RegisterFunctions(function.Functions)
+	engine.Catalog.MustRegister(function.Functions...)
 	return engine
 }
diff --git a/internal/function/registry.go b/internal/function/registry.go
@@ -3,13 +3,13 @@ package function
 import "gopkg.in/src-d/go-mysql-server.v0/sql"
 
 // Functions for gitbase queries.
-var Functions = sql.Functions{
-	"is_tag":        sql.Function1(NewIsTag),
-	"is_remote":     sql.Function1(NewIsRemote),
-	"language":      sql.FunctionN(NewLanguage),
-	"uast":          sql.FunctionN(NewUAST),
-	"uast_mode":     sql.Function3(NewUASTMode),
-	"uast_xpath":    sql.Function2(NewUASTXPath),
-	"uast_extract":  sql.Function2(NewUASTExtract),
-	"uast_children": sql.Function1(NewUASTChildren),
+var Functions = []sql.Function{
+	sql.Function1{Name: "is_tag", Fn: NewIsTag},
+	sql.Function1{Name: "is_remote", Fn: NewIsRemote},
+	sql.FunctionN{Name: "language", Fn: NewLanguage},
+	sql.FunctionN{Name: "uast", Fn: NewUAST},
+	sql.Function3{Name: "uast_mode", Fn: NewUASTMode},
+	sql.Function2{Name: "uast_xpath", Fn: NewUASTXPath},
+	sql.Function2{Name: "uast_extract", Fn: NewUASTExtract},
+	sql.Function1{Name: "uast_children", Fn: NewUASTChildren},
 }