Skip to content

Commit 4442b12

Browse files
author
Juanjo Alvarez
committed
Fix test and schema.md field
Signed-off-by: Juanjo Alvarez <[email protected]>
1 parent 15bd093 commit 4442b12

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎docs/using-gitbase/schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ This table represents the relation between commits and blobs. With this table yo
144144
+---------------+-------------+
145145
| repository_id | TEXT |
146146
| commit_hash | VARCHAR(40) |
147-
| tree_hash | TEXT |
147+
| tree_hash | VARCHAR(40) |
148148
+---------------+-------------+
149149
```
150150

‎internal/rule/squashjoins_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -893,16 +893,16 @@ func TestBuildSquashedTable(t *testing.T) {
893893
colT(15, sql.Text, gitbase.RemotesTableName, "remote_push_refspec"),
894894
colT(16, sql.Text, gitbase.RemotesTableName, "remote_fetch_refspec"),
895895
colT(0, sql.Text, gitbase.CommitsTableName, "repository_id"),
896-
colT(1, sql.Text, gitbase.CommitsTableName, "commit_hash"),
896+
colT(1, sql.VarChar(40), gitbase.CommitsTableName, "commit_hash"),
897897
colT(2, sql.Text, gitbase.CommitsTableName, "commit_author_name"),
898-
colT(3, sql.Text, gitbase.CommitsTableName, "commit_author_email"),
898+
colT(3, sql.VarChar(254), gitbase.CommitsTableName, "commit_author_email"),
899899
colT(4, sql.Timestamp, gitbase.CommitsTableName, "commit_author_when"),
900900
colT(5, sql.Text, gitbase.CommitsTableName, "committer_name"),
901-
colT(6, sql.Text, gitbase.CommitsTableName, "committer_email"),
901+
colT(6, sql.VarChar(254), gitbase.CommitsTableName, "committer_email"),
902902
colT(7, sql.Timestamp, gitbase.CommitsTableName, "committer_when"),
903903
colT(8, sql.Text, gitbase.CommitsTableName, "commit_message"),
904-
colT(9, sql.Text, gitbase.CommitsTableName, "tree_hash"),
905-
colT(10, sql.Array(sql.Text), gitbase.CommitsTableName, "commit_parents"),
904+
colT(9, sql.VarChar(40), gitbase.CommitsTableName, "tree_hash"),
905+
colT(10, sql.Array(sql.VarChar(40)), gitbase.CommitsTableName, "commit_parents"),
906906
},
907907
plan.NewInnerJoin(
908908
plan.NewExchange(2,
@@ -1024,9 +1024,9 @@ func TestBuildSquashedTable(t *testing.T) {
10241024
colT(10, sql.Text, gitbase.RemotesTableName, "remote_fetch_refspec"),
10251025
colT(0, sql.Text, gitbase.TreeEntriesTableName, "repository_id"),
10261026
colT(1, sql.Text, gitbase.TreeEntriesTableName, "tree_entry_name"),
1027-
colT(2, sql.Text, gitbase.TreeEntriesTableName, "blob_hash"),
1028-
colT(3, sql.Text, gitbase.TreeEntriesTableName, "tree_hash"),
1029-
colT(4, sql.Text, gitbase.TreeEntriesTableName, "tree_entry_mode"),
1027+
colT(2, sql.VarChar(40), gitbase.TreeEntriesTableName, "blob_hash"),
1028+
colT(3, sql.VarChar(40), gitbase.TreeEntriesTableName, "tree_hash"),
1029+
colT(4, sql.VarChar(16), gitbase.TreeEntriesTableName, "tree_entry_mode"),
10301030
},
10311031
plan.NewInnerJoin(
10321032
plan.NewExchange(2,
@@ -1102,7 +1102,7 @@ func TestBuildSquashedTable(t *testing.T) {
11021102
colT(8, sql.Text, gitbase.RemotesTableName, "remote_push_refspec"),
11031103
colT(9, sql.Text, gitbase.RemotesTableName, "remote_fetch_refspec"),
11041104
colT(0, sql.Text, gitbase.BlobsTableName, "repository_id"),
1105-
colT(1, sql.Text, gitbase.BlobsTableName, "blob_hash"),
1105+
colT(1, sql.VarChar(40), gitbase.BlobsTableName, "blob_hash"),
11061106
colT(2, sql.Int64, gitbase.BlobsTableName, "blob_size"),
11071107
colT(3, sql.Blob, gitbase.BlobsTableName, "blob_content"),
11081108
},
@@ -1140,9 +1140,9 @@ func TestBuildSquashedTable(t *testing.T) {
11401140
[]sql.Expression{
11411141
colT(4, sql.Text, gitbase.ReferencesTableName, "repository_id"),
11421142
colT(5, sql.Text, gitbase.ReferencesTableName, "ref_name"),
1143-
colT(6, sql.Text, gitbase.ReferencesTableName, "commit_hash"),
1143+
colT(6, sql.VarChar(40), gitbase.ReferencesTableName, "commit_hash"),
11441144
colT(0, sql.Text, gitbase.BlobsTableName, "repository_id"),
1145-
colT(1, sql.Text, gitbase.BlobsTableName, "blob_hash"),
1145+
colT(1, sql.VarChar(40), gitbase.BlobsTableName, "blob_hash"),
11461146
colT(2, sql.Int64, gitbase.BlobsTableName, "blob_size"),
11471147
colT(3, sql.Blob, gitbase.BlobsTableName, "blob_content"),
11481148
},
@@ -1179,18 +1179,18 @@ func TestBuildSquashedTable(t *testing.T) {
11791179
plan.NewProject(
11801180
[]sql.Expression{
11811181
colT(4, sql.Text, gitbase.CommitsTableName, "repository_id"),
1182-
colT(5, sql.Text, gitbase.CommitsTableName, "commit_hash"),
1182+
colT(5, sql.VarChar(40), gitbase.CommitsTableName, "commit_hash"),
11831183
colT(6, sql.Text, gitbase.CommitsTableName, "commit_author_name"),
1184-
colT(7, sql.Text, gitbase.CommitsTableName, "commit_author_email"),
1184+
colT(7, sql.VarChar(254), gitbase.CommitsTableName, "commit_author_email"),
11851185
colT(8, sql.Timestamp, gitbase.CommitsTableName, "commit_author_when"),
11861186
colT(9, sql.Text, gitbase.CommitsTableName, "committer_name"),
1187-
colT(10, sql.Text, gitbase.CommitsTableName, "committer_email"),
1187+
colT(10, sql.VarChar(254), gitbase.CommitsTableName, "committer_email"),
11881188
colT(11, sql.Timestamp, gitbase.CommitsTableName, "committer_when"),
11891189
colT(12, sql.Text, gitbase.CommitsTableName, "commit_message"),
1190-
colT(13, sql.Text, gitbase.CommitsTableName, "tree_hash"),
1191-
colT(14, sql.Array(sql.Text), gitbase.CommitsTableName, "commit_parents"),
1190+
colT(13, sql.VarChar(40), gitbase.CommitsTableName, "tree_hash"),
1191+
colT(14, sql.Array(sql.VarChar(40)), gitbase.CommitsTableName, "commit_parents"),
11921192
colT(0, sql.Text, gitbase.BlobsTableName, "repository_id"),
1193-
colT(1, sql.Text, gitbase.BlobsTableName, "blob_hash"),
1193+
colT(1, sql.VarChar(40), gitbase.BlobsTableName, "blob_hash"),
11941194
colT(2, sql.Int64, gitbase.BlobsTableName, "blob_size"),
11951195
colT(3, sql.Blob, gitbase.BlobsTableName, "blob_content"),
11961196
},

0 commit comments

Comments
 (0)