Skip to content

CreateTable: add SMALLINT | Remove ColumnSpecification #200

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 3 commits into from
Jan 14, 2022
Merged

CreateTable: add SMALLINT | Remove ColumnSpecification #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ffd945
Add SMALLINT, remove ColumnSpecification
mweisgut Jan 7, 2022
787e47f
address feedback
mweisgut Jan 14, 2022
c115169
formatting
mweisgut Jan 14, 2022
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,627 changes: 1,814 additions & 1,813 deletions src/parser/bison_parser.cpp
View file
Open in desktop

Large diffs are not rendered by default.

392 changes: 194 additions & 198 deletions src/parser/bison_parser.h
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 24 additions & 19 deletions src/parser/bison_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
hsql::Alias* alias_t;
hsql::AlterAction* alter_action_t;
hsql::ColumnDefinition* column_t;
hsql::ColumnSpecification column_specification_t;
hsql::ColumnType column_type_t;
hsql::ConstraintType column_constraint_t;
hsql::DatetimeField datetime_field;
Expand Down Expand Up @@ -151,13 +150,15 @@
std::vector<hsql::TableRef*>* table_vec;
std::vector<hsql::UpdateClause*>* update_vec;
std::vector<hsql::WithDescription*>* with_description_vec;

std::pair<int64_t, int64_t>* ival_pair;
}

/*********************************
** Destructor symbols
*********************************/
// clang-format off
%destructor { } <fval> <ival> <bval> <join_type> <order_type> <datetime_field> <column_type_t> <column_constraint_t> <import_type_t> <column_specification_t> <column_constraint_vec>
%destructor { } <fval> <ival> <bval> <join_type> <order_type> <datetime_field> <column_type_t> <column_constraint_t> <import_type_t> <column_constraint_vec>
%destructor { free( ($$.name) ); free( ($$.schema) ); } <table_name>
%destructor { free( ($$) ); } <sval>
%destructor {
Expand All @@ -182,7 +183,7 @@
%token DEALLOCATE PARAMETERS INTERSECT TEMPORARY TIMESTAMP
%token DISTINCT NVARCHAR RESTRICT TRUNCATE ANALYZE BETWEEN
%token CASCADE COLUMNS CONTROL DEFAULT EXECUTE EXPLAIN
%token INTEGER NATURAL PREPARE PRIMARY SCHEMAS CHARACTER VARYING REAL DECIMAL
%token INTEGER NATURAL PREPARE PRIMARY SCHEMAS CHARACTER VARYING REAL DECIMAL SMALLINT
%token SPATIAL VARCHAR VIRTUAL DESCRIBE BEFORE COLUMN CREATE DELETE DIRECT
%token DOUBLE ESCAPE EXCEPT EXISTS EXTRACT CAST FORMAT GLOBAL HAVING IMPORT
%token INSERT ISNULL OFFSET RENAME SCHEMA SELECT SORTED
Expand Down Expand Up @@ -220,8 +221,8 @@
%type <sval> opt_index_name
%type <sval> file_path prepare_target_query
%type <bval> opt_not_exists opt_exists opt_distinct opt_all
%type <column_specification_t> opt_decimal_specification
%type <column_specification_t> opt_time_specification
%type <ival_pair> opt_decimal_specification
%type <ival> opt_time_precision
%type <join_type> opt_join_type
%type <table> opt_from_clause from_clause table_ref table_ref_atomic table_ref_name nonjoin_table_ref_atomic
%type <table> join_clause table_ref_name_no_alias
Expand Down Expand Up @@ -542,26 +543,30 @@ column_def : IDENTIFIER column_type opt_column_constraints {
};

column_type : INT { $$ = ColumnType{DataType::INT}; }
| CHAR '(' INTVAL ')' { $$ = ColumnType{DataType::CHAR, $3}; }
| CHARACTER VARYING '(' INTVAL ')' { $$ = ColumnType{DataType::VARCHAR, $4}; }
| DATE { $$ = ColumnType{DataType::DATE}; };
| DATETIME { $$ = ColumnType{DataType::DATETIME}; }
| DECIMAL opt_decimal_specification {
$$ = ColumnType{DataType::DECIMAL, 0, $2->first, $2->second};
delete $2;
}
| DOUBLE { $$ = ColumnType{DataType::DOUBLE}; }
| FLOAT { $$ = ColumnType{DataType::FLOAT}; }
| INTEGER { $$ = ColumnType{DataType::INT}; }
| LONG { $$ = ColumnType{DataType::LONG}; }
| FLOAT { $$ = ColumnType{DataType::FLOAT}; }
| DECIMAL opt_decimal_specification { $$ = ColumnType{DataType::DECIMAL, 0, $2}; }
| DOUBLE { $$ = ColumnType{DataType::DOUBLE}; }
| REAL { $$ = ColumnType{DataType::REAL}; }
| VARCHAR '(' INTVAL ')' { $$ = ColumnType{DataType::VARCHAR, $3}; }
| CHARACTER VARYING '(' INTVAL ')' { $$ = ColumnType{DataType::VARCHAR, $4}; }
| CHAR '(' INTVAL ')' { $$ = ColumnType{DataType::CHAR, $3}; }
| SMALLINT { $$ = ColumnType{DataType::SMALLINT}; }
| TEXT { $$ = ColumnType{DataType::TEXT}; }
| TIME opt_time_specification { $$ = ColumnType{DataType::TIME, 0, $2}; }
| DATETIME { $$ = ColumnType{DataType::DATETIME}; }
| DATE { $$ = ColumnType{DataType::DATE}; };
| TIME opt_time_precision { $$ = ColumnType{DataType::TIME, 0, $2}; }
| VARCHAR '(' INTVAL ')' { $$ = ColumnType{DataType::VARCHAR, $3}; }

opt_time_specification : '(' INTVAL ')' { $$ = ColumnSpecification{$2}; }
| /* empty */ { $$ = ColumnSpecification{}; };
opt_time_precision : '(' INTVAL ')' { $$ = $2; }
| /* empty */ { $$ = 0; };

opt_decimal_specification : '(' INTVAL ',' INTVAL ')' { $$ = ColumnSpecification{$2, $4}; }
| '(' INTVAL ')' { $$ = ColumnSpecification{$2}; }
| /* empty */ { $$ = ColumnSpecification{}; };
opt_decimal_specification : '(' INTVAL ',' INTVAL ')' { $$ = new std::pair<int64_t, int64_t>{$2, $4}; }
| '(' INTVAL ')' { $$ = new std::pair<int64_t, int64_t>{$2, 0}; }
| /* empty */ { $$ = new std::pair<int64_t, int64_t>{0, 0}; };

opt_column_constraints : column_constraint_list { $$ = $1; }
| /* empty */ { $$ = new std::vector<ConstraintType>(); };
Expand Down
Loading