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

grammar: Support named foreign key constraints in the column definition

Browse Source 
Previously the grammar parser would fail to extract and store the name
of a foreign key constraint in statements like these:

CREATE TABLE test(
    a int,
    b int CONSTRAINT this REFERENCES xy(id)	-- See the 'this' name
);

See issue #741.
This commit is contained in:
Martin Kleusberg
2017-01-05 22:56:12 +01:00
parent 94849fccf2
commit d8983cb066
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/sqlitetypes.cpp
View File

@@ -524,7 +524,7 @@ Table CreateTableWalker::table()
antlr::RefAST tc = s->getFirstChild();
// skip constraint name, if there is any
// Extract constraint name, if there is any
QString constraint_name;
if(tc->getType() == sqlite3TokenTypes::CONSTRAINT)
{
@@ -711,17 +711,23 @@ void CreateTableWalker::parsecolumn(Table& table, antlr::RefAST c)
{
antlr::RefAST con = c->getFirstChild();
// skip constraint name, if there is any
// Extract constraint name, if there is any
QString constraint_name;
if(con->getType() == sqlite3TokenTypes::CONSTRAINT)
{
m_bModifySupported = false;
con = con->getNextSibling()->getNextSibling();
con = con->getNextSibling(); // CONSTRAINT
constraint_name = identifier(con);
con = con->getNextSibling(); // identifier
}
switch(con->getType())
{
case sqlite3TokenTypes::PRIMARY:
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
primarykey = true;
con = con->getNextSibling()->getNextSibling(); // skip KEY
if(con != antlr::nullAST && (con->getType() == sqlite3TokenTypes::ASC
@@ -736,6 +742,10 @@ void CreateTableWalker::parsecolumn(Table& table, antlr::RefAST c)
break;
case sqlite3TokenTypes::NOT:
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
notnull = true;
}
break;
@@ -746,6 +756,10 @@ void CreateTableWalker::parsecolumn(Table& table, antlr::RefAST c)
break;
case sqlite3TokenTypes::CHECK:
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
con = con->getNextSibling(); //LPAREN
check = concatTextAST(con, true);
// remove parenthesis
@@ -756,12 +770,20 @@ void CreateTableWalker::parsecolumn(Table& table, antlr::RefAST c)
break;
case sqlite3TokenTypes::DEFAULT:
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
con = con->getNextSibling(); //SIGNEDNUMBER,STRING,LPAREN
defaultvalue = concatTextAST(con);
}
break;
case sqlite3TokenTypes::UNIQUE:
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
unique = true;
}
break;
@@ -771,6 +793,7 @@ void CreateTableWalker::parsecolumn(Table& table, antlr::RefAST c)
foreignKey = new ForeignKeyClause;
foreignKey->setTable(identifier(con));
foreignKey->setName(constraint_name);
con = con->getNextSibling(); // identifier
if(con != antlr::nullAST && con->getType() == sqlite3TokenTypes::LPAREN)