Merge pull request #139 from jfontan/modify-refs-table

Modify references table to match the document

Author: jfontan

references.go

@@ -25,14 +25,9 @@ func (referencesTable) Name() string {
 
 func (referencesTable) Schema() sql.Schema {
 	return sql.Schema{
+		{Name: "repository_id", Type: sql.Text, Nullable: false},
 		{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},
-		{Name: "is_tag", Type: sql.Boolean, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false},
 	}
 }
 
@@ -60,7 +55,8 @@ func (referencesTable) Children() []sql.Node {
 }
 
 type referenceIter struct {
-	iter storer.ReferenceIter
+	repositoryID string
+	iter         storer.ReferenceIter
 }
 
 func (i *referenceIter) NewIterator(repo *Repository) (RowRepoIter, error) {
@@ -69,16 +65,30 @@ func (i *referenceIter) NewIterator(repo *Repository) (RowRepoIter, error) {
 		return nil, err
 	}
 
-	return &referenceIter{iter: iter}, nil
+	return &referenceIter{
+		repositoryID: repo.ID,
+		iter:         iter,
+	}, nil
 }
 
 func (i *referenceIter) Next() (sql.Row, error) {
-	o, err := i.iter.Next()
-	if err != nil {
-		return nil, err
+	var (
+		o   *plumbing.Reference
+		err error
+	)
+
+	for {
+		o, err = i.iter.Next()
+		if err != nil {
+			return nil, err
+		}
+
+		if o.Type() == plumbing.HashReference {
+			break
+		}
 	}
 
-	return referenceToRow(o), nil
+	return referenceToRow(i.repositoryID, o), nil
 }
 
 func (i *referenceIter) Close() error {
@@ -89,29 +99,12 @@ func (i *referenceIter) Close() error {
 	return nil
 }
 
-func referenceToRow(c *plumbing.Reference) sql.Row {
-	var (
-		target, hash interface{}
-		refType      string
-	)
-	switch c.Type() {
-	case plumbing.SymbolicReference:
-		target = c.Target().String()
-		refType = "symbolic-reference"
-	case plumbing.HashReference:
-		hash = c.Hash().String()
-		refType = "hash-reference"
-	case plumbing.InvalidReference:
-		refType = "invalid-reference"
-	}
+func referenceToRow(repositoryID string, c *plumbing.Reference) sql.Row {
+	hash := c.Hash().String()
+
 	return sql.NewRow(
+		repositoryID,
 		c.Name().String(),
-		refType,
 		hash,
-		target,
-		c.Name().IsBranch(),
-		c.Name().IsNote(),
-		c.Name().IsRemote(),
-		c.Name().IsTag(),
 	)
 }

references_test.go

@@ -39,15 +39,13 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	require.Nil(err)
 
 	expected := []sql.Row{
-		sql.NewRow("HEAD", "symbolic-reference", nil, "refs/heads/master", false, false, false, false),
-		sql.NewRow("refs/heads/branch", "hash-reference", "e8d3ffab552895c19b9fcf7aa264d277cde33881", nil, true, false, false, false),
-		sql.NewRow("refs/heads/master", "hash-reference", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", nil, true, false, false, false),
-		sql.NewRow("refs/remotes/origin/HEAD", "symbolic-reference", nil, "refs/remotes/origin/master", false, false, true, false),
-		sql.NewRow("refs/remotes/origin/branch", "hash-reference", "e8d3ffab552895c19b9fcf7aa264d277cde33881", nil, false, false, true, false),
-		sql.NewRow("refs/remotes/origin/master", "hash-reference", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", nil, false, false, true, false),
-		sql.NewRow("refs/tags/v1.0.0", "hash-reference", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", nil, false, false, false, true),
+		sql.NewRow("repo", "refs/heads/branch", "e8d3ffab552895c19b9fcf7aa264d277cde33881"),
+		sql.NewRow("repo", "refs/heads/master", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
+		sql.NewRow("repo", "refs/remotes/origin/branch", "e8d3ffab552895c19b9fcf7aa264d277cde33881"),
+		sql.NewRow("repo", "refs/remotes/origin/master", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
+		sql.NewRow("repo", "refs/tags/v1.0.0", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
 	}
-	require.Equal(expected, rows)
+	require.ElementsMatch(expected, rows)
 
 	schema := table.Schema()
 	for idx, row := range rows {