Escape table name in the loader query

Author: debugger84

internal/__snapshots__/TestGenerate_Default_loader_1.snap/author.go.snap

@@ -57,7 +57,7 @@ func (l *AuthorLoader) getInnerLoader() *dataloader.Loader[pgtype.UUID, model.Au
 func (l *AuthorLoader) findItemsMap(ctx context.Context, keys []pgtype.UUID) (map[pgtype.UUID]model.Author, error) {
     res := make(map[pgtype.UUID]model.Author, len(keys))
 
-    query := `SELECT id, name, status FROM public.authors WHERE id = ANY($1)`
+    query := `SELECT id, name, status FROM "public"."authors" WHERE id = ANY($1)`
     rows, err := l.db.Query(ctx, query, keys)
     if err != nil {
         return nil, err

internal/__snapshots__/TestGenerate_Loader_With_LRU_Cache_1.snap/author.go.snap

@@ -60,7 +60,7 @@ func (l *AuthorLoader) getInnerLoader() *dataloader.Loader[pgtype.UUID, model.Au
 func (l *AuthorLoader) findItemsMap(ctx context.Context, keys []pgtype.UUID) (map[pgtype.UUID]model.Author, error) {
     res := make(map[pgtype.UUID]model.Author, len(keys))
 
-    query := `SELECT id, name, status FROM public.authors WHERE id = ANY($1)`
+    query := `SELECT id, name, status FROM "public"."authors" WHERE id = ANY($1)`
     rows, err := l.db.Query(ctx, query, keys)
     if err != nil {
         return nil, err

internal/__snapshots__/TestGenerate_Loader_with_changed_id_1.snap/author.go.snap

@@ -57,7 +57,7 @@ func (l *AuthorLoader) getInnerLoader() *dataloader.Loader[pgtype.Text, model.Au
 func (l *AuthorLoader) findItemsMap(ctx context.Context, keys []pgtype.Text) (map[pgtype.Text]model.Author, error) {
     res := make(map[pgtype.Text]model.Author, len(keys))
 
-    query := `SELECT id, name, status FROM public.authors WHERE name = ANY($1)`
+    query := `SELECT id, name, status FROM "public"."authors" WHERE name = ANY($1)`
     rows, err := l.db.Query(ctx, query, keys)
     if err != nil {
         return nil, err

internal/__snapshots__/TestGenerate_Loader_with_id_of_enum_type_1.snap/author.go.snap

@@ -56,7 +56,7 @@ func (l *AuthorLoader) getInnerLoader() *dataloader.Loader[model.Status, model.A
 func (l *AuthorLoader) findItemsMap(ctx context.Context, keys []model.Status) (map[model.Status]model.Author, error) {
     res := make(map[model.Status]model.Author, len(keys))
 
-    query := `SELECT id, name, status FROM public.authors WHERE status = ANY($1)`
+    query := `SELECT id, name, status FROM "public"."authors" WHERE status = ANY($1)`
     rows, err := l.db.Query(ctx, query, keys)
     if err != nil {
         return nil, err

internal/model/struct.go

@@ -77,6 +77,17 @@ func (s *Struct) FullTableName() string {
 	return fmt.Sprintf("%s.%s", schema, tableName)
 }
 
+func (s *Struct) EscapedFullTableName() string {
+	schema := s.table.Rel.GetSchema()
+	tableName := s.table.Rel.GetName()
+
+	if schema == "" {
+		return tableName
+	}
+
+	return fmt.Sprintf("\"%s\".\"%s\"", schema, tableName)
+}
+
 func (s *Struct) Type() *gotype.GoType {
 	return s.goType
 }

internal/renderer/templates/dataloader.tmpl

@@ -67,7 +67,7 @@
     func (l *{{ .Struct.LoaderName }}) findItemsMap(ctx context.Context, keys []{{ .PrimaryKeyFieldType}}) (map[{{ .PrimaryKeyFieldType}}]{{ .Struct.Type.TypeWithPackage }}, error) {
         res := make(map[{{ .PrimaryKeyFieldType}}]{{ .Struct.Type.TypeWithPackage }}, len(keys))
 
-        query := `SELECT {{ .Struct.SqlFieldNamesString }} FROM {{ .Struct.FullTableName }} WHERE {{ .PrimaryKeyColumnName}} = ANY($1)`
+        query := `SELECT {{ .Struct.SqlFieldNamesString }} FROM {{ .Struct.EscapedFullTableName }} WHERE {{ .PrimaryKeyColumnName}} = ANY($1)`
         rows, err := l.db.Query(ctx, query, keys)
         if err != nil {
             return nil, err