Use full path as ID in repository pool

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

integration_test.go

@@ -2,7 +2,6 @@ package gitquery_test
 
 import (
 	"context"
-	"path/filepath"
 	"testing"
 
 	"github.com/src-d/gitquery"
@@ -21,7 +20,6 @@ func TestIntegration(t *testing.T) {
 	}()
 
 	path := fixtures.ByTag("worktree").One().Worktree().Root()
-	dirName := filepath.Base(path)
 
 	pool := gitquery.NewRepositoryPool()
 	_, err := pool.AddGit(path)
@@ -108,9 +106,9 @@ func TestIntegration(t *testing.T) {
 			) as t
 			GROUP BY committer_email, month, repo_id`,
 			[]sql.Row{
-				{int32(6), int32(3), dirName, "[email protected]"},
-				{int32(1), int32(4), dirName, "[email protected]"},
-				{int32(1), int32(3), dirName, "[email protected]"},
+				{int32(6), int32(3), path, "[email protected]"},
+				{int32(1), int32(4), path, "[email protected]"},
+				{int32(1), int32(3), path, "[email protected]"},
 			},
 		},
 		{

repositories_test.go

@@ -2,7 +2,6 @@ package gitquery
 
 import (
 	"context"
-	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -77,8 +76,6 @@ func TestRepositoriesPushdown(t *testing.T) {
 	session, path, cleanup := setup(t)
 	defer cleanup()
 
-	dirName := filepath.Base(path)
-
 	table := newRepositoriesTable(session.Pool).(sql.PushdownProjectionAndFiltersTable)
 
 	iter, err := table.WithProjectAndFilters(session, nil, nil)
@@ -103,7 +100,7 @@ func TestRepositoriesPushdown(t *testing.T) {
 	iter, err = table.WithProjectAndFilters(session, nil, []sql.Expression{
 		expression.NewEquals(
 			expression.NewGetField(0, sql.Text, "id", false),
-			expression.NewLiteral(dirName, sql.Text),
+			expression.NewLiteral(path, sql.Text),
 		),
 	})
 	require.NoError(err)

repository_pool.go

@@ -68,10 +68,9 @@ func (p *RepositoryPool) AddGit(path string) (string, error) {
 		return "", err
 	}
 
-	id := filepath.Base(path)
-	p.Add(id, path)
+	p.Add(path, path)
 
-	return id, nil
+	return path, nil
 }
 
 // AddDir adds all direct subdirectories from path as repos

repository_pool_test.go

@@ -69,15 +69,14 @@ func TestRepositoryPoolGit(t *testing.T) {
 	require := require.New(t)
 
 	path := fixtures.Basic().ByTag("worktree").One().Worktree().Root()
-	dirName := filepath.Base(path)
 
 	pool := NewRepositoryPool()
 	id, err := pool.AddGit(path)
-	require.Equal(dirName, id)
+	require.Equal(path, id)
 	require.NoError(err)
 
 	repo, err := pool.GetPos(0)
-	require.Equal(dirName, repo.ID)
+	require.Equal(path, repo.ID)
 	require.NotNil(repo.Repo)
 	require.NoError(err)
 
@@ -239,7 +238,7 @@ func TestRepositoryPoolAddDir(t *testing.T) {
 		repo, err := pool.GetPos(i)
 		require.NoError(err)
 		arrayID[i] = repo.ID
-		arrayExpected[i] = strconv.Itoa(i)
+		arrayExpected[i] = filepath.Join(tmpDir, strconv.Itoa(i))
 
 		iter, err := repo.Repo.CommitObjects()
 		require.NoError(err)