Skip to content

Commit c4db4a2

Browse files
committed
Fix quotes
1 parent e78dd06 commit c4db4a2

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

backend/internal/database/helpers.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ const (
1818
// is for special cases where we run raw sql
1919
func QuoteTableName(tbl string) string {
2020
switch strings.ToLower(config.Configuration.DB.Driver) {
21-
case config.DatabasePostgres:
22-
return fmt.Sprintf(`"%s"`, tbl)
23-
default:
24-
// This is the same for Mysql and Sqlite
21+
case config.DatabaseMysql:
22+
// backticks for mysql
2523
return fmt.Sprintf("`%s`", tbl)
24+
default:
25+
// double quotes for everything else
26+
return fmt.Sprintf(`"%s"`, tbl)
2627
}
2728
}
2829

backend/internal/entity/certificateauthority/entity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ func (s *testsuite) TestList() {
122122
defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
123123

124124
s.mock.
125-
ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"certificate_authority\" WHERE `certificate_authority`.`name` LIKE $1 AND \"certificate_authority\".\"is_deleted\" = $2")).
125+
ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "certificate_authority" WHERE "certificate_authority"."name" LIKE $1 AND "certificate_authority"."is_deleted" = $2`)).
126126
WithArgs("%test%", 0).
127127
WillReturnRows(s.listCountRows)
128128

129129
s.mock.
130-
ExpectQuery(regexp.QuoteMeta("SELECT * FROM \"certificate_authority\" WHERE `certificate_authority`.`name` LIKE $1 AND \"certificate_authority\".\"is_deleted\" = $2 ORDER BY name asc LIMIT $3")).
130+
ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "certificate_authority" WHERE "certificate_authority"."name" LIKE $1 AND "certificate_authority"."is_deleted" = $2 ORDER BY name asc LIMIT $3`)).
131131
WithArgs("%test%", 0, 8).
132132
WillReturnRows(s.listRows)
133133

backend/internal/entity/dnsprovider/entity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ func (s *testsuite) TestList() {
204204
defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
205205

206206
s.mock.
207-
ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"dns_provider\" WHERE `dns_provider`.`acmesh_name` LIKE $1 AND \"dns_provider\".\"is_deleted\" = $2")).
207+
ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "dns_provider" WHERE "dns_provider"."acmesh_name" LIKE $1 AND "dns_provider"."is_deleted" = $2`)).
208208
WithArgs("dns%", 0).
209209
WillReturnRows(s.listCountRows)
210210

211211
s.mock.
212-
ExpectQuery(regexp.QuoteMeta("SELECT * FROM \"dns_provider\" WHERE `dns_provider`.`acmesh_name` LIKE $1 AND \"dns_provider\".\"is_deleted\" = $2 ORDER BY name asc LIMIT $3")).
212+
ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "dns_provider" WHERE "dns_provider"."acmesh_name" LIKE $1 AND "dns_provider"."is_deleted" = $2 ORDER BY name asc LIMIT $3`)).
213213
WithArgs("dns%", 0, 8).
214214
WillReturnRows(s.listRows)
215215

backend/internal/entity/user/entity_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func (s *testsuite) TestDeleteAll() {
258258
defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
259259

260260
s.mock.
261-
ExpectExec(regexp.QuoteMeta("DELETE FROM `user` WHERE is_system = $1")).
261+
ExpectExec(regexp.QuoteMeta(`DELETE FROM "user" WHERE is_system = $1`)).
262262
WithArgs(false).
263263
WillReturnResult(sqlmock.NewResult(0, 1))
264264

@@ -307,12 +307,12 @@ func (s *testsuite) TestList() {
307307
defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
308308

309309
s.mock.
310-
ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"user\" WHERE `user`.`name` LIKE $1 AND \"user\".\"is_deleted\" = $2")).
310+
ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "user" WHERE "user"."name" LIKE $1 AND "user"."is_deleted" = $2`)).
311311
WithArgs("%jon%", 0).
312312
WillReturnRows(s.listCountRows)
313313

314314
s.mock.
315-
ExpectQuery(regexp.QuoteMeta("SELECT * FROM \"user\" WHERE `user`.`name` LIKE $1 AND \"user\".\"is_deleted\" = $2 ORDER BY name asc LIMIT $3")).
315+
ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "user" WHERE "user"."name" LIKE $1 AND "user"."is_deleted" = $2 ORDER BY name asc LIMIT $3`)).
316316
WithArgs("%jon%", 0, 8).
317317
WillReturnRows(s.listRows)
318318

0 commit comments

Comments
 (0)