Merge pull request #167 from erizocosmico/fix/refs-head

 gitquery: return HEAD reference on refs table

Author: erizocosmico

integration_test.go

@@ -38,7 +38,7 @@ func TestIntegration(t *testing.T) {
 				ON history_idx(r.hash, c.hash) >= 0
 			INNER JOIN blobs b
 				ON commit_contains(c.hash, b.hash)
-			WHERE r.name = 'refs/heads/master'
+			WHERE r.name = 'HEAD'
 			GROUP BY c.hash`,
 			[]sql.Row{
 				{int32(4), "1669dce138d9b841a518c64b10914d88f5e488ea"},
@@ -51,6 +51,15 @@ func TestIntegration(t *testing.T) {
 				{int32(3), "b8e471f58bcbca63b07bda20e428190409c2db47"},
 			},
 		},
+		{
+			`SELECT name FROM refs ORDER BY name`,
+			[]sql.Row{
+				{"HEAD"},
+				{"refs/heads/master"},
+				{"refs/remotes/origin/branch"},
+				{"refs/remotes/origin/master"},
+			},
+		},
 	}
 
 	for _, tt := range testCases {

references.go

@@ -55,6 +55,7 @@ func (referencesTable) Children() []sql.Node {
 }
 
 type referenceIter struct {
+	head         *plumbing.Reference
 	repositoryID string
 	iter         storer.ReferenceIter
 }
@@ -65,7 +66,13 @@ func (i *referenceIter) NewIterator(repo *Repository) (RowRepoIter, error) {
 		return nil, err
 	}
 
+	head, err := repo.Repo.Head()
+	if err != nil {
+		return nil, err
+	}
+
 	return &referenceIter{
+		head:         head,
 		repositoryID: repo.ID,
 		iter:         iter,
 	}, nil
@@ -78,6 +85,16 @@ func (i *referenceIter) Next() (sql.Row, error) {
 	)
 
 	for {
+		if i.head != nil {
+			o = i.head
+			i.head = nil
+			return sql.NewRow(
+				i.repositoryID,
+				"HEAD",
+				o.Hash().String(),
+			), nil
+		}
+
 		o, err = i.iter.Next()
 		if err != nil {
 			return nil, err

references_test.go

@@ -45,6 +45,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	require.Nil(err)
 
 	expected := []sql.Row{
+		sql.NewRow("repo", "HEAD", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
 		sql.NewRow("repo", "refs/heads/branch", "e8d3ffab552895c19b9fcf7aa264d277cde33881"),
 		sql.NewRow("repo", "refs/heads/master", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
 		sql.NewRow("repo", "refs/remotes/origin/branch", "e8d3ffab552895c19b9fcf7aa264d277cde33881"),