build: Fix conflicts from pointer configuration (sqlc-dev#1950)

akutschera · Nov 10, 2022 · b609567 · b609567
1 parent 5b5d381
commit b609567
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 31 deletions.
diff --git a/internal/endtoend/testdata/codegen_json/gen/codegen.json b/internal/endtoend/testdata/codegen_json/gen/codegen.json
@@ -36,7 +36,8 @@
       "output_files_suffix": "",
       "emit_enum_valid_method": false,
       "emit_all_enum_values": false,
-      "inflection_exclude_table_names": []
+      "inflection_exclude_table_names": [],
+      "emit_pointers_for_null_types": false
     },
     "json": {
       "out": "gen",

diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/db.go b/internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/db.go
diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/models.go b/internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/models.go
diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/db.go b/internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/db.go
diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/models.go b/internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/models.go
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
@@ -36,7 +36,8 @@
       "output_files_suffix": "",
       "emit_enum_valid_method": false,
       "emit_all_enum_values": false,
-      "inflection_exclude_table_names": []
+      "inflection_exclude_table_names": [],
+      "emit_pointers_for_null_types": 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
@@ -80,7 +80,6 @@ message GoCode
   bool emit_result_struct_pointers = 8;
   bool emit_params_struct_pointers = 9;
   bool emit_methods_with_db_argument = 10;
-  bool emit_pointers_for_null_types = 19;
   string json_tags_case_style = 11;
   string package = 12;
   string out = 13;
@@ -92,6 +91,7 @@ message GoCode
   bool emit_enum_valid_method = 19;
   bool emit_all_enum_values = 20;
   repeated string inflection_exclude_table_names = 21;
+  bool emit_pointers_for_null_types = 22;
 }
 
 message JSONCode