Merge pull request #184 from erizocosmico/feature/print-tree

gitquery: add String methods to all nodes

Author: erizocosmico

blobs.go

@@ -41,6 +41,10 @@ func newBlobsTable(pool *RepositoryPool) sql.Table {
 	return &blobsTable{pool: pool}
 }
 
+func (blobsTable) String() string {
+	return printTable(blobsTableName, blobsSchema)
+}
+
 func (blobsTable) Resolved() bool {
 	return true
 }

commits.go

@@ -31,6 +31,10 @@ func newCommitsTable(pool *RepositoryPool) sql.Table {
 	return &commitsTable{pool: pool}
 }
 
+func (commitsTable) String() string {
+	return printTable(commitsTableName, commitsSchema)
+}
+
 func (commitsTable) Resolved() bool {
 	return true
 }

filters.go

@@ -105,13 +105,13 @@ func fixFieldIndexes(schema sql.Schema, exp sql.Expression) (sql.Expression, err
 // as a selector. For that to happen one of the sides must be a GetField expr
 // that exists in the given schema and the other must be a literal.
 func canHandleEquals(schema sql.Schema, tableName string, eq *expression.Equals) bool {
-	switch left := eq.Left.(type) {
+	switch left := eq.Left().(type) {
 	case *expression.GetField:
-		if _, ok := eq.Right.(*expression.Literal); ok && left.Table() == tableName {
+		if _, ok := eq.Right().(*expression.Literal); ok && left.Table() == tableName {
 			return schema.Contains(left.Name())
 		}
 	case *expression.Literal:
-		if right, ok := eq.Right.(*expression.GetField); ok && right.Table() == tableName {
+		if right, ok := eq.Right().(*expression.GetField); ok && right.Table() == tableName {
 			return schema.Contains(right.Name())
 		}
 	}
@@ -121,9 +121,9 @@ func canHandleEquals(schema sql.Schema, tableName string, eq *expression.Equals)
 // getEqualityValues returns the field and value of the literal in the
 // given equality expression.
 func getEqualityValues(eq *expression.Equals) (string, interface{}, error) {
-	switch left := eq.Left.(type) {
+	switch left := eq.Left().(type) {
 	case *expression.GetField:
-		right, err := eq.Right.Eval(nil, nil)
+		right, err := eq.Right().Eval(nil, nil)
 		if err != nil {
 			return "", nil, err
 		}
@@ -133,7 +133,7 @@ func getEqualityValues(eq *expression.Equals) (string, interface{}, error) {
 		if err != nil {
 			return "", nil, err
 		}
-		return eq.Right.(*expression.GetField).Name(), l, nil
+		return eq.Right().(*expression.GetField).Name(), l, nil
 	}
 	return "", "", nil
 }

internal/function/commit_has_blob.go

@@ -1,6 +1,7 @@
 package function
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/src-d/gitquery"
@@ -134,11 +135,6 @@ func hashInTree(hash plumbing.Hash, tree *object.Tree) (bool, error) {
 	return contained, nil
 }
 
-// Name implements the Expression interface.
-func (CommitHasBlob) Name() string {
-	return "commit_has_blob"
-}
-
 // IsNullable implements the Expression interface.
 func (f CommitHasBlob) IsNullable() bool {
 	return f.commitHash.IsNullable() || f.blob.IsNullable()
@@ -163,3 +159,7 @@ func (f CommitHasBlob) TransformUp(fn func(sql.Expression) (sql.Expression, erro
 
 	return fn(NewCommitHasBlob(commitHash, blob))
 }
+
+func (f CommitHasBlob) String() string {
+	return fmt.Sprintf("commit_has_blob(%s, %s)", f.commitHash, f.blob)
+}

internal/function/commit_has_tree.go

@@ -1,6 +1,7 @@
 package function
 
 import (
+	"fmt"
 	"io"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
@@ -27,8 +28,9 @@ func NewCommitHasTree(commit, tree sql.Expression) sql.Expression {
 	}}
 }
 
-// Name implements the Expression interface.
-func (CommitHasTree) Name() string { return "commit_has_tree" }
+func (f CommitHasTree) String() string {
+	return fmt.Sprintf("commit_has_tree(%s, %s)", f.Left, f.Right)
+}
 
 // Type implements the Expression interface.
 func (CommitHasTree) Type() sql.Type { return sql.Boolean }

internal/function/history_idx.go

@@ -1,6 +1,7 @@
 package function
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/src-d/gitquery"
@@ -21,8 +22,9 @@ func NewHistoryIdx(start, target sql.Expression) sql.Expression {
 	return &HistoryIdx{expression.BinaryExpression{Left: start, Right: target}}
 }
 
-// Name implements the Expression interface.
-func (HistoryIdx) Name() string { return "history_idx" }
+func (f HistoryIdx) String() string {
+	return fmt.Sprintf("history_idx(%s, %s)", f.Left, f.Right)
+}
 
 // Eval implements the Expression interface.
 func (f *HistoryIdx) Eval(session sql.Session, row sql.Row) (interface{}, error) {

internal/function/is_remote.go

@@ -1,6 +1,7 @@
 package function
 
 import (
+	"fmt"
 	"reflect"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -37,9 +38,8 @@ func (f *IsRemote) Eval(session sql.Session, row sql.Row) (interface{}, error) {
 	return plumbing.ReferenceName(name).IsRemote(), nil
 }
 
-// Name implements the Expression interface.
-func (IsRemote) Name() string {
-	return "is_remote"
+func (f IsRemote) String() string {
+	return fmt.Sprintf("is_remote(%s)", f.Child)
 }
 
 // TransformUp implements the Expression interface.

internal/function/is_tag.go

@@ -1,6 +1,7 @@
 package function
 
 import (
+	"fmt"
 	"reflect"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -37,9 +38,8 @@ func (f *IsTag) Eval(session sql.Session, row sql.Row) (interface{}, error) {
 	return plumbing.ReferenceName(name).IsTag(), nil
 }
 
-// Name implements the Expression interface.
-func (IsTag) Name() string {
-	return "is_tag"
+func (f IsTag) String() string {
+	return fmt.Sprintf("is_tag(%s)", f.Child)
 }
 
 // TransformUp implements the Expression interface.

references.go

@@ -25,6 +25,10 @@ func newReferencesTable(pool *RepositoryPool) sql.Table {
 	return &referencesTable{pool: pool}
 }
 
+func (r referencesTable) String() string {
+	return printTable(referencesTableName, refsSchema)
+}
+
 func (referencesTable) Resolved() bool {
 	return true
 }

remotes.go

@@ -39,6 +39,10 @@ func (remotesTable) Schema() sql.Schema {
 	return remotesSchema
 }
 
+func (r remotesTable) String() string {
+	return printTable(remotesTableName, remotesSchema)
+}
+
 func (r *remotesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }