Use gopkg.in/src-d/go-mysql-server.v0

jfontan · jfontan · commit 1e29f562f04e · 2018-02-16T11:21:42.000+01:00
Signed-off-by: Javi Fontan &lt;jfontan@gmail.com&gt;
diff --git a/blobs.go b/blobs.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -25,8 +25,8 @@ func (blobsTable) Name() string {
 
 func (blobsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.String, Nullable: false},
-		{Name: "size", Type: sql.BigInteger, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false},
+		{Name: "size", Type: sql.Int64, Nullable: false},
 	}
 }
 
diff --git a/blobs_test.go b/blobs_test.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"github.com/stretchr/testify/assert"
diff --git a/cmd/gitquery/query_base.go b/cmd/gitquery/query_base.go
@@ -5,24 +5,29 @@ import (
 	"os"
 	"path/filepath"
 
-	"gopkg.in/sqle/gitquery.v0"
-	"gopkg.in/sqle/gitquery.v0/internal/format"
-	"gopkg.in/sqle/sqle.v0"
+	"github.com/src-d/gitquery"
+	"github.com/src-d/gitquery/internal/format"
 
 	gogit "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
+	sqle "gopkg.in/src-d/go-mysql-server.v0"
 )
 
 type cmdQueryBase struct {
 	cmd
 
 	Path string `short:"p" long:"path" description:"Path where the git repository is located"`
 
-	db   *sql.DB
-	name string
+	engine *sqle.Engine
+	db     *sql.DB
+	name   string
 }
 
 func (c *cmdQueryBase) buildDatabase() error {
+	if c.engine == nil {
+		c.engine = sqle.New()
+	}
+
 	c.print("opening %q repository...\n", c.Path)
 
 	var err error
@@ -32,8 +37,8 @@ func (c *cmdQueryBase) buildDatabase() error {
 	}
 
 	c.name = filepath.Base(filepath.Join(c.Path, ".."))
-	sqle.DefaultEngine.AddDatabase(gitquery.NewDatabase(c.name, r))
-	c.db, err = sql.Open(sqle.DriverName, "")
+	c.engine.AddDatabase(gitquery.NewDatabase(c.name, r))
+	c.db, err = sql.Open("sqle", "")
 	return err
 }
 
diff --git a/commits.go b/commits.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -25,14 +25,14 @@ func (commitsTable) Name() string {
 
 func (commitsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.String, Nullable: false},
-		{Name: "author_name", Type: sql.String, Nullable: false},
-		{Name: "author_email", Type: sql.String, Nullable: false},
-		{Name: "author_when", Type: sql.TimestampWithTimezone, Nullable: false},
-		{Name: "comitter_name", Type: sql.String, Nullable: false},
-		{Name: "comitter_email", Type: sql.String, Nullable: false},
-		{Name: "comitter_when", Type: sql.TimestampWithTimezone, Nullable: false},
-		{Name: "message", Type: sql.String, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false},
+		{Name: "author_name", Type: sql.Text, Nullable: false},
+		{Name: "author_email", Type: sql.Text, Nullable: false},
+		{Name: "author_when", Type: sql.Timestamp, Nullable: false},
+		{Name: "comitter_name", Type: sql.Text, Nullable: false},
+		{Name: "comitter_email", Type: sql.Text, Nullable: false},
+		{Name: "comitter_when", Type: sql.Timestamp, Nullable: false},
+		{Name: "message", Type: sql.Text, Nullable: false},
 	}
 }
 
diff --git a/commits_test.go b/commits_test.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git-fixtures.v3"
diff --git a/database.go b/database.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 )
diff --git a/database_test.go b/database_test.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-billy.v4/memfs"
diff --git a/objects.go b/objects.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -25,8 +25,8 @@ func (objectsTable) Name() string {
 
 func (objectsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "id", Type: sql.String, Nullable: false},
-		{Name: "type", Type: sql.String, Nullable: false},
+		{Name: "id", Type: sql.Text, Nullable: false},
+		{Name: "type", Type: sql.Text, Nullable: false},
 	}
 }
 
