diff --git a/extra/mkkeywordhash.c b/extra/mkkeywordhash.c index d498fb747a769b89cdfb238dcd06948a28aeed00..bb706ac01dec39ae4fa2eee50ecddf003183e28e 100644 --- a/extra/mkkeywordhash.c +++ b/extra/mkkeywordhash.c @@ -93,6 +93,7 @@ static Keyword aKeywordTable[] = { { "DISTINCT", "TK_DISTINCT", true }, { "DROP", "TK_DROP", true }, { "END", "TK_END", true }, + { "ENGINE", "TK_ENGINE", true }, { "EACH", "TK_EACH", true }, { "ELSE", "TK_ELSE", true }, { "ESCAPE", "TK_ESCAPE", true }, diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y index ca6df0a40907c4b94a1b98c364eeedb17fad867a..be3c5c3991bfdcef81036481846dd29eb6d0f278 100644 --- a/src/box/sql/parse.y +++ b/src/box/sql/parse.y @@ -177,7 +177,7 @@ cmd ::= ROLLBACK TO savepoint_opt nm(X). { ///////////////////// The CREATE TABLE statement //////////////////////////// // -cmd ::= create_table create_table_args. +cmd ::= create_table create_table_args with_opts create_table_end. create_table ::= createkw TABLE ifnotexists(E) nm(Y). { create_table_def_init(&pParse->create_table_def, &Y, E); pParse->create_table_def.new_space = sqlStartTable(pParse, &Y); @@ -189,10 +189,31 @@ createkw(A) ::= CREATE(A). {disableLookaside(pParse);} ifnotexists(A) ::= . {A = 0;} ifnotexists(A) ::= IF NOT EXISTS. {A = 1;} -create_table_args ::= LP columnlist RP. { - sqlEndTable(pParse); +create_table_args ::= LP columnlist RP. + +with_opts ::= WITH engine_opts. +with_opts ::= . + +engine_opts ::= ENGINE EQ STRING(A). { + /* Note that specifying engine clause overwrites default engine. */ + if (A.n > ENGINE_NAME_MAX) { + diag_set(ClientError, ER_CREATE_SPACE, + pParse->create_table_def.new_space->def->name, + "space engine name is too long"); + pParse->is_aborted = true; + return; + } + /* Need to dequote name. */ + char *normalized_name = sql_name_from_token(pParse->db, &A); + if (normalized_name == NULL) + return; + memcpy(pParse->create_table_def.new_space->def->engine_name, normalized_name, + strlen(normalized_name) + 1); + sqlDbFree(pParse->db, normalized_name); } +create_table_end ::= . { sqlEndTable(pParse); } + /* * CREATE TABLE AS SELECT is broken. To be re-implemented * in gh-3223. diff --git a/test/sql/engine.result b/test/sql/engine.result index cee9f7f32e6a5b2ef42f766179fc8763d78728ee..3ee93ad198bac5908fd1fef6d789cc404a0228e8 100644 --- a/test/sql/engine.result +++ b/test/sql/engine.result @@ -48,3 +48,88 @@ box.execute("DROP TABLE t3_memtx;") --- - row_count: 1 ... +-- gh-4422: allow to specify engine in CREATE TABLE statement. +-- +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'vinyl'") +--- +- row_count: 1 +... +assert(box.space.T1_VINYL.engine == 'vinyl') +--- +- true +... +box.execute("CREATE TABLE t1_memtx (id INT PRIMARY KEY) WITH ENGINE = 'memtx'") +--- +- row_count: 1 +... +assert(box.space.T1_MEMTX.engine == 'memtx') +--- +- true +... +box.execute("pragma sql_default_engine='vinyl'") +--- +- row_count: 0 +... +box.execute("CREATE TABLE t2_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'vinyl'") +--- +- row_count: 1 +... +assert(box.space.T2_VINYL.engine == 'vinyl') +--- +- true +... +box.execute("CREATE TABLE t2_memtx (id INT PRIMARY KEY) WITH ENGINE = 'memtx'") +--- +- row_count: 1 +... +assert(box.space.T2_MEMTX.engine == 'memtx') +--- +- true +... +box.space.T1_VINYL:drop() +--- +... +box.space.T1_MEMTX:drop() +--- +... +box.space.T2_VINYL:drop() +--- +... +box.space.T2_MEMTX:drop() +--- +... +-- Name of engine considered to be string literal, so should be +-- lowercased and quoted. +-- +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = VINYL") +--- +- null +- Syntax error near 'VINYL' +... +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = vinyl") +--- +- null +- Syntax error near 'vinyl' +... +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'VINYL'") +--- +- null +- Space engine 'VINYL' does not exist +... +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = \"vinyl\"") +--- +- null +- Syntax error near '"vinyl"' +... +-- Make sure that wrong engine name is handled properly. +-- +box.execute("CREATE TABLE t_wrong_engine (id INT PRIMARY KEY) WITH ENGINE = 'abc'") +--- +- null +- Space engine 'abc' does not exist +... +box.execute("CREATE TABLE t_long_engine_name (id INT PRIMARY KEY) WITH ENGINE = 'very_long_engine_name'") +--- +- null +- 'Failed to create space ''T_LONG_ENGINE_NAME'': space engine name is too long' +... diff --git a/test/sql/engine.test.lua b/test/sql/engine.test.lua index 51d6939e7d8f84ca5b22f414a8d246260e551558..112d3d3ffb162e5b757c68db1c5295e24fdb1005 100644 --- a/test/sql/engine.test.lua +++ b/test/sql/engine.test.lua @@ -15,3 +15,33 @@ assert(box.space.T3_MEMTX.engine == 'memtx') box.execute("DROP TABLE t1_vinyl;") box.execute("DROP TABLE t2_vinyl;") box.execute("DROP TABLE t3_memtx;") + +-- gh-4422: allow to specify engine in CREATE TABLE statement. +-- +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'vinyl'") +assert(box.space.T1_VINYL.engine == 'vinyl') +box.execute("CREATE TABLE t1_memtx (id INT PRIMARY KEY) WITH ENGINE = 'memtx'") +assert(box.space.T1_MEMTX.engine == 'memtx') +box.execute("pragma sql_default_engine='vinyl'") +box.execute("CREATE TABLE t2_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'vinyl'") +assert(box.space.T2_VINYL.engine == 'vinyl') +box.execute("CREATE TABLE t2_memtx (id INT PRIMARY KEY) WITH ENGINE = 'memtx'") +assert(box.space.T2_MEMTX.engine == 'memtx') + +box.space.T1_VINYL:drop() +box.space.T1_MEMTX:drop() +box.space.T2_VINYL:drop() +box.space.T2_MEMTX:drop() + +-- Name of engine considered to be string literal, so should be +-- lowercased and quoted. +-- +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = VINYL") +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = vinyl") +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = 'VINYL'") +box.execute("CREATE TABLE t1_vinyl (id INT PRIMARY KEY) WITH ENGINE = \"vinyl\"") + +-- Make sure that wrong engine name is handled properly. +-- +box.execute("CREATE TABLE t_wrong_engine (id INT PRIMARY KEY) WITH ENGINE = 'abc'") +box.execute("CREATE TABLE t_long_engine_name (id INT PRIMARY KEY) WITH ENGINE = 'very_long_engine_name'")