Skip to content

Enable support for table schema #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2023
Merged

Enable support for table schema #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7f465f
Enable support for table schema
lafriks Aug 14, 2023
bfca946
Update sql dependency
lafriks Aug 17, 2023
41c47b9
Update sql dependency
lafriks Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/go-rel/primaryreplica v0.4.0
github.com/go-rel/rel v0.39.0
github.com/go-rel/sql v0.14.0
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74
github.com/jackc/pgx/v4 v4.18.1
github.com/lib/pq v1.10.9
github.com/stretchr/testify v1.8.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ github.com/go-rel/primaryreplica v0.4.0/go.mod h1:HUBz+BUvUcg9JpRRk9PstV9J/qlEOq
github.com/go-rel/rel v0.33.1/go.mod h1:DhB9Xmt/ymaumJAB6Z3Kq+IybLwQhhrzr6ZLeXMygPo=
github.com/go-rel/rel v0.39.0 h1:2zmK8kazM82iRRfWX7+mm1MxDkGKDj2W+xJLjguli5U=
github.com/go-rel/rel v0.39.0/go.mod h1:yN6+aimHyRIzbuWFe5DaxiZPuVuPfd7GlLpy/YTqTUg=
github.com/go-rel/sql v0.14.0 h1:pTg40wvSrOr9cNcm76mHqPe0oRg6CRf92xfH6A3+y/g=
github.com/go-rel/sql v0.14.0/go.mod h1:gtbpaNkNDNrf9LceaDWhAr6Im+Vd2NgBT93AOOM6UOc=
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74 h1:uwtSHPqWCcidGGoBWbnS1qWuSaE5ajPrHjzg3Fx3rnc=
github.com/go-rel/sql v0.14.1-0.20230817122121-1d87de1e1a74/go.mod h1:gtbpaNkNDNrf9LceaDWhAr6Im+Vd2NgBT93AOOM6UOc=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
Expand Down
10 changes: 4 additions & 6 deletions postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Postgres struct {
// New postgres adapter using existing connection.
func New(database *db.DB) rel.Adapter {
var (
bufferFactory = builder.BufferFactory{ArgumentPlaceholder: "$", ArgumentOrdinal: true, BoolTrueValue: "true", BoolFalseValue: "false", Quoter: Quote{}, ValueConverter: ValueConvert{}}
bufferFactory = builder.BufferFactory{AllowTableSchema: true, ArgumentPlaceholder: "$", ArgumentOrdinal: true, BoolTrueValue: "true", BoolFalseValue: "false", Quoter: Quote{}, ValueConverter: ValueConvert{}}
filterBuilder = builder.Filter{}
queryBuilder = builder.Query{BufferFactory: bufferFactory, Filter: filterBuilder}
OnConflictBuilder = builder.OnConflict{Statement: "ON CONFLICT", IgnoreStatement: "DO NOTHING", UpdateStatement: "DO UPDATE SET", TableQualifier: "excluded", SupportKey: true}
Expand Down Expand Up @@ -62,13 +62,13 @@ func New(database *db.DB) rel.Adapter {

// Open postgres connection using dsn.
func Open(dsn string) (rel.Adapter, error) {
var database, err = db.Open("postgres", dsn)
database, err := db.Open("postgres", dsn)
return New(database), err
}

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

// Begin begins a new transaction.
func (p Postgres) Begin(ctx context.Context) (rel.Adapter, error) {
var (
txSql, err = p.SQL.Begin(ctx)
)
txSql, err := p.SQL.Begin(ctx)

return &Postgres{SQL: *txSql.(*sql.SQL)}, err
}
Expand Down