Skip to content

Commit 6aa0743

Browse files
authored
Enable support for table schema (#61)
* Enable support for table schema * Update sql dependency * Update sql dependency
1 parent 90ceb51 commit 6aa0743

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/go-rel/primaryreplica v0.4.0
77
github.com/go-rel/rel v0.39.0
8-
github.com/go-rel/sql v0.14.0
8+
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74
99
github.com/jackc/pgx/v4 v4.18.1
1010
github.com/lib/pq v1.10.9
1111
github.com/stretchr/testify v1.8.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/go-rel/primaryreplica v0.4.0/go.mod h1:HUBz+BUvUcg9JpRRk9PstV9J/qlEOq
1919
github.com/go-rel/rel v0.33.1/go.mod h1:DhB9Xmt/ymaumJAB6Z3Kq+IybLwQhhrzr6ZLeXMygPo=
2020
github.com/go-rel/rel v0.39.0 h1:2zmK8kazM82iRRfWX7+mm1MxDkGKDj2W+xJLjguli5U=
2121
github.com/go-rel/rel v0.39.0/go.mod h1:yN6+aimHyRIzbuWFe5DaxiZPuVuPfd7GlLpy/YTqTUg=
22-
github.com/go-rel/sql v0.14.0 h1:pTg40wvSrOr9cNcm76mHqPe0oRg6CRf92xfH6A3+y/g=
23-
github.com/go-rel/sql v0.14.0/go.mod h1:gtbpaNkNDNrf9LceaDWhAr6Im+Vd2NgBT93AOOM6UOc=
22+
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74 h1:uwtSHPqWCcidGGoBWbnS1qWuSaE5ajPrHjzg3Fx3rnc=
23+
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74/go.mod h1:gtbpaNkNDNrf9LceaDWhAr6Im+Vd2NgBT93AOOM6UOc=
2424
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
2525
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
2626
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=

postgres.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type Postgres struct {
3131
// New postgres adapter using existing connection.
3232
func New(database *db.DB) rel.Adapter {
3333
var (
34-
bufferFactory = builder.BufferFactory{ArgumentPlaceholder: "$", ArgumentOrdinal: true, BoolTrueValue: "true", BoolFalseValue: "false", Quoter: Quote{}, ValueConverter: ValueConvert{}}
34+
bufferFactory = builder.BufferFactory{AllowTableSchema: true, ArgumentPlaceholder: "$", ArgumentOrdinal: true, BoolTrueValue: "true", BoolFalseValue: "false", Quoter: Quote{}, ValueConverter: ValueConvert{}}
3535
filterBuilder = builder.Filter{}
3636
queryBuilder = builder.Query{BufferFactory: bufferFactory, Filter: filterBuilder}
3737
OnConflictBuilder = builder.OnConflict{Statement: "ON CONFLICT", IgnoreStatement: "DO NOTHING", UpdateStatement: "DO UPDATE SET", TableQualifier: "excluded", SupportKey: true}
@@ -62,13 +62,13 @@ func New(database *db.DB) rel.Adapter {
6262

6363
// Open postgres connection using dsn.
6464
func Open(dsn string) (rel.Adapter, error) {
65-
var database, err = db.Open("postgres", dsn)
65+
database, err := db.Open("postgres", dsn)
6666
return New(database), err
6767
}
6868

6969
// MustOpen postgres connection using dsn.
7070
func MustOpen(dsn string) rel.Adapter {
71-
var database, err = db.Open("postgres", dsn)
71+
database, err := db.Open("postgres", dsn)
7272
check(err)
7373
return New(database)
7474
}
@@ -111,9 +111,7 @@ func (p Postgres) InsertAll(ctx context.Context, query rel.Query, primaryField s
111111

112112
// Begin begins a new transaction.
113113
func (p Postgres) Begin(ctx context.Context) (rel.Adapter, error) {
114-
var (
115-
txSql, err = p.SQL.Begin(ctx)
116-
)
114+
txSql, err := p.SQL.Begin(ctx)
117115

118116
return &Postgres{SQL: *txSql.(*sql.SQL)}, err
119117
}

0 commit comments

Comments
 (0)