Merge pull request #19 from jfontan/add-remotes-table

Add remotes table

Author: ajnavarro

database.go

@@ -13,6 +13,7 @@ const (
 	treeEntriesTableName  = "tree_entries"
 	objectsTableName      = "objects"
 	repositoriesTableName = "repositories"
+	remotesTableName      = "remotes"
 )
 
 type Database struct {
@@ -24,6 +25,7 @@ type Database struct {
 	br   sql.Table
 	or   sql.Table
 	rer  sql.Table
+	rmr  sql.Table
 }
 
 func NewDatabase(name string, pool *RepositoryPool) sql.Database {
@@ -36,6 +38,7 @@ func NewDatabase(name string, pool *RepositoryPool) sql.Database {
 		ter:  newTreeEntriesTable(pool),
 		or:   newObjectsTable(pool),
 		rer:  newRepositoriesTable(pool),
+		rmr:  newRemotesTable(pool),
 	}
 }
 
@@ -52,5 +55,6 @@ func (d *Database) Tables() map[string]sql.Table {
 		treeEntriesTableName:  d.ter,
 		objectsTableName:      d.or,
 		repositoriesTableName: d.rer,
+		remotesTableName:      d.rmr,
 	}
 }

database_test.go

@@ -42,6 +42,7 @@ func TestDatabase_Tables(t *testing.T) {
 		blobsTableName,
 		objectsTableName,
 		repositoriesTableName,
+		remotesTableName,
 	}
 	sort.Strings(expected)
 

remotes.go

@@ -0,0 +1,119 @@
+package gitquery
+
+import (
+	"io"
+
+	git "gopkg.in/src-d/go-git.v4"
+	gitconfig "gopkg.in/src-d/go-git.v4/config"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
+)
+
+type remotesTable struct {
+	pool *RepositoryPool
+}
+
+func newRemotesTable(pool *RepositoryPool) sql.Table {
+	return &remotesTable{pool: pool}
+}
+
+func (remotesTable) Resolved() bool {
+	return true
+}
+
+func (remotesTable) Name() string {
+	return remotesTableName
+}
+
+func (remotesTable) Schema() sql.Schema {
+	return sql.Schema{
+		{Name: "repository_id", Type: sql.Text, Nullable: false},
+		{Name: "name", Type: sql.Text, Nullable: false},
+		{Name: "push_url", Type: sql.Text, Nullable: false},
+		{Name: "fetch_url", Type: sql.Text, Nullable: false},
+		{Name: "push_refspec", Type: sql.Text, Nullable: false},
+		{Name: "fetch_refspec", Type: sql.Text, Nullable: false},
+	}
+}
+
+func (r *remotesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+	return f(r)
+}
+
+func (r *remotesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
+	return r
+}
+
+func (r remotesTable) RowIter() (sql.RowIter, error) {
+	iter := &remotesIter{}
+
+	rowRepoIter, err := NewRowRepoIter(r.pool, iter)
+	if err != nil {
+		return nil, err
+	}
+
+	return rowRepoIter, nil
+}
+
+func (remotesTable) Children() []sql.Node {
+	return []sql.Node{}
+}
+
+type remotesIter struct {
+	repository_id string
+	remotes       []*git.Remote
+	conf          *gitconfig.RemoteConfig
+	remotePos     int
+	urlPos        int
+}
+
+func (i *remotesIter) NewIterator(
+	repo *Repository) (RowRepoIter, error) {
+
+	remotes, err := repo.Repo.Remotes()
+	if err != nil {
+		return nil, err
+	}
+
+	return &remotesIter{
+		repository_id: repo.ID,
+		remotes:       remotes,
+		remotePos:     0,
+		urlPos:        0}, nil
+}
+
+func (i *remotesIter) Next() (sql.Row, error) {
+	if i.remotePos >= len(i.remotes) {
+		return nil, io.EOF
+	}
+
+	remote := i.remotes[i.remotePos]
+	config := remote.Config()
+
+	if i.urlPos >= len(config.URLs) {
+		i.remotePos++
+		if i.remotePos >= len(i.remotes) {
+			return nil, io.EOF
+		}
+
+		remote = i.remotes[i.remotePos]
+		config = remote.Config()
+		i.urlPos = 0
+	}
+
+	row := sql.NewRow(
+		i.repository_id,
+		config.Name,
+		config.URLs[i.urlPos],
+		config.URLs[i.urlPos],
+		config.Fetch[i.urlPos],
+		config.Fetch[i.urlPos],
+	)
+
+	i.urlPos++
+
+	return row, nil
+}
+
+func (i *remotesIter) Close() error {
+	return nil
+}

remotes_test.go

@@ -0,0 +1,85 @@
+package gitquery
+
+import (
+	"fmt"
+	"testing"
+
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
+
+	"github.com/stretchr/testify/require"
+	"gopkg.in/src-d/go-git-fixtures.v3"
+	gitconfig "gopkg.in/src-d/go-git.v4/config"
+)
+
+func TestRemotesTable_Name(t *testing.T) {
+	require := require.New(t)
+
+	f := fixtures.Basic().One()
+	table := getTable(require, f, remotesTableName)
+	require.Equal(remotesTableName, table.Name())
+}
+
+func TestRemotesTable_Children(t *testing.T) {
+	require := require.New(t)
+
+	f := fixtures.Basic().One()
+	table := getTable(require, f, remotesTableName)
+	require.Equal(0, len(table.Children()))
+}
+
+func TestRemotesTable_RowIter(t *testing.T) {
+	require := require.New(t)
+
+	f := fixtures.Basic().One()
+	table := getTable(require, f, remotesTableName)
+
+	remotes, ok := table.(*remotesTable)
+	require.True(ok)
+
+	pool := remotes.pool
+	repository, ok := pool.GetPos(0)
+	require.True(ok)
+
+	repo := repository.Repo
+
+	config := gitconfig.RemoteConfig{
+		Name: "my_remote",
+		URLs: []string{"url1", "url2"},
+		Fetch: []gitconfig.RefSpec{
+			"refs/heads/*:refs/remotes/fetch1/*",
+			"refs/heads/*:refs/remotes/fetch2/*",
+		},
+	}
+
+	_, err := repo.CreateRemote(&config)
+	require.Nil(err)
+
+	rows, err := sql.NodeToRows(table)
+	require.Nil(err)
+	require.Len(rows, 3)
+
+	schema := table.Schema()
+	for idx, row := range rows {
+		err := schema.CheckRow(row)
+		require.Nil(err, "row %d doesn't conform to schema", idx)
+
+		if row[1] == "my_remote" {
+			urlstring, ok := row[2].(string)
+			require.True(ok)
+
+			num := urlstring[len(urlstring)-1:]
+
+			require.Equal(repository.ID, row[0])
+
+			url := fmt.Sprintf("url%v", num)
+			require.Equal(url, row[2]) // push
+			require.Equal(url, row[3]) // fetch
+
+			ref := fmt.Sprintf("refs/heads/*:refs/remotes/fetch%v/*", num)
+			require.Equal(gitconfig.RefSpec(ref), row[4]) // push
+			require.Equal(gitconfig.RefSpec(ref), row[5]) // fetch
+		} else {
+			require.Equal("origin", row[1])
+		}
+	}
+}