Skip to content

Commit ce902f1

Browse files
committed
Remove PrepareContext from DBTX unless emit_prepared_queries: true
sqlc's generated code doesn't use that method (unless emit_prepared_queries is enabled). Let's exclude it from the generated interface so that people providing a custom DBTX don't have to implement a unused function. This is a minor backwards compatibility break, if someone used the generated DBTX for other code that did actually call PrepareContext.
1 parent 8c59fbb commit ce902f1

File tree

409 files changed

+2
-408
lines changed
  • examples
  • internal
    • codegen/golang/templates/stdlib
    • endtoend/testdata
      • alias
      • any/stdlib/go
      • array_in/stdlib/go
      • array_text/stdlib/go
      • array_text_join/stdlib/go
      • between_args
      • builtins
      • case_named_params
      • case_sensitive/sqlite/go
      • case_stmt_bool/stdlib/go
      • case_text/stdlib/go
      • cast_coalesce/stdlib/go
      • cast_null/stdlib/go
      • cast_param/sqlite/go
      • citext/stdlib/go
      • coalesce
      • coalesce_as
      • coalesce_join/postgresql/go
      • codegen_struct_field_names/stdlib/go
      • column_as
      • comment_on/postgresql/stdlib/go
      • comment_syntax
      • comparisons
      • composite_type/stdlib/go
      • conflicted_arg_name/postgresql/db
      • copyfrom/mysql/go
      • count_star
      • create_materialized_view/postgresql/go
      • create_table_as/postgresql/go
      • create_table_like
      • create_view
      • cte_count
      • cte_filter
      • cte_in_delete
      • cte_recursive
      • data_type_boolean
      • datatype
      • ddl_alter_table_add_column
      • ddl_alter_table_add_column_if_not_exists/postgresql/stdlib/go
      • ddl_alter_table_alter_type
      • ddl_alter_table_change_column
      • ddl_alter_table_column_drop_not_null
      • ddl_alter_table_drop_column
      • ddl_alter_table_drop_column_if_exists
      • ddl_alter_table_drop_constraint
      • ddl_alter_table_if_exists/postgresql/stdlib/go
      • ddl_alter_table_index/postgresql/stdlib/go
      • ddl_alter_table_rename
      • ddl_alter_table_rename_column
      • ddl_alter_table_set_data_type
      • ddl_alter_table_set_not_null
      • ddl_alter_table_set_schema/postgresql/stdlib/go
      • ddl_alter_type_add_value/postgresql/stdlib/go
      • ddl_alter_type_rename/postgresql/stdlib/go
      • ddl_alter_type_rename_and_update_columns/postgresql/stdlib/go
      • ddl_alter_type_rename_value/postgresql/stdlib/go
      • ddl_alter_type_set_schema/postgresql/stdlib/go
      • ddl_comment
      • ddl_create_enum
      • ddl_create_function/postgresql/stdlib/go
      • ddl_create_function_args/postgresql/stdlib/go
      • ddl_create_function_return/postgresql/stdlib/go
      • ddl_create_function_types/postgresql/stdlib/go
      • ddl_create_procedure/postgresql/stdlib/go
      • ddl_create_table
      • ddl_create_table_include/postgresql/stdlib/go
      • ddl_create_table_inherits/postgresql/stdlib/go
      • ddl_create_table_partition/postgresql/stdlib/go
      • ddl_create_table_reserved
      • ddl_create_table_strict/sqlite/go
      • ddl_create_table_without_rowid/sqlite/go
      • ddl_create_trigger
      • ddl_drop_function/postgresql/stdlib/go
      • ddl_drop_function_args/postgresql/stdlib/go
      • ddl_drop_function_if_exists/postgresql/stdlib/go
      • ddl_drop_schema
      • ddl_drop_schema_if_exists/postgresql/stdlib/go
      • ddl_drop_table
      • ddl_drop_table_if_exists
      • ddl_drop_table_in_schema/postgresql/stdlib/go
      • ddl_drop_type/postgresql/stdlib/go
      • ddl_drop_type_if_exists/postgresql/stdlib/go
      • ddl_drop_type_in_schema/postgresql/stdlib/go
      • ddl_generated_columns/postgresql/stdlib/go
      • ddl_pg_temp/postgresql/stdlib/go
      • delete_from
      • delete_inner_join/mysql/go
      • delete_join/mysql/db
      • diff_no_output/go
      • diff_output/go
      • emit_db_and_json_tags
      • emit_db_tags
      • emit_empty_slices/stdlib/go
      • emit_exported_queries/stdlib/go
      • emit_methods_with_db_argument
      • emit_pointers_for_null_types/stdlib/go
      • emit_result_and_params_struct_pointers/mysql/go
      • enum
      • enum_ordering/postgresql/stdlib/go
      • exec_imports/stdlib/go
      • exec_lastid/go_postgresql_stdlib/go
      • exec_result/go_postgresql_stdlib/go
      • exec_rows/go_postgresql_stdlib/go
      • full_outer_join/sqlite/go
      • func_aggregate/go
      • func_args/stdlib/go
      • func_args_typecast/stdlib/go
      • func_call_cast
      • func_match_types
      • func_return/postgresql/stdlib/go
      • func_variadic/postgresql/stdlib/go
      • having
      • hstore/stdlib/go
      • identical_tables
      • identifier_case_sensitivity/db
      • identifier_dollar_sign/db
      • inflection
      • insert_cte/stdlib/go
      • insert_select
      • insert_values
      • insert_values_public
      • interval/stdlib/go
      • join_alias
      • join_clauses_order/postgresql/go
      • join_from
      • join_full/postgresql/go
      • join_group_by_alias/postgresql/stdlib/go
      • join_inner/postgresql/go
      • join_left
      • join_left_same_table
      • join_order_by_alias/postgresql/stdlib/go
      • join_right
      • join_table_name
      • join_two_tables
      • join_where_clause
      • json
      • json_build/postgresql/stdlib/go
      • json_tags
        • camel_case/postgresql/stdlib/go
        • pascal_case/postgresql/stdlib/go
        • snake_case/postgresql/stdlib/go
      • json_tags_null_enum
        • camel_case/postgresql/stdlib/go
        • none/postgresql/stdlib/go
        • pascal_case/postgresql/stdlib/go
        • snake_case/postgresql/stdlib/go
        • v2_config/postgresql/stdlib/go
      • limit
      • lower/stdlib/go
      • lower_switched_order/stdlib/go
      • materialized_views/postgresql/stdlib/go
      • mathmatical_operator/stdlib/go
      • missing_semicolon/mysql/go
      • mix_param_types
      • multidimension_array/stdlib/go
      • multischema/stdlib/go
      • mysql_reference_manual
        • aggregate_functions/go
        • date_and_time_functions/go
      • named_param
      • nextval/postgresql/go
      • omit_unused_structs/postgresql/stdlib/go
      • on_duplicate_key_update
      • operator_string_concat/postgresql/stdlib/go
      • order_by_binds
      • order_by_union
      • output_file_names/stdlib/go
      • output_files_suffix/stdlib/go
      • overrides
      • overrides_array/postgresql/stdlib/query
      • overrides_go_struct_tags
      • overrides_go_types
      • overrides_nullable/postgresql/stdlib/go
      • overrides_pointers
      • overrides_result_tag/stdlib/go
      • overrides_unsigned/mysql/go
      • params_duplicate
      • params_location
      • params_placeholder_in_left_expr
      • params_two
      • pattern_in_expr/mysql/go
      • pattern_matching
      • pg_advisory_xact_lock/postgresql/stdlib/go
      • pg_dump/db
      • pg_ext_ltree/postgresql/stdlib/go
      • pg_extensions/postgresql/stdlib/go
      • pg_generate_series/postgresql/stdlib/go
      • pg_timezone_names/go_stdlib
      • pg_user_table/postgresql/stdlib/go
      • primary_key_later/postgresql/stdlib/go
      • query_parameter_limit_to_two/postgresql/go
      • query_parameter_limit_to_zero/postgresql/go
      • quoted_colname/sqlite/go
      • rename
      • returning
      • schema_scoped_create
      • schema_scoped_delete
      • schema_scoped_enum/stdlib/go
      • schema_scoped_filter
      • schema_scoped_list
      • schema_scoped_update
      • select_column_cast
      • select_cte/sqlite/go
      • select_distinct/stdlib/go
      • select_empty_column_list/postgresql/stdlib/go
      • select_exists
      • select_in_and/sqlite/go
      • select_limit
      • select_nested_count
      • select_not_exists
      • select_star
      • select_star_quoted
      • select_text_array/stdlib/go
      • select_union
      • selectstatic/mysql/go
      • show_warnings/mysql/go
      • single_param_conflict
      • sql_syntax_calling_funcs/postgresql/stdlib/go
      • sqlc_arg
      • sqlc_embed
      • sqlc_narg
      • sqlc_slice
      • sqlite_table_options/sqlite/go
      • star_expansion
      • star_expansion_cte/stdlib/go
      • star_expansion_from_cte/stdlib/go
      • star_expansion_join
      • star_expansion_reserved
      • star_expansion_subquery
      • subquery_calculated_column
      • table_function
      • truncate
      • types_uuid/postgresql/stdlib/go
      • unknown_func/stdlib/go
      • unnest/postgresql/stdlib/go
      • unnest_with_ordinality/postgresql/stdlib/go
      • unsigned_params/mysql/go
      • untyped_columns/sqlite/stdlib/db
      • update_cte/stdlib/go
      • update_inner_join/db
      • update_join
      • update_set
      • update_set_multiple
      • update_two_table/mysql/go
      • upsert/sqlite/go
      • valid_group_by_reference
      • vet_explain/mysql/db
      • virtual_table/sqlite/go
      • where_collate/sqlite/go
      • yaml_overrides/go

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+2
-408
lines changed

