Skip to content

Commit 4837b07

Browse files
authored
build: Fix conflicts from pointer configuration (#1950)
1 parent 27fffbf commit 4837b07

File tree

9 files changed

+143
-31
lines changed

9 files changed

+143
-31
lines changed

internal/endtoend/testdata/codegen_json/gen/codegen.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"output_files_suffix": "",
3737
"emit_enum_valid_method": false,
3838
"emit_all_enum_values": false,
39-
"inflection_exclude_table_names": []
39+
"inflection_exclude_table_names": [],
40+
"emit_pointers_for_null_types": false
4041
},
4142
"json": {
4243
"out": "gen",

internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/db.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/db.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"output_files_suffix": "",
3737
"emit_enum_valid_method": false,
3838
"emit_all_enum_values": false,
39-
"inflection_exclude_table_names": []
39+
"inflection_exclude_table_names": [],
40+
"emit_pointers_for_null_types": false
4041
},
4142
"json": {
4243
"out": "",

internal/plugin/codegen.pb.go

Lines changed: 97 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/plugin/codegen_vtproto.pb.go

Lines changed: 37 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

protos/plugin/codegen.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ message GoCode
8080
bool emit_result_struct_pointers = 8;
8181
bool emit_params_struct_pointers = 9;
8282
bool emit_methods_with_db_argument = 10;
83-
bool emit_pointers_for_null_types = 19;
8483
string json_tags_case_style = 11;
8584
string package = 12;
8685
string out = 13;
@@ -92,6 +91,7 @@ message GoCode
9291
bool emit_enum_valid_method = 19;
9392
bool emit_all_enum_values = 20;
9493
repeated string inflection_exclude_table_names = 21;
94+
bool emit_pointers_for_null_types = 22;
9595
}
9696

9797
message JSONCode

0 commit comments

Comments
 (0)