hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1391 Parse CREATE OR REPLACE

Browse Source
This commit is contained in:
Johan Wikman 2017-09-25 14:24:42 +03:00
parent 621b66ab13
commit 8ef8343f5c
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
query_classifier/qc_sqlite/CMakeLists.txt
View File

@ -21,7 +21,11 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=array-bounds")
add_library(qc_sqlite SHARED qc_sqlite.cc qc_sqlite3.c builtin_functions.c)
add_dependencies(qc_sqlite maxscale_sqlite)
add_definitions(-DMAXSCALE -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA)
# If you feel a need to add something here, check also the handling of 'enable_maxscale'
# in sqlite-src-3110100/configure.
# In configure we have defined SQLITE_OMIT_VIRTUALTABLE, but it cannot be defined here,
# although conceptually is should, as one needed static function in case will be missing.
add_definitions(-DMAXSCALE -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA )
set_target_properties(qc_sqlite PROPERTIES VERSION "1.0.0")
set_target_properties(qc_sqlite PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/qc_sqlite.map)

4
query_classifier/qc_sqlite/sqlite-src-3110100/configure vendored
View File

@ -11506,7 +11506,9 @@ else
fi
if test "${enable_maxscale}" = "yes" ; then
OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DMAXSCALE -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA"
# If something is added here, check the obvious 'add_definitions'
# in ../CMakeLists.txt
OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DMAXSCALE -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA -DSQLITE_OMIT_VIRTUALTABLE"
fi
#########

16
query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
View File

@ -384,10 +384,21 @@ create_table ::= createkw temp(T) TABLE ifnotexists(E) nm(Y) dbnm(Z). {
sqlite3StartTable(pParse,&Y,&Z,T,0,0,E);
#endif
}
%ifdef MAXSCALE
or_replace_opt ::= .
or_replace_opt ::= OR REPLACE.
createkw(A) ::= CREATE(X) or_replace_opt. {
disableLookaside(pParse);
A = X;
}
%endif
%ifndef MAXSCALE
createkw(A) ::= CREATE(X). {
disableLookaside(pParse);
A = X;
}
%endif
%type ifnotexists {int}
ifnotexists(A) ::= . {A = 0;}
ifnotexists(A) ::= IF NOT EXISTS. {A = 1;}
@ -904,9 +915,6 @@ ifexists(A) ::= . {A = 0;}
//
%ifndef SQLITE_OMIT_VIEW
%ifdef MAXSCALE
or_replace_opt ::= .
or_replace_opt ::= OR REPLACE.
%type algorithm {int}
algorithm(A) ::= UNDEFINED. {A=0;}
algorithm(A) ::= MERGE. {A=0;}
@ -916,7 +924,7 @@ algorithm(A) ::= TEMPTABLE. {A=1;}
algorithm_opt(A) ::= . {A=0;}
algorithm_opt(A) ::= ALGORITHM EQ algorithm(X). {A=X;}
cmd ::= createkw(X) or_replace_opt algorithm_opt(T) VIEW ifnotexists(E) nm(Y) dbnm(Z) eidlist_opt(C)
cmd ::= createkw(X) algorithm_opt(T) VIEW ifnotexists(E) nm(Y) dbnm(Z) eidlist_opt(C)
AS select(S). {
mxs_sqlite3CreateView(pParse, &X, &Y, &Z, C, S, T, E);
sqlite3SelectDelete(pParse->db, S);

4
query_classifier/test/maxscale.test
View File

@ -86,4 +86,6 @@ select * from db1.t1 union select * from db2.t2;
select names from t;
call p1();
call p1(@var);
call p1(@var);
create or replace table t (a int);