grammar: Fix double quote characters as used for escaping one

MKleusberg · MKleusberg · commit 19baeb2a7a07 · 2014-10-15T19:29:19.000+02:00
SQL allows you to use two quote characters instead of just one in order to escape them. Example: ['aa''bb'] is read as [aa'bb]. Add detection for these doubled quote characters to our grammar parser. See issue sqlitebrowser#128.
diff --git a/src/grammar/Sqlite3Lexer.cpp b/src/grammar/Sqlite3Lexer.cpp
@@ -528,11 +528,15 @@ void Sqlite3Lexer::mQUOTEDLITERAL(bool _createToken) {
 	match(L'\"' /* charlit */ );
 	{ // ( ... )*
 	for (;;) {
-		if ((_tokenSet_2.member(LA(1)))) {
+		if ((LA(1) == 0x22 /* '\"' */ ) && (LA(2) == 0x22 /* '\"' */ )) {
 			{
-			match(_tokenSet_2);
+			match(L'\"' /* charlit */ );
+			match(L'\"' /* charlit */ );
 			}
 		}
+		else if ((_tokenSet_2.member(LA(1)))) {
+			matchNot(L'\"' /* charlit */ );
+		}
 		else {
 			goto _loop17;
 		}
@@ -873,11 +877,15 @@ void Sqlite3Lexer::mSTRINGLITERAL(bool _createToken) {
 	match(L'\'' /* charlit */ );
 	{ // ( ... )*
 	for (;;) {
-		if ((_tokenSet_4.member(LA(1)))) {
+		if ((LA(1) == 0x27 /* '\'' */ ) && (LA(2) == 0x27 /* '\'' */ )) {
 			{
-			match(_tokenSet_4);
+			match(L'\'' /* charlit */ );
+			match(L'\'' /* charlit */ );
 			}
 		}
+		else if ((_tokenSet_4.member(LA(1)))) {
+			matchNot(L'\'' /* charlit */ );
+		}
 		else {
 			goto _loop46;
 		}
diff --git a/src/grammar/sqlite3.g b/src/grammar/sqlite3.g
@@ -105,7 +105,7 @@ QUOTEDID
 	;
 
 QUOTEDLITERAL
-  : '"' ( ~('"') )* '"'
+  : '"' ( ~'"' | ('"' '"' ) )* '"'
   ;
 
 NUMERIC
@@ -135,7 +135,7 @@ WS :
 STRINGLITERAL
   :
 //  '"' ( ESC_SEQ | ~('\\'|'"') )* '"'
-  '\'' ( ~('\'') )* '\''
+  '\'' ( ~'\'' | ('\'' '\'') )* '\''
   ;
 
 //protected
diff --git a/src/tests/testsqlobjects.cpp b/src/tests/testsqlobjects.cpp
@@ -221,7 +221,7 @@ void TestTable::parseSQLEscapedQuotes()
 
     QCOMPARE(tab.name(), QString("double_quotes"));
     QCOMPARE(tab.fields().at(0)->name(), QString("a"));
-    QCOMPARE(tab.fields().at(0)->defaultValue(), QString("a''a"));
+    QCOMPARE(tab.fields().at(0)->defaultValue(), QString("'a''a'"));
 }
 
 void TestTable::createTableWithIn()

Original file line number	Diff line number	Diff line change
`@@ -528,11 +528,15 @@ void Sqlite3Lexer::mQUOTEDLITERAL(bool _createToken) {`
`528`	`528`	`match(L'\"' /* charlit */ );`
`529`	`529`	`{ // ( ... )*`
`530`	`530`	`for (;;) {`
`531`		`- if ((_tokenSet_2.member(LA(1)))) {`
	`531`	`+ if ((LA(1) == 0x22 /* '\"' / ) && (LA(2) == 0x22 / '\"' */ )) {`
`532`	`532`	`{`
`533`		`- match(_tokenSet_2);`
	`533`	`+ match(L'\"' /* charlit */ );`
	`534`	`+ match(L'\"' /* charlit */ );`
`534`	`535`	`}`
`535`	`536`	`}`
	`537`	`+ else if ((_tokenSet_2.member(LA(1)))) {`
	`538`	`+ matchNot(L'\"' /* charlit */ );`
	`539`	`+ }`
`536`	`540`	`else {`
`537`	`541`	`goto _loop17;`
`538`	`542`	`}`
`@@ -873,11 +877,15 @@ void Sqlite3Lexer::mSTRINGLITERAL(bool _createToken) {`
`873`	`877`	`match(L'\'' /* charlit */ );`
`874`	`878`	`{ // ( ... )*`
`875`	`879`	`for (;;) {`
`876`		`- if ((_tokenSet_4.member(LA(1)))) {`
	`880`	`+ if ((LA(1) == 0x27 /* '\'' / ) && (LA(2) == 0x27 / '\'' */ )) {`
`877`	`881`	`{`
`878`		`- match(_tokenSet_4);`
	`882`	`+ match(L'\'' /* charlit */ );`
	`883`	`+ match(L'\'' /* charlit */ );`
`879`	`884`	`}`
`880`	`885`	`}`
	`886`	`+ else if ((_tokenSet_4.member(LA(1)))) {`
	`887`	`+ matchNot(L'\'' /* charlit */ );`
	`888`	`+ }`
`881`	`889`	`else {`
`882`	`890`	`goto _loop46;`
`883`	`891`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ QUOTEDID`
`105`	`105`	`;`
`106`	`106`
`107`	`107`	`QUOTEDLITERAL`
`108`		`- : '"' ( ~('"') )* '"'`
	`108`	`+ : '"' ( ~'"' \| ('"' '"' ) )* '"'`
`109`	`109`	`;`
`110`	`110`
`111`	`111`	`NUMERIC`
`@@ -135,7 +135,7 @@ WS :`
`135`	`135`	`STRINGLITERAL`
`136`	`136`	`:`
`137`	`137`	`// '"' ( ESC_SEQ \| ~('\\'\|'"') )* '"'`
`138`		`- '\'' ( ~('\'') )* '\''`
	`138`	`+ '\'' ( ~'\'' \| ('\'' '\'') )* '\''`
`139`	`139`	`;`
`140`	`140`
`141`	`141`	`//protected`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ void TestTable::parseSQLEscapedQuotes()`
`221`	`221`
`222`	`222`	`QCOMPARE(tab.name(), QString("double_quotes"));`
`223`	`223`	`QCOMPARE(tab.fields().at(0)->name(), QString("a"));`
`224`		`- QCOMPARE(tab.fields().at(0)->defaultValue(), QString("a''a"));`
	`224`	`+ QCOMPARE(tab.fields().at(0)->defaultValue(), QString("'a''a'"));`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`void TestTable::createTableWithIn()`