Skip to content

Commit 8022ec3

Browse files
smolasmola
authored
rename *relation to *table. (#55)
PhysicalRelation is now Table, this is shorter, readable and more understandeable for most people.
1 parent a5a2b8e commit 8022ec3

25 files changed

+172
-172
lines changed

‎git/blobs.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ import (
66
"gopkg.in/src-d/go-git.v4"
77
)
88

9-
type blobsRelation struct {
9+
type blobsTable struct {
1010
r *git.Repository
1111
}
1212

13-
func newBlobsRelation(r *git.Repository) sql.PhysicalRelation {
14-
return &blobsRelation{r: r}
13+
func newBlobsTable(r *git.Repository) sql.Table {
14+
return &blobsTable{r: r}
1515
}
1616

17-
func (blobsRelation) Resolved() bool {
17+
func (blobsTable) Resolved() bool {
1818
return true
1919
}
2020

21-
func (blobsRelation) Name() string {
22-
return blobsRelationName
21+
func (blobsTable) Name() string {
22+
return blobsTableName
2323
}
2424

25-
func (blobsRelation) Schema() sql.Schema {
25+
func (blobsTable) Schema() sql.Schema {
2626
return sql.Schema{
2727
sql.Field{"hash", sql.String},
2828
sql.Field{"size", sql.BigInteger},
2929
}
3030
}
3131

32-
func (r *blobsRelation) TransformUp(f func(sql.Node) sql.Node) sql.Node {
32+
func (r *blobsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
3333
return f(r)
3434
}
3535

36-
func (r *blobsRelation) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
36+
func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
3737
return r
3838
}
3939

40-
func (r blobsRelation) RowIter() (sql.RowIter, error) {
40+
func (r blobsTable) RowIter() (sql.RowIter, error) {
4141
bIter, err := r.r.Blobs()
4242
if err != nil {
4343
return nil, err
@@ -46,7 +46,7 @@ func (r blobsRelation) RowIter() (sql.RowIter, error) {
4646
return iter, nil
4747
}
4848

49-
func (blobsRelation) Children() []sql.Node {
49+
func (blobsTable) Children() []sql.Node {
5050
return []sql.Node{}
5151
}
5252

‎git/blobs_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/src-d/go-git.v4/fixtures"
99
)
1010

11-
func TestBlobsRelation(t *testing.T) {
11+
func TestBlobsTable(t *testing.T) {
1212
assert := assert.New(t)
1313

1414
f := fixtures.Basic().One()
@@ -18,14 +18,14 @@ func TestBlobsRelation(t *testing.T) {
1818
db := NewDatabase("foo", r)
1919
assert.NotNil(db)
2020

21-
relations := db.Relations()
22-
rel, ok := relations[blobsRelationName]
21+
tables := db.Tables()
22+
table, ok := tables[blobsTableName]
2323
assert.True(ok)
24-
assert.NotNil(rel)
25-
assert.Equal(blobsRelationName, rel.Name())
26-
assert.Equal(0, len(rel.Children()))
24+
assert.NotNil(table)
25+
assert.Equal(blobsTableName, table.Name())
26+
assert.Equal(0, len(table.Children()))
2727

28-
iter, err := rel.RowIter()
28+
iter, err := table.RowIter()
2929
assert.Nil(err)
3030
assert.NotNil(iter)
3131

‎git/commits.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ import (
66
"gopkg.in/src-d/go-git.v4"
77
)
88

9-
type commitsRelation struct {
9+
type commitsTable struct {
1010
r *git.Repository
1111
}
1212

13-
func newCommitsRelation(r *git.Repository) sql.PhysicalRelation {
14-
return &commitsRelation{r: r}
13+
func newCommitsTable(r *git.Repository) sql.Table {
14+
return &commitsTable{r: r}
1515
}
1616

17-
func (commitsRelation) Resolved() bool {
17+
func (commitsTable) Resolved() bool {
1818
return true
1919
}
2020

21-
func (commitsRelation) Name() string {
22-
return commitsRelationName
21+
func (commitsTable) Name() string {
22+
return commitsTableName
2323
}
2424

25-
func (commitsRelation) Schema() sql.Schema {
25+
func (commitsTable) Schema() sql.Schema {
2626
return sql.Schema{
2727
sql.Field{"hash", sql.String},
2828
sql.Field{"author_name", sql.String},
@@ -35,15 +35,15 @@ func (commitsRelation) Schema() sql.Schema {
3535
}
3636
}
3737

38-
func (r *commitsRelation) TransformUp(f func(sql.Node) sql.Node) sql.Node {
38+
func (r *commitsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
3939
return f(r)
4040
}
4141

42-
func (r *commitsRelation) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
42+
func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
4343
return r
4444
}
4545

46-
func (r commitsRelation) RowIter() (sql.RowIter, error) {
46+
func (r commitsTable) RowIter() (sql.RowIter, error) {
4747
cIter, err := r.r.Commits()
4848
if err != nil {
4949
return nil, err
@@ -52,7 +52,7 @@ func (r commitsRelation) RowIter() (sql.RowIter, error) {
5252
return iter, nil
5353
}
5454

55-
func (commitsRelation) Children() []sql.Node {
55+
func (commitsTable) Children() []sql.Node {
5656
return []sql.Node{}
5757
}
5858

‎git/commits_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/src-d/go-git.v4/fixtures"
99
)
1010

11-
func TestCommitsRelation(t *testing.T) {
11+
func TestCommitsTable(t *testing.T) {
1212
assert := assert.New(t)
1313

1414
f := fixtures.Basic().One()
@@ -18,14 +18,14 @@ func TestCommitsRelation(t *testing.T) {
1818
db := NewDatabase("foo", r)
1919
assert.NotNil(db)
2020

21-
relations := db.Relations()
22-
rel, ok := relations[commitsRelationName]
21+
tables := db.Tables()
22+
table, ok := tables[commitsTableName]
2323
assert.True(ok)
24-
assert.NotNil(rel)
25-
assert.Equal(commitsRelationName, rel.Name())
26-
assert.Equal(0, len(rel.Children()))
24+
assert.NotNil(table)
25+
assert.Equal(commitsTableName, table.Name())
26+
assert.Equal(0, len(table.Children()))
2727

28-
iter, err := rel.RowIter()
28+
iter, err := table.RowIter()
2929
assert.Nil(err)
3030
assert.NotNil(iter)
3131

‎git/database.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,43 @@ import (
77
)
88

99
const (
10-
referencesRelationName = "references"
11-
commitsRelationName = "commits"
12-
tagsRelationName = "tags"
13-
blobsRelationName = "blobs"
14-
treeEntriesRelationName = "tree_entries"
10+
referencesTableName = "references"
11+
commitsTableName = "commits"
12+
tagsTableName = "tags"
13+
blobsTableName = "blobs"
14+
treeEntriesTableName = "tree_entries"
1515
)
1616

1717
type Database struct {
1818
name string
19-
cr sql.PhysicalRelation
20-
tr sql.PhysicalRelation
21-
rr sql.PhysicalRelation
22-
ter sql.PhysicalRelation
23-
br sql.PhysicalRelation
19+
cr sql.Table
20+
tr sql.Table
21+
rr sql.Table
22+
ter sql.Table
23+
br sql.Table
2424
}
2525

2626
func NewDatabase(name string, r *git.Repository) sql.Database {
2727
return &Database{
2828
name: name,
29-
cr: newCommitsRelation(r),
30-
rr: newReferencesRelation(r),
31-
tr: newTagsRelation(r),
32-
br: newBlobsRelation(r),
33-
ter: newTreeEntriesRelation(r),
29+
cr: newCommitsTable(r),
30+
rr: newReferencesTable(r),
31+
tr: newTagsTable(r),
32+
br: newBlobsTable(r),
33+
ter: newTreeEntriesTable(r),
3434
}
3535
}
3636

3737
func (d *Database) Name() string {
3838
return d.name
3939
}
4040

41-
func (d *Database) Relations() map[string]sql.PhysicalRelation {
42-
return map[string]sql.PhysicalRelation{
43-
commitsRelationName: d.cr,
44-
tagsRelationName: d.tr,
45-
referencesRelationName: d.rr,
46-
blobsRelationName: d.br,
47-
treeEntriesRelationName: d.ter,
41+
func (d *Database) Tables() map[string]sql.Table {
42+
return map[string]sql.Table{
43+
commitsTableName: d.cr,
44+
tagsTableName: d.tr,
45+
referencesTableName: d.rr,
46+
blobsTableName: d.br,
47+
treeEntriesTableName: d.ter,
4848
}
4949
}

‎git/database_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func init() {
1212
fixtures.RootFolder = "../../../../gopkg.in/src-d/go-git.v4/fixtures/"
1313
}
1414

15-
func TestDatabaseRelations(t *testing.T) {
15+
func TestDatabase_Tables(t *testing.T) {
1616
assert := assert.New(t)
1717

1818
f := fixtures.Basic().One()
@@ -22,12 +22,12 @@ func TestDatabaseRelations(t *testing.T) {
2222
db := NewDatabase("foo", r)
2323
assert.NotNil(db)
2424

25-
relations := db.Relations()
26-
_, ok := relations[commitsRelationName]
25+
tables := db.Tables()
26+
_, ok := tables[commitsTableName]
2727
assert.True(ok)
2828
}
2929

30-
func TestDatabaseName(t *testing.T) {
30+
func TestDatabase_Name(t *testing.T) {
3131
assert := assert.New(t)
3232

3333
f := fixtures.Basic().One()

‎git/references.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ import (
88
"gopkg.in/src-d/go-git.v4/plumbing/storer"
99
)
1010

11-
type referencesRelation struct {
11+
type referencesTable struct {
1212
r *git.Repository
1313
}
1414

15-
func newReferencesRelation(r *git.Repository) sql.PhysicalRelation {
16-
return &referencesRelation{r: r}
15+
func newReferencesTable(r *git.Repository) sql.Table {
16+
return &referencesTable{r: r}
1717
}
1818

19-
func (referencesRelation) Resolved() bool {
19+
func (referencesTable) Resolved() bool {
2020
return true
2121
}
2222

23-
func (referencesRelation) Name() string {
24-
return referencesRelationName
23+
func (referencesTable) Name() string {
24+
return referencesTableName
2525
}
2626

27-
func (referencesRelation) Schema() sql.Schema {
27+
func (referencesTable) Schema() sql.Schema {
2828
return sql.Schema{
2929
sql.Field{"hash", sql.String},
3030
sql.Field{"name", sql.String},
@@ -36,15 +36,15 @@ func (referencesRelation) Schema() sql.Schema {
3636
}
3737
}
3838

39-
func (r *referencesRelation) TransformUp(f func(sql.Node) sql.Node) sql.Node {
39+
func (r *referencesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
4040
return f(r)
4141
}
4242

43-
func (r *referencesRelation) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
43+
func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
4444
return r
4545
}
4646

47-
func (r referencesRelation) RowIter() (sql.RowIter, error) {
47+
func (r referencesTable) RowIter() (sql.RowIter, error) {
4848
rIter, err := r.r.Refs()
4949
if err != nil {
5050
return nil, err
@@ -53,7 +53,7 @@ func (r referencesRelation) RowIter() (sql.RowIter, error) {
5353
return iter, nil
5454
}
5555

56-
func (referencesRelation) Children() []sql.Node {
56+
func (referencesTable) Children() []sql.Node {
5757
return []sql.Node{}
5858
}
5959

‎git/references_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/src-d/go-git.v4/fixtures"
99
)
1010

11-
func TestRefsRelation(t *testing.T) {
11+
func TestReferencesTable(t *testing.T) {
1212
assert := assert.New(t)
1313

1414
f := fixtures.Basic().One()
@@ -18,14 +18,14 @@ func TestRefsRelation(t *testing.T) {
1818
db := NewDatabase("foo", r)
1919
assert.NotNil(db)
2020

21-
relations := db.Relations()
22-
rel, ok := relations[referencesRelationName]
21+
tables := db.Tables()
22+
table, ok := tables[referencesTableName]
2323
assert.True(ok)
24-
assert.NotNil(rel)
25-
assert.Equal(referencesRelationName, rel.Name())
26-
assert.Equal(0, len(rel.Children()))
24+
assert.NotNil(table)
25+
assert.Equal(referencesTableName, table.Name())
26+
assert.Equal(0, len(table.Children()))
2727

28-
iter, err := rel.RowIter()
28+
iter, err := table.RowIter()
2929
assert.Nil(err)
3030
assert.NotNil(iter)
3131

0 commit comments

Comments
 (0)