From 1123584c0c87acd021443bf09a27b4d2ef714bb8 Mon Sep 17 00:00:00 2001 From: jason_chuan Date: Tue, 30 Jan 2024 14:47:38 +0800 Subject: [PATCH 1/3] try again --- clause/limit.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/clause/limit.go b/clause/limit.go index b0f2fb0a..3edde434 100644 --- a/clause/limit.go +++ b/clause/limit.go @@ -15,7 +15,6 @@ func (limit Limit) Name() string { func (limit Limit) Build(builder Builder) { if limit.Limit != nil && *limit.Limit >= 0 { builder.WriteString("LIMIT ") - // builder.WriteString(strconv.Itoa(*limit.Limit)) builder.AddVar(builder, *limit.Limit) } if limit.Offset > 0 { @@ -24,7 +23,6 @@ func (limit Limit) Build(builder Builder) { } builder.WriteString("OFFSET ") builder.AddVar(builder, limit.Offset) - // builder.WriteString(strconv.Itoa(limit.Offset)) } } From 853ac2b536730b7bbc82960d3bd03bdce7ed898e Mon Sep 17 00:00:00 2001 From: jason_chuan Date: Tue, 30 Jan 2024 15:10:56 +0800 Subject: [PATCH 2/3] fix test case fro connpool --- tests/connpool_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/connpool_test.go b/tests/connpool_test.go index e0e1c771..21a2bad0 100644 --- a/tests/connpool_test.go +++ b/tests/connpool_test.go @@ -102,13 +102,13 @@ func TestConnPoolWrapper(t *testing.T) { expect: []string{ "SELECT VERSION()", "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`age`,`birthday`,`company_id`,`manager_id`,`active`) VALUES (?,?,?,?,?,?,?,?,?)", - "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT 1", + "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT ?", "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`age`,`birthday`,`company_id`,`manager_id`,`active`) VALUES (?,?,?,?,?,?,?,?,?)", - "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT 1", - "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT 1", + "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT ?", + "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT ?", "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`age`,`birthday`,`company_id`,`manager_id`,`active`) VALUES (?,?,?,?,?,?,?,?,?)", - "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT 1", - "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT 1", + "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT ?", + "SELECT * FROM `users` WHERE name = ? AND `users`.`deleted_at` IS NULL ORDER BY `users`.`id` LIMIT ?", }, } From cb398e91f68f0adc95d4edbb1c2a6697b2ff023a Mon Sep 17 00:00:00 2001 From: jason_chuan Date: Tue, 30 Jan 2024 16:48:20 +0800 Subject: [PATCH 3/3] adding driverName for postgres ,if not to do so, the stmt vars will be added a wrong one called pgx.QueryExecModeSimpleProtocol , causing the SQL with limit problem need 1 parameter ,but given two. --- tests/tests_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests_test.go b/tests/tests_test.go index a127734e..34ab3671 100644 --- a/tests/tests_test.go +++ b/tests/tests_test.go @@ -63,6 +63,7 @@ func OpenTestConnection(cfg *gorm.Config) (db *gorm.DB, err error) { db, err = gorm.Open(postgres.New(postgres.Config{ DSN: dbDSN, PreferSimpleProtocol: true, + DriverName: "postgres", }), cfg) case "sqlserver": // go install github.com/microsoft/go-sqlcmd/cmd/sqlcmd@latest