database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

MDEV-20924 Unify grammar rules: field_type_string and sp_param_field_type_string

Browse Source 
In order to:
- unify sql_yacc.yy and sql_yacc_ora.yy easier
- move more functionality from the parser to Type_handler
  (so plugins can override the behavior)

this patch:
- removes rules sp_param_field_type_string and sp_param_field_type
  from sql_yacc_ora.yy
- adds a new virtial method Type_handler::Column_definition_set_attributes()
This commit is contained in:
Alexander Barkov
2019-10-30 11:56:13 +04:00
parent 0ccfdc8eff
commit f2cff12556
8 changed files with 222 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/sql_type.h
View File

@@ -127,6 +127,15 @@ enum partition_value_print_mode_t
};
enum column_definition_type_t
{
COLUMN_DEFINITION_TABLE_FIELD,
COLUMN_DEFINITION_ROUTINE_PARAM,
COLUMN_DEFINITION_ROUTINE_LOCAL,
COLUMN_DEFINITION_FUNCTION_RETURN
};
class Data_type_statistics
{
public:
@@ -3620,6 +3629,13 @@ public:
virtual bool Column_definition_validate_check_constraint(THD *thd,
Column_definition *c)
const;
// Set attributes in the parser
virtual bool Column_definition_set_attributes(THD *thd,
Column_definition *def,
const Lex_field_type_st &attr,
CHARSET_INFO *cs,
column_definition_type_t type)
const;
// Fix attributes after the parser
virtual bool Column_definition_fix_attributes(Column_definition *c) const= 0;
/*
@@ -6488,6 +6504,12 @@ public:
Field *make_conversion_table_field(MEM_ROOT *root,
TABLE *table, uint metadata,
const Field *target) const override;
bool Column_definition_set_attributes(THD *thd,
Column_definition *def,
const Lex_field_type_st &attr,
CHARSET_INFO *cs,
column_definition_type_t type)
const override;
bool Column_definition_fix_attributes(Column_definition *c) const override;
bool Column_definition_prepare_stage2(Column_definition *c,
handler *file,
@@ -6581,6 +6603,12 @@ public:
Field *make_conversion_table_field(MEM_ROOT *root,
TABLE *table, uint metadata,
const Field *target) const override;
bool Column_definition_set_attributes(THD *thd,
Column_definition *def,
const Lex_field_type_st &attr,
CHARSET_INFO *cs,
column_definition_type_t type)
const override;
bool Column_definition_fix_attributes(Column_definition *c) const override;
bool Column_definition_prepare_stage2(Column_definition *c,
handler *file,