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

Update commit/rollback rules

Browse Source 
Now that WORK is recognized as a parser token, the BEGIN and regular
COMMIT and ROLLBACK rules should use them as well.
This commit is contained in:
Johan Wikman
2017-03-07 11:49:30 +02:00
parent a6ae60c808
commit 07ae37f179
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,10 +313,9 @@ cmdx ::= cmd. { sqlite3FinishCoding(pParse); }
// //
%ifdef MAXSCALE %ifdef MAXSCALE
id_opt ::= . work_opt ::= WORK.
id_opt ::= deferred_id. work_opt ::= .
cmd ::= BEGIN work_opt. {mxs_sqlite3BeginTransaction(pParse, 0);} // BEGIN [WORK]
cmd ::= BEGIN id_opt. {mxs_sqlite3BeginTransaction(pParse, 0);} // BEGIN [WORK]
%endif %endif
%ifndef MAXSCALE %ifndef MAXSCALE
cmd ::= BEGIN transtype(Y) trans_opt. {sqlite3BeginTransaction(pParse, Y);} cmd ::= BEGIN transtype(Y) trans_opt. {sqlite3BeginTransaction(pParse, Y);}
@ -330,9 +329,8 @@ transtype(A) ::= IMMEDIATE(X). {A = @X;}
transtype(A) ::= EXCLUSIVE(X). {A = @X;} transtype(A) ::= EXCLUSIVE(X). {A = @X;}
%endif %endif
%ifdef MAXSCALE %ifdef MAXSCALE
cmd ::= COMMIT id_opt. {mxs_sqlite3CommitTransaction(pParse);} cmd ::= COMMIT work_opt. {mxs_sqlite3CommitTransaction(pParse);}
cmd ::= END id_opt. {mxs_sqlite3CommitTransaction(pParse);} cmd ::= ROLLBACK work_opt. {mxs_sqlite3RollbackTransaction(pParse);}
cmd ::= ROLLBACK id_opt. {mxs_sqlite3RollbackTransaction(pParse);}
%endif %endif
%ifndef MAXSCALE %ifndef MAXSCALE
cmd ::= COMMIT trans_opt. {sqlite3CommitTransaction(pParse);} cmd ::= COMMIT trans_opt. {sqlite3CommitTransaction(pParse);}
@ -343,8 +341,6 @@ cmd ::= ROLLBACK trans_opt. {sqlite3RollbackTransaction(pParse);}
%ifdef MAXSCALE %ifdef MAXSCALE
savepoint_opt ::= SAVEPOINT. savepoint_opt ::= SAVEPOINT.
savepoint_opt ::= . savepoint_opt ::= .
work_opt ::= WORK.
work_opt ::= .
cmd ::= SAVEPOINT nm(X). { cmd ::= SAVEPOINT nm(X). {
mxs_sqlite3Savepoint(pParse, SAVEPOINT_BEGIN, &X); mxs_sqlite3Savepoint(pParse, SAVEPOINT_BEGIN, &X);
} }