From d7f465f85f2583412b1b327b4ad7145c5f8efa61 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 14 Aug 2023 16:24:24 +0300 Subject: [PATCH 1/3] Enable support for table schema --- postgres.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/postgres.go b/postgres.go index 566b133..4b8f95e 100644 --- a/postgres.go +++ b/postgres.go @@ -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} @@ -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) } @@ -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 } From bfca9468f03eaae20744dc74145b4a729135c77b Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 17 Aug 2023 12:03:20 +0300 Subject: [PATCH 2/3] Update sql dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6ecff9a..1b18e4a 100644 --- a/go.mod +++ b/go.mod @@ -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.20230816135939-547c9b6280f7 github.com/jackc/pgx/v4 v4.18.1 github.com/lib/pq v1.10.9 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 1ae751e..5dec2aa 100644 --- a/go.sum +++ b/go.sum @@ -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.20230816135939-547c9b6280f7 h1:+iYSDenugZEVlHfN6XJwL+oFq8jKJ9wyIbqrMBgrJJw= +github.com/go-rel/sql v0.14.1-0.20230816135939-547c9b6280f7/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= From 41c47b92ae4689646ca06940ec6880dcbdd7fb81 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 17 Aug 2023 16:04:54 +0300 Subject: [PATCH 3/3] Update sql dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1b18e4a..59d6535 100644 --- a/go.mod +++ b/go.mod @@ -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.1-0.20230816135939-547c9b6280f7 + 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 diff --git a/go.sum b/go.sum index 5dec2aa..819818f 100644 --- a/go.sum +++ b/go.sum @@ -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.1-0.20230816135939-547c9b6280f7 h1:+iYSDenugZEVlHfN6XJwL+oFq8jKJ9wyIbqrMBgrJJw= -github.com/go-rel/sql v0.14.1-0.20230816135939-547c9b6280f7/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=