Merge pull request #163 from jfontan/fix/source-in-schema

Set Source in table schemas

Author: erizocosmico

blobs.go

@@ -24,8 +24,8 @@ func (blobsTable) Name() string {
 
 func (blobsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.Text, Nullable: false},
-		{Name: "size", Type: sql.Int64, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false, Source: blobsTableName},
+		{Name: "size", Type: sql.Int64, Nullable: false, Source: blobsTableName},
 	}
 }
 

blobs_test.go

@@ -16,6 +16,11 @@ func TestBlobsTable_Name(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, blobsTableName)
 	require.Equal(blobsTableName, table.Name())
+
+	// Check that each column source is the same as table name
+	for _, c := range table.Schema() {
+		require.Equal(blobsTableName, c.Source)
+	}
 }
 
 func TestBlobsTable_Children(t *testing.T) {

commits.go

@@ -24,14 +24,14 @@ func (commitsTable) Name() string {
 
 func (commitsTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "hash", Type: sql.Text, Nullable: false},
-		{Name: "author_name", Type: sql.Text, Nullable: false},
-		{Name: "author_email", Type: sql.Text, Nullable: false},
-		{Name: "author_when", Type: sql.Timestamp, Nullable: false},
-		{Name: "committer_name", Type: sql.Text, Nullable: false},
-		{Name: "committer_email", Type: sql.Text, Nullable: false},
-		{Name: "committer_when", Type: sql.Timestamp, Nullable: false},
-		{Name: "message", Type: sql.Text, Nullable: false},
+		{Name: "hash", Type: sql.Text, Nullable: false, Source: commitsTableName},
+		{Name: "author_name", Type: sql.Text, Nullable: false, Source: commitsTableName},
+		{Name: "author_email", Type: sql.Text, Nullable: false, Source: commitsTableName},
+		{Name: "author_when", Type: sql.Timestamp, Nullable: false, Source: commitsTableName},
+		{Name: "committer_name", Type: sql.Text, Nullable: false, Source: commitsTableName},
+		{Name: "committer_email", Type: sql.Text, Nullable: false, Source: commitsTableName},
+		{Name: "committer_when", Type: sql.Timestamp, Nullable: false, Source: commitsTableName},
+		{Name: "message", Type: sql.Text, Nullable: false, Source: commitsTableName},
 	}
 }
 

commits_test.go

@@ -16,6 +16,11 @@ func TestCommitsTable_Name(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, commitsTableName)
 	require.Equal(commitsTableName, table.Name())
+
+	// Check that each column source is the same as table name
+	for _, c := range table.Schema() {
+		require.Equal(commitsTableName, c.Source)
+	}
 }
 
 func TestCommitsTable_Children(t *testing.T) {

references.go

@@ -25,9 +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: "hash", Type: sql.Text, Nullable: false},
+		{Name: "repository_id", Type: sql.Text, Nullable: false, Source: referencesTableName},
+		{Name: "name", Type: sql.Text, Nullable: false, Source: referencesTableName},
+		{Name: "hash", Type: sql.Text, Nullable: false, Source: referencesTableName},
 	}
 }
 

references_test.go

@@ -18,6 +18,11 @@ func TestReferencesTable_Name(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, referencesTableName)
 	require.Equal(referencesTableName, table.Name())
+
+	// Check that each column source is the same as table name
+	for _, c := range table.Schema() {
+		require.Equal(referencesTableName, c.Source)
+	}
 }
 
 func TestReferencesTable_Children(t *testing.T) {

remotes.go

@@ -26,12 +26,12 @@ func (remotesTable) Name() string {
 
 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},
+		{Name: "repository_id", Type: sql.Text, Nullable: false, Source: remotesTableName},
+		{Name: "name", Type: sql.Text, Nullable: false, Source: remotesTableName},
+		{Name: "push_url", Type: sql.Text, Nullable: false, Source: remotesTableName},
+		{Name: "fetch_url", Type: sql.Text, Nullable: false, Source: remotesTableName},
+		{Name: "push_refspec", Type: sql.Text, Nullable: false, Source: remotesTableName},
+		{Name: "fetch_refspec", Type: sql.Text, Nullable: false, Source: remotesTableName},
 	}
 }
 

remotes_test.go

@@ -18,6 +18,11 @@ func TestRemotesTable_Name(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, remotesTableName)
 	require.Equal(remotesTableName, table.Name())
+
+	// Check that each column source is the same as table name
+	for _, c := range table.Schema() {
+		require.Equal(remotesTableName, c.Source)
+	}
 }
 
 func TestRemotesTable_Children(t *testing.T) {

repositories.go

@@ -24,7 +24,7 @@ func (repositoriesTable) Name() string {
 
 func (repositoriesTable) Schema() sql.Schema {
 	return sql.Schema{
-		{Name: "id", Type: sql.Text, Nullable: false},
+		{Name: "id", Type: sql.Text, Nullable: false, Source: repositoriesTableName},
 	}
 }
 

repositories_test.go

@@ -15,6 +15,11 @@ func TestRepositoriesTable_Name(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, repositoriesTableName)
 	require.Equal(repositoriesTableName, table.Name())
+
+	// Check that each column source is the same as table name
+	for _, c := range table.Schema() {
+		require.Equal(repositoriesTableName, c.Source)
+	}
 }
 
 func TestRepositoriesTable_Children(t *testing.T) {