diff --git a/doc/sql/query.ebnf b/doc/sql/query.ebnf index ff923d08fdf3ea2a15fdd57986bfc76b1ee50e34..5b0276c5ee19e19b2efb6b398d1dbc55404b1f4a 100644 --- a/doc/sql/query.ebnf +++ b/doc/sql/query.ebnf @@ -59,7 +59,7 @@ literal ::= 'TRUE' | decimal | string -dml ::= (call | delete | insert | update) +dml ::= (call | delete | insert | update) ( 'OPTION' '(' (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned) (',' (('VTABLE_MAX_ROWS' | 'SQL_VDBE_MAX_STEPS') '=' unsigned))* @@ -143,7 +143,7 @@ create_procedure ::= 'CREATE' 'PROCEDURE' procedure '(' type (',' type)* ')' create_role ::= 'CREATE' 'ROLE' role create_table ::= 'CREATE' 'TABLE' table '(' - column type ('NOT'? 'NULL')? (',' column type ('NOT'? 'NULL')?)* ',' + column type ('NOT'? 'NULL')? (',' column type ('NOT'? 'NULL')?)* ',' 'PRIMARY KEY' '(' column (',' column)* ')' ')' ('USING' ('MEMTX' | 'VINYL'))? diff --git a/sbroad-core/src/frontend/sql/query.pest b/sbroad-core/src/frontend/sql/query.pest index 76cfe9bff87cb2d0c8d0f026c6615929c0fddc3a..3340855810d5e9874d18852dd34ac95312f87bed 100644 --- a/sbroad-core/src/frontend/sql/query.pest +++ b/sbroad-core/src/frontend/sql/query.pest @@ -97,7 +97,7 @@ DDL = _{ CreateTable | DropTable | CreateIndex | DropIndex | CreateProc | DropPr CreateIndex = { ^"create" ~ Unique? ~ ^"index" ~ Identifier ~ ^"on" ~ Table - ~ IndexType? ~ "(" ~ Parts ~ ")" ~ IndexOptions? ~ TimeoutOption? + ~ IndexType? ~ "(" ~ Parts ~ ")" ~ IndexOptions? ~ TimeoutOption? } Unique = { ^"unique" } IndexType = { ^"using" ~ (Tree | Hash | RTree | BitSet) } @@ -115,7 +115,7 @@ DDL = _{ CreateTable | DropTable | CreateIndex | DropIndex | CreateProc | DropPr RunCountPerLevel = { ^"run_count_per_level" ~ "=" ~Unsigned } RunSizeRatio = { ^"run_size_ratio" ~ "=" ~ Decimal } Dimension = { ^"dimension" ~ "=" ~ Unsigned } - Distance = { ^"distance" ~ "=" ~ (Euclid | Manhattan) } + Distance = { ^"distance" ~ "=" ~ (Euclid | Manhattan) } Euclid = { ^"euclid" } Manhattan = { ^"manhattan" } Hint = { ^"hint" ~ "=" ~ (True | False) }