database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

Merge pull request #2 from LinuxJedi/MCOL-264

Browse Source 
Fix DDL parser for spaces in table options
This commit is contained in:
dhall-InfiniDB
2016-09-02 09:15:11 -05:00
committed by GitHub
parent 1a7883f98b acb078d07d
commit 75ecb950f9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/ddlpackage/ddl.y
View File

@@ -66,7 +66,7 @@ void ddlerror(struct pass_to_bison* x, char const *s);
char* copy_string(const char *str);
%}
%expect 15
%expect 16
%pure-parser
%lex-param {void * scanner}
%parse-param {struct ddlpackage::pass_to_bison * x}
@@ -454,25 +454,29 @@ table_options:
}
;
opt_equal:
{} | '=' {}
;
table_option:
ENGINE '=' IDENT {$$ = new pair<string,string>("engine", $3);}
ENGINE opt_equal IDENT {$$ = new pair<string,string>("engine", $3);}
|
MAX_ROWS '=' ICONST {$$ = new pair<string,string>("max_rows", $3);}
MAX_ROWS opt_equal ICONST {$$ = new pair<string,string>("max_rows", $3);}
|
MIN_ROWS '=' ICONST {$$ = new pair<string,string>("min_rows", $3);}
MIN_ROWS opt_equal ICONST {$$ = new pair<string,string>("min_rows", $3);}
|
COMMENT '=' string_literal {$$ = new pair<string,string>("comment", $3);}
COMMENT opt_equal string_literal {$$ = new pair<string,string>("comment", $3);}
|
COMMENT string_literal {$$ = new pair<string,string>("comment", $2);}
|
AUTO_INCREMENT '=' ICONST
AUTO_INCREMENT opt_equal ICONST
{
$$ = new pair<string,string>("auto_increment", $3);
}
|
DEFAULT CHARSET '=' IDENT {$$ = new pair<string,string>("default charset", $4);}
DEFAULT CHARSET opt_equal IDENT {$$ = new pair<string,string>("default charset", $4);}
|
DEFAULT IDB_CHAR SET '=' IDENT {$$ = new pair<string,string>("default charset", $5);}
DEFAULT IDB_CHAR SET opt_equal IDENT {$$ = new pair<string,string>("default charset", $5);}
;
alter_table_statement: