mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-21 19:41:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

grammar: Correctly parse subexpressions in parentheses

Browse Source 
This fixes parsing for table definitions like this:

CREATE TABLE a(
    x INT DEFAULT(5 + (1))
);

See issue #1950.
This commit is contained in:
Martin Kleusberg
2019-08-01 10:53:51 +02:00
parent 05e2defe33
commit 55b3f6378f
4 changed files with 620 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1125
src/grammar/Sqlite3Parser.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/grammar/sqlite3.g
View File

@@ -440,7 +440,7 @@ functionname
expr
:
( LPAREN (((subexpr (COMMA subexpr)+ RPAREN binaryoperator LPAREN subexpr (COMMA subexpr)+) | (expr)) RPAREN) ((AND | OR) expr)* )
| ( subexpr ((binaryoperator | AND | OR) subexpr )* )
| ( subexpr ((binaryoperator | AND | OR) (subexpr | LPAREN subexpr RPAREN) )* )
;
subexpr

14
src/tests/testsqlobjects.cpp
View File

@@ -490,3 +490,17 @@ void TestTable::datetimeExpression()
QCOMPARE(tab.fields.at(0).type(), "INTEGER");
QCOMPARE(tab.fields.at(0).defaultValue(), "(DATETIME(CURRENT_TIMESTAMP,'LOCALTIME'))");
}
void TestTable::extraParentheses()
{
std::string sql = "CREATE TABLE test(\n"
"xy INTEGER DEFAULT (1 + (5) - 4)\n"
");";
Table tab = *(std::dynamic_pointer_cast<sqlb::Table>(Table::parseSQL(sql)));
QCOMPARE(tab.name(), "test");
QCOMPARE(tab.fields.at(0).name(), "xy");
QCOMPARE(tab.fields.at(0).type(), "INTEGER");
QCOMPARE(tab.fields.at(0).defaultValue(), "(1+(5)-4)");
}

1
src/tests/testsqlobjects.h
View File

@@ -36,6 +36,7 @@ private slots:
void rowValues();
void complexExpressions();
void datetimeExpression();
void extraParentheses();
};
#endif