diff --git a/objects_test.go b/objects_test.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git-fixtures.v3"
diff --git a/references.go b/references.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -26,10 +26,10 @@ func (referencesTable) Name() string {
 
 func (referencesTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "name", Type: sql.String, Nullable: false},
-		{Name: "type", Type: sql.String, Nullable: false},
-		{Name: "hash", Type: sql.String, Nullable: true},
-		{Name: "target", Type: sql.String, Nullable: true},
+		{Name: "name", Type: sql.Text, Nullable: false},
+		{Name: "type", Type: sql.Text, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: true},
+		{Name: "target", Type: sql.Text, Nullable: true},
 		{Name: "is_branch", Type: sql.Boolean, Nullable: false},
 		{Name: "is_note", Type: sql.Boolean, Nullable: false},
 		{Name: "is_remote", Type: sql.Boolean, Nullable: false},
diff --git a/references_test.go b/references_test.go
@@ -3,9 +3,9 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
-	"gopkg.in/sqle/sqle.v0/sql/expression"
-	"gopkg.in/sqle/sqle.v0/sql/plan"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git-fixtures.v3"
@@ -34,7 +34,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	table := getTable(assert, f, referencesTableName)
 
 	rows, err := sql.NodeToRows(plan.NewSort(
-		[]plan.SortField{{Column: expression.NewGetField(0, sql.String, "name", false), Order: plan.Ascending}},
+		[]plan.SortField{{Column: expression.NewGetField(0, sql.Text, "name", false), Order: plan.Ascending}},
 		table))
 	assert.Nil(err)
 
diff --git a/tags.go b/tags.go
@@ -1,7 +1,7 @@
 package gitquery
 
 import (
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -25,13 +25,13 @@ func (tagsTable) Name() string {
 
 func (tagsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.String, Nullable: false},
-		{Name: "name", Type: sql.String, Nullable: false},
-		{Name: "tagger_email", Type: sql.String, Nullable: false},
-		{Name: "tagger_name", Type: sql.String, Nullable: false},
-		{Name: "tagger_when", Type: sql.TimestampWithTimezone, Nullable: false},
-		{Name: "message", Type: sql.String, Nullable: false},
-		{Name: "target", Type: sql.String, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false},
+		{Name: "name", Type: sql.Text, Nullable: false},
+		{Name: "tagger_email", Type: sql.Text, Nullable: false},
+		{Name: "tagger_name", Type: sql.Text, Nullable: false},
+		{Name: "tagger_when", Type: sql.Timestamp, Nullable: false},
+		{Name: "message", Type: sql.Text, Nullable: false},
+		{Name: "target", Type: sql.Text, Nullable: false},
 	}
 }
 
diff --git a/tags_test.go b/tags_test.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"github.com/stretchr/testify/assert"
diff --git a/tree_entries.go b/tree_entries.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"strconv"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -27,10 +27,10 @@ func (treeEntriesTable) Name() string {
 
 func (treeEntriesTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "tree_hash", Type: sql.String, Nullable: false},
-		{Name: "entry_hash", Type: sql.String, Nullable: false},
-		{Name: "mode", Type: sql.String, Nullable: false},
-		{Name: "name", Type: sql.String, Nullable: false},
+		{Name: "tree_hash", Type: sql.Text, Nullable: false},
+		{Name: "entry_hash", Type: sql.Text, Nullable: false},
+		{Name: "mode", Type: sql.Text, Nullable: false},
+		{Name: "name", Type: sql.Text, Nullable: false},
 	}
 }
 
diff --git a/tree_entries_test.go b/tree_entries_test.go
@@ -3,7 +3,7 @@ package gitquery
 import (
 	"testing"
 
-	"gopkg.in/sqle/sqle.v0/sql"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"github.com/stretchr/testify/assert"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package gitquery`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "gopkg.in/sqle/sqle.v0/sql"`
	`4`	`+ "gopkg.in/src-d/go-mysql-server.v0/sql"`
`5`	`5`
`6`	`6`	`"gopkg.in/src-d/go-git.v4"`
`7`	`7`	`)`