examples/authors/mysql/db.go

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

examples/authors/postgresql/db.go

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

examples/authors/sqlite/db.go

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

examples/booktest/mysql/db.go

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

examples/booktest/postgresql/db.go

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

examples/booktest/sqlite/db.go

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

examples/jets/postgresql/db.go

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

internal/codegen/golang/templates/stdlib/dbCode.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{{define "dbCodeTemplateStd"}}
22
type DBTX interface {
33
ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
4+
{{- if .EmitPreparedQueries}}
45
PrepareContext(context.Context, string) (*sql.Stmt, error)
6+
{{- end}}
57
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
68
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
79
}

internal/endtoend/testdata/alias/mysql/go/db.go

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

internal/endtoend/testdata/alias/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/alias/sqlite/go/db.go

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

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

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

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

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

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

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

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

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

internal/endtoend/testdata/between_args/mysql/go/db.go

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

internal/endtoend/testdata/between_args/sqlite/go/db.go

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

internal/endtoend/testdata/builtins/postgresql/go/db.go

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

internal/endtoend/testdata/builtins/sqlite/go/db.go

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

internal/endtoend/testdata/case_named_params/mysql/go/db.go

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

internal/endtoend/testdata/case_named_params/postgresql/go/db.go

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

internal/endtoend/testdata/case_sensitive/sqlite/go/db.go

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

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

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

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

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

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

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

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

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

