Add emit_sql_as_comment option to Go code plugin

jasoncabot · jasoncabot · commit b2e30cb6d19f · 2023-09-19T09:57:23.000+01:00
This option adds the raw SQL query as a comment to the generated query function

This is useful when working in an IDE that displays comments over functions, you are able to glance at the actual SQL query that will be executed without having to lose context of where you are in the current file you are working on.
diff --git a/docs/reference/config.md b/docs/reference/config.md
@@ -146,6 +146,8 @@ The `gen` mapping supports the following keys:
 - `emit_all_enum_values`:
   - If true, emit a function per enum type
     that returns all valid enum values.
+- `emit_sql_as_comment`:
+  - If true, emits the SQL statement as a code-block comment above the generated function, appending to any existing comments. Defaults to `false`.
 - `json_tags_id_uppercase`:
   - If true, "Id" in json tags will be uppercase. If false, will be camelcase. Defaults to `false`
 - `json_tags_case_style`:
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -110,6 +110,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 		InflectionExcludeTableNames: s.InflectionExcludeTableNames,
 		QueryParameterLimit:         s.QueryParameterLimit,
 		OmitUnusedStructs:           s.OmitUnusedStructs,
+		EmitSqlAsComment:            s.EmitSqlAsComment,
 	}
 }
 
diff --git a/internal/codegen/golang/result.go b/internal/codegen/golang/result.go
@@ -198,14 +198,25 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
 			constantName = sdk.LowerTitle(query.Name)
 		}
 
+		comments := query.Comments
+		if req.Settings.Go.EmitSqlAsComment {
+			if len(comments) == 0 {
+				comments = append(comments, query.Name)
+			}
+			comments = append(comments, " ")
+			for _, line := range strings.Split(query.Text, "\n") {
+				comments = append(comments, "  "+line)
+			}
+		}
+
 		gq := Query{
 			Cmd:          query.Cmd,
 			ConstantName: constantName,
 			FieldName:    sdk.LowerTitle(query.Name) + "Stmt",
 			MethodName:   query.Name,
 			SourceName:   query.Filename,
 			SQL:          query.Text,
-			Comments:     query.Comments,
+			Comments:     comments,
 			Table:        query.InsertIntoTable,
 		}
 		sqlpkg := parseDriver(req.Settings.Go.SqlPackage)
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -144,6 +144,7 @@ type SQLGo struct {
 	EmitPointersForNullTypes    bool              `json:"emit_pointers_for_null_types" yaml:"emit_pointers_for_null_types"`
 	EmitEnumValidMethod         bool              `json:"emit_enum_valid_method,omitempty" yaml:"emit_enum_valid_method"`
 	EmitAllEnumValues           bool              `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
+	EmitSqlAsComment            bool              `json:"emit_sql_as_comment,omitempty" yaml:"emit_sql_as_comment"`
 	JSONTagsCaseStyle           string            `json:"json_tags_case_style,omitempty" yaml:"json_tags_case_style"`
 	Package                     string            `json:"package" yaml:"package"`
 	Out                         string            `json:"out" yaml:"out"`
diff --git a/internal/config/v_one.go b/internal/config/v_one.go
@@ -39,6 +39,7 @@ type v1PackageSettings struct {
 	EmitPointersForNullTypes  bool       `json:"emit_pointers_for_null_types" yaml:"emit_pointers_for_null_types"`
 	EmitEnumValidMethod       bool       `json:"emit_enum_valid_method,omitempty" yaml:"emit_enum_valid_method"`
 	EmitAllEnumValues         bool       `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
+	EmitSqlAsComment          bool       `json:"emit_sql_as_comment,omitempty" yaml:"emit_sql_as_comment"`
 	JSONTagsCaseStyle         string     `json:"json_tags_case_style,omitempty" yaml:"json_tags_case_style"`
 	SQLPackage                string     `json:"sql_package" yaml:"sql_package"`
 	SQLDriver                 string     `json:"sql_driver" yaml:"sql_driver"`
@@ -178,6 +179,7 @@ func (c *V1GenerateSettings) Translate() Config {
 					OutputFilesSuffix:         pkg.OutputFilesSuffix,
 					QueryParameterLimit:       pkg.QueryParameterLimit,
 					OmitUnusedStructs:         pkg.OmitUnusedStructs,
+					EmitSqlAsComment:          pkg.EmitSqlAsComment,
 				},
 			},
 			StrictFunctionChecks: pkg.StrictFunctionChecks,
