git: change NewDatabase, now accepts a git.Repository, tests now using a fixture (#24)

Author: mcuadros

git/commits.go

@@ -4,6 +4,7 @@ import (
 	"io"
 
 	"github.com/mvader/gitql/sql"
+
 	"gopkg.in/src-d/go-git.v4"
 )
 

git/commits_test.go

@@ -4,25 +4,35 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/mvader/gitql/sql"
+	"gopkg.in/src-d/go-git.v4"
+	"gopkg.in/src-d/go-git.v4/fixtures"
 )
 
 func TestCommitsRelation(t *testing.T) {
 	assert := assert.New(t)
-	var db sql.Database = NewDatabase("https://github.com/smola/galimatias.git")
+
+	f := fixtures.Basic().One()
+	r, err := git.NewFilesystemRepository(f.DotGit().Base())
+	assert.Nil(err)
+
+	db := NewDatabase("foo", r)
 	assert.NotNil(db)
+
 	relations := db.Relations()
 	rel, ok := relations[commitsRelationName]
 	assert.True(ok)
 	assert.NotNil(rel)
 	assert.Equal(commitsRelationName, rel.Name())
 	assert.Equal(0, len(rel.Children()))
+
 	iter, err := rel.RowIter()
 	assert.Nil(err)
 	assert.NotNil(iter)
+
 	row, err := iter.Next()
 	assert.Nil(err)
 	assert.NotNil(row)
+
 	fields := row.Fields()
 	assert.NotNil(fields)
 	assert.IsType("", fields[1])

git/database.go

@@ -1,32 +1,29 @@
 package git
 
 import (
-	"gopkg.in/src-d/go-git.v4"
 	"github.com/mvader/gitql/sql"
+
+	"gopkg.in/src-d/go-git.v4"
 )
 
 const (
 	commitsRelationName = "commits"
 )
 
 type Database struct {
-	url string
-	cr sql.PhysicalRelation
+	name string
+	cr   sql.PhysicalRelation
 }
 
-func NewDatabase(url string) sql.Database {
-	r := git.NewMemoryRepository()
-	r.Clone(&git.CloneOptions{
-		URL: url,
-	})
+func NewDatabase(name string, r *git.Repository) sql.Database {
 	return &Database{
-		url: url,
-		cr: newCommitsRelation(r),
+		name: name,
+		cr:   newCommitsRelation(r),
 	}
 }
 
 func (d Database) Name() string {
-	return d.url
+	return d.name
 }
 
 func (d Database) Relations() map[string]sql.PhysicalRelation {

git/database_test.go

@@ -4,14 +4,37 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/mvader/gitql/sql"
+	"gopkg.in/src-d/go-git.v4"
+	"gopkg.in/src-d/go-git.v4/fixtures"
 )
 
-func TestDatabase(t *testing.T) {
+func init() {
+	fixtures.RootFolder = "../../../../gopkg.in/src-d/go-git.v4/fixtures/"
+}
+
+func TestDatabaseRelations(t *testing.T) {
 	assert := assert.New(t)
-	var db sql.Database = NewDatabase("https://github.com/smola/galimatias.git")
+
+	f := fixtures.Basic().One()
+	r, err := git.NewFilesystemRepository(f.DotGit().Base())
+	assert.Nil(err)
+
+	db := NewDatabase("foo", r)
 	assert.NotNil(db)
+
 	relations := db.Relations()
 	_, ok := relations[commitsRelationName]
 	assert.True(ok)
 }
+
+func TestDatabaseName(t *testing.T) {
+	assert := assert.New(t)
+
+	f := fixtures.Basic().One()
+	r, err := git.NewFilesystemRepository(f.DotGit().Base())
+	assert.Nil(err)
+
+	db := NewDatabase("foo", r)
+	assert.NotNil(db)
+	assert.Equal(db.Name(), "foo")
+}