*: upgrade code after go-mysql-server breaking changes

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

Author: erizocosmico

blobs.go

@@ -57,11 +57,11 @@ func (blobsTable) Schema() sql.Schema {
 	return blobsSchema
 }
 
-func (r *blobsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
+func (r *blobsTable) TransformUp(f sql.TransformNodeFunc) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+func (r *blobsTable) TransformExpressionsUp(f sql.TransformExprFunc) (sql.Node, error) {
 	return r, nil
 }
 

cmd/gitquery/server.go

@@ -43,7 +43,7 @@ func (c *CmdServer) buildDatabase() error {
 	}
 
 	c.engine.AddDatabase(gitquery.NewDatabase(c.name, c.pool))
-	function.Register(c.engine.Catalog)
+	c.engine.Catalog.RegisterFunctions(function.Functions)
 	return nil
 }
 

commits.go

@@ -47,11 +47,11 @@ func (commitsTable) Schema() sql.Schema {
 	return commitsSchema
 }
 
-func (r *commitsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
+func (r *commitsTable) TransformUp(f sql.TransformNodeFunc) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+func (r *commitsTable) TransformExpressionsUp(f sql.TransformExprFunc) (sql.Node, error) {
 	return r, nil
 }
 

integration_test.go

@@ -26,7 +26,7 @@ func TestIntegration(t *testing.T) {
 	require.NoError(t, err)
 
 	engine.AddDatabase(gitquery.NewDatabase("foo", &pool))
-	function.Register(engine.Catalog)
+	engine.Catalog.RegisterFunctions(function.Functions)
 
 	testCases := []struct {
 		query  string

internal/function/commit_has_blob.go

@@ -146,7 +146,7 @@ func (f CommitHasBlob) Resolved() bool {
 }
 
 // TransformUp implements the Expression interface.
-func (f CommitHasBlob) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+func (f CommitHasBlob) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
 	commitHash, err := f.commitHash.TransformUp(fn)
 	if err != nil {
 		return nil, err

internal/function/commit_has_tree.go

@@ -158,7 +158,7 @@ func treeInEntries(
 }
 
 // TransformUp implements the Expression interface.
-func (f *CommitHasTree) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+func (f *CommitHasTree) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
 	left, err := f.Left.TransformUp(fn)
 	if err != nil {
 		return nil, err

internal/function/history_idx.go

@@ -179,7 +179,7 @@ func (f *HistoryIdx) repoHistoryIdx(repo *git.Repository, start, target plumbing
 func (HistoryIdx) Type() sql.Type { return sql.Int64 }
 
 // TransformUp implements the Expression interface.
-func (f *HistoryIdx) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+func (f *HistoryIdx) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
 	left, err := f.Left.TransformUp(fn)
 	if err != nil {
 		return nil, err

internal/function/is_remote.go

@@ -43,7 +43,7 @@ func (f IsRemote) String() string {
 }
 
 // TransformUp implements the Expression interface.
-func (f IsRemote) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+func (f IsRemote) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
 	child, err := f.Child.TransformUp(fn)
 	if err != nil {
 		return nil, err

internal/function/is_tag.go

@@ -43,7 +43,7 @@ func (f IsTag) String() string {
 }
 
 // TransformUp implements the Expression interface.
-func (f IsTag) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+func (f IsTag) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
 	child, err := f.Child.TransformUp(fn)
 	if err != nil {
 		return nil, err

internal/function/registry.go

@@ -2,17 +2,10 @@ package function
 
 import "gopkg.in/src-d/go-mysql-server.v0/sql"
 
-var functions = map[string]sql.Function{
+var Functions = sql.Functions{
 	"is_tag":          sql.Function1(NewIsTag),
 	"is_remote":       sql.Function1(NewIsRemote),
 	"commit_has_blob": sql.Function2(NewCommitHasBlob),
 	"history_idx":     sql.Function2(NewHistoryIdx),
 	"commit_has_tree": sql.Function2(NewCommitHasTree),
 }
-
-// Register all the gitquery functions in the SQL catalog.
-func Register(c *sql.Catalog) {
-	for k, v := range functions {
-		c.RegisterFunction(k, v)
-	}
-}