Skip to content

parser: remove IMPORT TABLE and IMPORT non-INTO support #148248

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

Merged
merged 2 commits into from
Jun 16, 2025
Merged

parser: remove IMPORT TABLE and IMPORT non-INTO support #148248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
367b51a
parser: remove IMPORT TABLE and IMPORT non-INTO support
yuzefovich Jun 7, 2025
c9b1c1e
tree: remove unused Into and Bundle fields of Import
yuzefovich Jun 7, 2025
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
6 changes: 1 addition & 5 deletions docs/generated/sql/bnf/import_dump.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import_stmt ::=
'IMPORT' import_format file_location 'WITH' kv_option_list
| 'IMPORT' import_format file_location
| 'IMPORT' 'TABLE' table_name 'FROM' import_format file_location 'WITH' kv_option_list
| 'IMPORT' 'TABLE' table_name 'FROM' import_format file_location
| 'IMPORT' 'INTO' table_name '(' insert_column_list ')' import_format 'DATA' '(' file_location ( ( ',' file_location ) )* ')' 'WITH' kv_option_list
'IMPORT' 'INTO' table_name '(' insert_column_list ')' import_format 'DATA' '(' file_location ( ( ',' file_location ) )* ')' 'WITH' kv_option_list
| 'IMPORT' 'INTO' table_name '(' insert_column_list ')' import_format 'DATA' '(' file_location ( ( ',' file_location ) )* ')'
| 'IMPORT' 'INTO' table_name import_format 'DATA' '(' file_location ( ( ',' file_location ) )* ')' 'WITH' kv_option_list
| 'IMPORT' 'INTO' table_name import_format 'DATA' '(' file_location ( ( ',' file_location ) )* ')'
40 changes: 19 additions & 21 deletions docs/generated/sql/bnf/stmt_block.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,7 @@ explain_stmt ::=
| 'EXPLAIN' 'ANALYSE' '(' explain_option_list ')' explainable_stmt

import_stmt ::=
'IMPORT' import_format string_or_placeholder opt_with_options
| 'IMPORT' 'TABLE' table_name 'FROM' import_format string_or_placeholder opt_with_options
| 'IMPORT' 'INTO' table_name '(' insert_column_list ')' import_format 'DATA' '(' string_or_placeholder_list ')' opt_with_options
'IMPORT' 'INTO' table_name '(' insert_column_list ')' import_format 'DATA' '(' string_or_placeholder_list ')' opt_with_options
| 'IMPORT' 'INTO' table_name import_format 'DATA' '(' string_or_placeholder_list ')' opt_with_options

insert_stmt ::=
Expand Down Expand Up @@ -719,24 +717,20 @@ explainable_stmt ::=
explain_option_list ::=
( explain_option_name ) ( ( ',' explain_option_name ) )*

insert_column_list ::=
( insert_column_item ) ( ( ',' insert_column_item ) )*

import_format ::=
name

string_or_placeholder ::=
non_reserved_word_or_sconst
| 'PLACEHOLDER'
string_or_placeholder_list ::=
( string_or_placeholder ) ( ( ',' string_or_placeholder ) )*

opt_with_options ::=
'WITH' kv_option_list
| 'WITH' 'OPTIONS' '(' kv_option_list ')'
|

insert_column_list ::=
( insert_column_item ) ( ( ',' insert_column_item ) )*

string_or_placeholder_list ::=
( string_or_placeholder ) ( ( ',' string_or_placeholder ) )*

insert_target ::=
table_name_opt_idx
| table_name_opt_idx 'AS' table_alias_name
Expand Down Expand Up @@ -775,6 +769,10 @@ reset_session_stmt ::=
reset_csetting_stmt ::=
'RESET' 'CLUSTER' 'SETTING' var_name

string_or_placeholder ::=
non_reserved_word_or_sconst
| 'PLACEHOLDER'

opt_with_restore_options ::=
'WITH' restore_options_list
| 'WITH' 'OPTIONS' '(' restore_options_list ')'
Expand Down Expand Up @@ -2032,16 +2030,12 @@ drop_policy_stmt ::=
explain_option_name ::=
non_reserved_word

non_reserved_word_or_sconst ::=
non_reserved_word
| 'SCONST'
insert_column_item ::=
column_name

kv_option_list ::=
( kv_option ) ( ( ',' kv_option ) )*

insert_column_item ::=
column_name

session_var ::=
'identifier'
| 'identifier' session_var_parts
Expand All @@ -2059,6 +2053,10 @@ var_name ::=
name
| name attrs

non_reserved_word_or_sconst ::=
non_reserved_word
| 'SCONST'

restore_options_list ::=
( restore_options ) ( ( ',' restore_options ) )*

Expand Down Expand Up @@ -2925,15 +2923,15 @@ non_reserved_word ::=
| col_name_keyword
| type_func_name_keyword

column_name ::=
name

kv_option ::=
name '=' string_or_placeholder
| name
| 'SCONST' '=' string_or_placeholder
| 'SCONST'

column_name ::=
name

session_var_parts ::=
( '.' 'identifier' ) ( ( '.' 'identifier' ) )*

Expand Down
1 change: 0 additions & 1 deletion pkg/internal/sqlsmith/bulkio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ func makeImport(s *Smither) (tree.Statement, bool) {

return &tree.Import{
Table: tree.NewUnqualifiedTableName(tab),
Into: true,
FileFormat: "CSV",
Files: files,
Options: tree.KVOptions{
Expand Down
1 change: 1 addition & 0 deletions pkg/jobs/jobspb/jobs.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ message ImportDetails {
bool schemas_published = 24;
bool tables_published = 13;

// TODO(yuzefovich): remove this.
bool parse_bundle_schema = 14;

// DefaultIntSize is the integer type that a "naked" int will be resolved
Expand Down
1 change: 0 additions & 1 deletion pkg/sql/importer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ go_library(
"//pkg/jobs/joberror",
"//pkg/jobs/jobspb",
"//pkg/jobs/jobsprofiler",
"//pkg/keys",
"//pkg/kv",
"//pkg/kv/kvpb",
"//pkg/kv/kvserver/kvserverbase",
Expand Down
Loading