Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Fix conflicts from pointer configuration #1950

Merged
merged 1 commit into from
Nov 10, 2022
+143 −31
Merged

build: Fix conflicts from pointer configuration #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/endtoend/testdata/codegen_json/gen/codegen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/endtoend/testdata/emit_pointers_for_null_types/pgx/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/endtoend/testdata/emit_pointers_for_null_types/stdlib/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
107 changes: 97 additions & 10 deletions internal/plugin/codegen.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 37 additions & 14 deletions internal/plugin/codegen_vtproto.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion protos/plugin/codegen.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down