Skip to content

Commit a2cbdbc

Browse files
authored
update to latest vitess' sqlparser and go-git.v4. (#85)
1 parent 2fda359 commit a2cbdbc

File tree

8 files changed

+19
-14
lines changed

8 files changed

+19
-14
lines changed

git/blobs.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/gitql/gitql/sql"
55

66
"gopkg.in/src-d/go-git.v4"
7+
"gopkg.in/src-d/go-git.v4/plumbing/object"
78
)
89

910
type blobsTable struct {
@@ -51,7 +52,7 @@ func (blobsTable) Children() []sql.Node {
5152
}
5253

5354
type blobIter struct {
54-
i *git.BlobIter
55+
i *object.BlobIter
5556
}
5657

5758
func (i *blobIter) Next() (sql.Row, error) {
@@ -63,7 +64,7 @@ func (i *blobIter) Next() (sql.Row, error) {
6364
return blobToRow(blob), nil
6465
}
6566

66-
func blobToRow(c *git.Blob) sql.Row {
67+
func blobToRow(c *object.Blob) sql.Row {
6768
return sql.NewMemoryRow(
6869
c.Hash.String(),
6970
c.Size,

git/commits.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/gitql/gitql/sql"
55

66
"gopkg.in/src-d/go-git.v4"
7+
"gopkg.in/src-d/go-git.v4/plumbing/object"
78
)
89

910
type commitsTable struct {
@@ -57,7 +58,7 @@ func (commitsTable) Children() []sql.Node {
5758
}
5859

5960
type commitIter struct {
60-
i *git.CommitIter
61+
i *object.CommitIter
6162
}
6263

6364
func (i *commitIter) Next() (sql.Row, error) {
@@ -68,7 +69,7 @@ func (i *commitIter) Next() (sql.Row, error) {
6869
return commitToRow(commit), nil
6970
}
7071

71-
func commitToRow(c *git.Commit) sql.Row {
72+
func commitToRow(c *object.Commit) sql.Row {
7273
return sql.NewMemoryRow(
7374
c.Hash.String(),
7475
c.Author.Name,

git/objects.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/gitql/gitql/sql"
55

66
"gopkg.in/src-d/go-git.v4"
7+
"gopkg.in/src-d/go-git.v4/plumbing/object"
78
)
89

910
type objectsTable struct {
@@ -51,7 +52,7 @@ func (objectsTable) Children() []sql.Node {
5152
}
5253

5354
type objectIter struct {
54-
i *git.ObjectIter
55+
i *object.ObjectIter
5556
}
5657

5758
func (i *objectIter) Next() (sql.Row, error) {
@@ -63,7 +64,7 @@ func (i *objectIter) Next() (sql.Row, error) {
6364
return objectToRow(o), nil
6465
}
6566

66-
func objectToRow(o git.Object) sql.Row {
67+
func objectToRow(o object.Object) sql.Row {
6768
return sql.NewMemoryRow(
6869
o.ID().String(),
6970
o.Type().String(),

git/references.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expr
4545
}
4646

4747
func (r referencesTable) RowIter() (sql.RowIter, error) {
48-
rIter, err := r.r.Refs()
48+
rIter, err := r.r.References()
4949
if err != nil {
5050
return nil, err
5151
}

git/references_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
3333

3434
rows, err := sql.NodeToRows(table)
3535
assert.Nil(err)
36-
assert.Len(rows, 5)
36+
assert.Len(rows, 7)
3737

3838
schema := table.Schema()
3939
for idx, row := range rows {

git/tags.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/gitql/gitql/sql"
55

66
"gopkg.in/src-d/go-git.v4"
7+
"gopkg.in/src-d/go-git.v4/plumbing/object"
78
)
89

910
type tagsTable struct {
@@ -56,7 +57,7 @@ func (tagsTable) Children() []sql.Node {
5657
}
5758

5859
type tagIter struct {
59-
i *git.TagIter
60+
i *object.TagIter
6061
}
6162

6263
func (i *tagIter) Next() (sql.Row, error) {
@@ -68,7 +69,7 @@ func (i *tagIter) Next() (sql.Row, error) {
6869
return tagToRow(tag), nil
6970
}
7071

71-
func tagToRow(c *git.Tag) sql.Row {
72+
func tagToRow(c *object.Tag) sql.Row {
7273
return sql.NewMemoryRow(
7374
c.Hash.String(),
7475
c.Name,

git/tree_entries.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/gitql/gitql/sql"
77

88
"gopkg.in/src-d/go-git.v4"
9+
"gopkg.in/src-d/go-git.v4/plumbing/object"
910
)
1011

1112
type treeEntriesTable struct {
@@ -55,8 +56,8 @@ func (treeEntriesTable) Children() []sql.Node {
5556
}
5657

5758
type treeEntryIter struct {
58-
i *git.TreeIter
59-
t *git.Tree
59+
i *object.TreeIter
60+
t *object.Tree
6061
ei int
6162
}
6263

@@ -84,7 +85,7 @@ func (i *treeEntryIter) Next() (sql.Row, error) {
8485
}
8586
}
8687

87-
func treeEntryToRow(t *git.Tree, e git.TreeEntry) sql.Row {
88+
func treeEntryToRow(t *object.Tree, e object.TreeEntry) sql.Row {
8889
return sql.NewMemoryRow(
8990
t.ID().String(),
9091
e.Hash.String(),

sql/parse/parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func tableExprToTable(te sqlparser.TableExpr) (sql.Node, error) {
146146
return nil, errUnsupportedFeature("non simple tables")
147147
}
148148

149-
return plan.NewUnresolvedTable(string(tn.Name)), nil
149+
return plan.NewUnresolvedTable(tn.Name.String()), nil
150150
}
151151
}
152152

0 commit comments

Comments
 (0)