From c4db4a2647e513171b4c5049b061f7bd8733f5fc Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 11 Sep 2024 19:38:41 +1000
Subject: [PATCH] Fix quotes

---
 backend/internal/database/helpers.go                     | 9 +++++----
 .../internal/entity/certificateauthority/entity_test.go  | 4 ++--
 backend/internal/entity/dnsprovider/entity_test.go       | 4 ++--
 backend/internal/entity/user/entity_test.go              | 6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/backend/internal/database/helpers.go b/backend/internal/database/helpers.go
index 7c26fb2..c07ad21 100644
--- a/backend/internal/database/helpers.go
+++ b/backend/internal/database/helpers.go
@@ -18,11 +18,12 @@ const (
 // is for special cases where we run raw sql
 func QuoteTableName(tbl string) string {
 	switch strings.ToLower(config.Configuration.DB.Driver) {
-	case config.DatabasePostgres:
-		return fmt.Sprintf(`"%s"`, tbl)
-	default:
-		// This is the same for Mysql and Sqlite
+	case config.DatabaseMysql:
+		// backticks for mysql
 		return fmt.Sprintf("`%s`", tbl)
+	default:
+		// double quotes for everything else
+		return fmt.Sprintf(`"%s"`, tbl)
 	}
 }
 
diff --git a/backend/internal/entity/certificateauthority/entity_test.go b/backend/internal/entity/certificateauthority/entity_test.go
index 90ae394..c13dc35 100644
--- a/backend/internal/entity/certificateauthority/entity_test.go
+++ b/backend/internal/entity/certificateauthority/entity_test.go
@@ -122,12 +122,12 @@ func (s *testsuite) TestList() {
 	defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
 
 	s.mock.
-		ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"certificate_authority\" WHERE `certificate_authority`.`name` LIKE $1 AND \"certificate_authority\".\"is_deleted\" = $2")).
+		ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "certificate_authority" WHERE "certificate_authority"."name" LIKE $1 AND "certificate_authority"."is_deleted" = $2`)).
 		WithArgs("%test%", 0).
 		WillReturnRows(s.listCountRows)
 
 	s.mock.
-		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")).
+		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`)).
 		WithArgs("%test%", 0, 8).
 		WillReturnRows(s.listRows)
 
diff --git a/backend/internal/entity/dnsprovider/entity_test.go b/backend/internal/entity/dnsprovider/entity_test.go
index c8e7b46..f1ab0f1 100644
--- a/backend/internal/entity/dnsprovider/entity_test.go
+++ b/backend/internal/entity/dnsprovider/entity_test.go
@@ -204,12 +204,12 @@ func (s *testsuite) TestList() {
 	defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
 
 	s.mock.
-		ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"dns_provider\" WHERE `dns_provider`.`acmesh_name` LIKE $1 AND \"dns_provider\".\"is_deleted\" = $2")).
+		ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "dns_provider" WHERE "dns_provider"."acmesh_name" LIKE $1 AND "dns_provider"."is_deleted" = $2`)).
 		WithArgs("dns%", 0).
 		WillReturnRows(s.listCountRows)
 
 	s.mock.
-		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")).
+		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`)).
 		WithArgs("dns%", 0, 8).
 		WillReturnRows(s.listRows)
 
diff --git a/backend/internal/entity/user/entity_test.go b/backend/internal/entity/user/entity_test.go
index 772b05a..1a789c7 100644
--- a/backend/internal/entity/user/entity_test.go
+++ b/backend/internal/entity/user/entity_test.go
@@ -258,7 +258,7 @@ func (s *testsuite) TestDeleteAll() {
 	defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
 
 	s.mock.
-		ExpectExec(regexp.QuoteMeta("DELETE FROM `user` WHERE is_system = $1")).
+		ExpectExec(regexp.QuoteMeta(`DELETE FROM "user" WHERE is_system = $1`)).
 		WithArgs(false).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
@@ -307,12 +307,12 @@ func (s *testsuite) TestList() {
 	defer goleak.VerifyNone(s.T(), goleak.IgnoreAnyFunction("database/sql.(*DB).connectionOpener"))
 
 	s.mock.
-		ExpectQuery(regexp.QuoteMeta("SELECT count(*) FROM \"user\" WHERE `user`.`name` LIKE $1 AND \"user\".\"is_deleted\" = $2")).
+		ExpectQuery(regexp.QuoteMeta(`SELECT count(*) FROM "user" WHERE "user"."name" LIKE $1 AND "user"."is_deleted" = $2`)).
 		WithArgs("%jon%", 0).
 		WillReturnRows(s.listCountRows)
 
 	s.mock.
-		ExpectQuery(regexp.QuoteMeta("SELECT * FROM \"user\" WHERE `user`.`name` LIKE $1 AND \"user\".\"is_deleted\" = $2 ORDER BY name asc LIMIT $3")).
+		ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "user" WHERE "user"."name" LIKE $1 AND "user"."is_deleted" = $2 ORDER BY name asc LIMIT $3`)).
 		WithArgs("%jon%", 0, 8).
 		WillReturnRows(s.listRows)