diff --git a/internal/config/v_one.json b/internal/config/v_one.json
@@ -128,6 +128,9 @@
                     "emit_all_enum_values": {
                         "type": "boolean"
                     },
+                    "emit_sql_as_comment": {
+                        "type": "boolean"
+                    },
                     "json_tags_case_style": {
                         "type": "string"
                     },
@@ -334,4 +337,4 @@
             }
         }
     }
-}
+}
diff --git a/internal/config/v_two.json b/internal/config/v_two.json
@@ -134,6 +134,9 @@
                                     "emit_all_enum_values": {
                                         "type": "boolean"
                                     },
+                                    "emit_sql_as_comment": {
+                                        "type": "boolean"
+                                    },
                                     "json_tags_case_style": {
                                         "type": "string"
                                     },
@@ -433,4 +436,4 @@
             }
         }
     }
-}
+}
diff --git a/internal/endtoend/testdata/codegen_json/gen/codegen.json b/internal/endtoend/testdata/codegen_json/gen/codegen.json
@@ -43,7 +43,8 @@
       "query_parameter_limit": 1,
       "output_batch_file_name": "",
       "json_tags_id_uppercase": false,
-      "omit_unused_structs": false
+      "omit_unused_structs": false,
+      "emit_sql_as_comment": false
     },
     "json": {
       "out": "gen",
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/db.go b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/db.go
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/models.go b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql
@@ -0,0 +1,10 @@
+CREATE TABLE bar (id serial not null);
+
+-- name: ListBar :many
+-- Lists all bars
+SELECT id FROM (
+  SELECT * FROM bar
+) bar;
+
+-- name: RemoveBar :exec
+DELETE FROM bar WHERE id = $1;
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql",
+      "emit_sql_as_comment": true
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json b/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json
@@ -43,7 +43,8 @@
       "query_parameter_limit": 1,
       "output_batch_file_name": "",
       "json_tags_id_uppercase": false,
-      "omit_unused_structs": false
+      "omit_unused_structs": false,
+      "emit_sql_as_comment": false
     },
     "json": {
       "out": "",
diff --git a/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json b/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json
@@ -43,7 +43,8 @@
       "query_parameter_limit": 1,
       "output_batch_file_name": "",
       "json_tags_id_uppercase": false,
-      "omit_unused_structs": false
+      "omit_unused_structs": false,
+      "emit_sql_as_comment": false
     },
     "json": {
       "out": "",
diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/internal/plugin/codegen_vtproto.pb.go b/internal/plugin/codegen_vtproto.pb.go
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {`
`110`	`110`	`InflectionExcludeTableNames: s.InflectionExcludeTableNames,`
`111`	`111`	`QueryParameterLimit: s.QueryParameterLimit,`
`112`	`112`	`OmitUnusedStructs: s.OmitUnusedStructs,`
	`113`	`+ EmitSqlAsComment: s.EmitSqlAsComment,`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,9 @@`
`128`	`128`	`"emit_all_enum_values": {`
`129`	`129`	`"type": "boolean"`
`130`	`130`	`},`
	`131`	`+ "emit_sql_as_comment": {`
	`132`	`+ "type": "boolean"`
	`133`	`+ },`
`131`	`134`	`"json_tags_case_style": {`
`132`	`135`	`"type": "string"`
`133`	`136`	`},`
`@@ -334,4 +337,4 @@`
`334`	`337`	`}`
`335`	`338`	`}`
`336`	`339`	`}`
`337`		`-}`
	`340`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,9 @@`
`134`	`134`	`"emit_all_enum_values": {`
`135`	`135`	`"type": "boolean"`
`136`	`136`	`},`
	`137`	`+ "emit_sql_as_comment": {`
	`138`	`+ "type": "boolean"`
	`139`	`+ },`
`137`	`140`	`"json_tags_case_style": {`
`138`	`141`	`"type": "string"`
`139`	`142`	`},`
`@@ -433,4 +436,4 @@`
`433`	`436`	`}`
`434`	`437`	`}`
`435`	`438`	`}`
`436`		`-}`
	`439`	`+}`