internal/endtoend/testdata/cast_param/sqlite/go/db.go

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

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

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

internal/endtoend/testdata/coalesce/mysql/go/db.go

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

internal/endtoend/testdata/coalesce/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/coalesce/sqlite/go/db.go

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

internal/endtoend/testdata/coalesce_as/mysql/go/db.go

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

internal/endtoend/testdata/coalesce_as/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/coalesce_as/sqlite/go/db.go

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

internal/endtoend/testdata/coalesce_join/postgresql/go/db.go

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

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

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

internal/endtoend/testdata/column_as/mysql/go/db.go

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

internal/endtoend/testdata/column_as/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/column_as/sqlite/go/db.go

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

internal/endtoend/testdata/comment_on/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/comment_syntax/mysql/go/db.go

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

internal/endtoend/testdata/comment_syntax/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/comment_syntax/sqlite/go/db.go

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

internal/endtoend/testdata/comparisons/mysql/go/db.go

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

internal/endtoend/testdata/comparisons/postgresql/stdlib/go/db.go

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

internal/endtoend/testdata/comparisons/sqlite/go/db.go

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

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

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

internal/endtoend/testdata/conflicted_arg_name/postgresql/db/db.go

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

internal/endtoend/testdata/copyfrom/mysql/go/db.go

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

0 commit comments

Comments
 (0)