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

grammar: Simplify code

Browse Source 
Simplify the code by storing the flag that indicates if the parsing was
successful in the parsed object itself instead of handing around pairs
of parsed objects and bools.
This commit is contained in:
Martin Kleusberg
2017-01-20 19:57:58 +01:00
parent 5455fd8cb7
commit 6684fc2159
6 changed files with 54 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/EditTableDialog.cpp
View File

@@ -33,12 +33,8 @@ EditTableDialog::EditTableDialog(DBBrowserDB& db, const QString& tableName, bool
if(m_bNewTable == false)
{
// Existing table, so load and set the current layout
sqlb::TablePtr obj = pdb.getObjectByName(curTable).dynamicCast<sqlb::Table>();
QString sTablesql = obj->originalSql();
QPair<sqlb::ObjectPtr, bool> parse_result = sqlb::Table::parseSQL(sTablesql);
m_table = *(parse_result.first.dynamicCast<sqlb::Table>());
m_table.setTemporary(obj->isTemporary());
ui->labelEditWarning->setVisible(!parse_result.second);
m_table = *(pdb.getObjectByName(curTable).dynamicCast<sqlb::Table>());
ui->labelEditWarning->setVisible(!m_table.fullyParsed());
// Set without rowid and temporary checkboxex. No need to trigger any events here as we're only loading a table exactly as it is stored by SQLite, so no need
// for error checking etc.

2
src/sqlitedb.cpp
View File

@@ -1255,7 +1255,7 @@ void DBBrowserDB::updateSchema( )
DBBrowserObject obj(val_name, val_sql, type, val_tblname);
if((type == sqlb::Object::ObjectTypes::Table || type == sqlb::Object::ObjectTypes::Index) && !val_sql.isEmpty())
{
obj.object = sqlb::Object::parseSQL(type, val_sql).first;
obj.object = sqlb::Object::parseSQL(type, val_sql);
if(val_temp == "1")
obj.object->setTemporary(true);
}

6
src/sqlitetablemodel.cpp
View File

@@ -49,8 +49,8 @@ void SqliteTableModel::setTable(const QString& table, const QVector<QString>& di
bool allOk = false;
if(m_db.getObjectByName(table)->type() == sqlb::Object::ObjectTypes::Table)
{
sqlb::TablePtr t = sqlb::Table::parseSQL(m_db.getObjectByName(table)->originalSql()).first.dynamicCast<sqlb::Table>();
if(t->fields().size()) // parsing was OK
sqlb::TablePtr t = m_db.getObjectByName(table).dynamicCast<sqlb::Table>();
if(t && t->fields().size()) // parsing was OK
{
m_headers.push_back(t->rowidColumn());
m_headers.append(t->fieldNames());
@@ -432,7 +432,7 @@ QModelIndex SqliteTableModel::dittoRecord(int old_row)
int firstEditedColumn = 0;
int new_row = rowCount() - 1;
sqlb::TablePtr t = sqlb::Table::parseSQL(m_db.getObjectByName(m_sTable)->originalSql()).first.dynamicCast<sqlb::Table>();
sqlb::TablePtr t = m_db.getObjectByName(m_sTable).dynamicCast<sqlb::Table>();
sqlb::FieldVector pk = t->primaryKey();
for (int col = 0; col < t->fields().size(); ++col) {

54
src/sqlitetypes.cpp
View File

@@ -22,10 +22,10 @@ QStringList fieldVectorToFieldNames(const FieldVector& vector)
return result;
}
QPair<ObjectPtr, bool> Object::parseSQL(Object::ObjectTypes type, const QString& sSQL)
ObjectPtr Object::parseSQL(Object::ObjectTypes type, const QString& sSQL)
{
// Parse SQL statement according to type
QPair<ObjectPtr, bool> result;
ObjectPtr result;
switch(type)
{
case Object::ObjectTypes::Table:
@@ -35,11 +35,11 @@ QPair<ObjectPtr, bool> Object::parseSQL(Object::ObjectTypes type, const QString&
result = Index::parseSQL(sSQL);
break;
default:
return QPair<ObjectPtr, bool>(ObjectPtr(nullptr), false);
return ObjectPtr(nullptr);
}
// Strore the original SQL statement and return the result
result.first->setOriginalSql(sSQL);
result->setOriginalSql(sSQL);
return result;
}
@@ -277,7 +277,7 @@ bool Table::hasAutoIncrement() const
return false;
}
QPair<ObjectPtr, bool> Table::parseSQL(const QString &sSQL)
ObjectPtr Table::parseSQL(const QString &sSQL)
{
std::stringstream s;
s << sSQL.toStdString();
@@ -294,11 +294,7 @@ QPair<ObjectPtr, bool> Table::parseSQL(const QString &sSQL)
parser.createtable();
CreateTableWalker ctw(parser.getAST());
// Note: this needs to be done in two separate lines because otherwise the optimiser might decide to
// fetch the value for the second part of the pair (the modify supported flag) first. If it does so it will
// always be set to true because the table() method hasn't run yet and it's only set to false in there.
sqlb::TablePtr tab = ctw.table();
return qMakePair(tab, ctw.modifysupported());
return ctw.table();
}
catch(antlr::ANTLRException& ex)
{
@@ -309,7 +305,7 @@ QPair<ObjectPtr, bool> Table::parseSQL(const QString &sSQL)
qCritical() << "Sqlite parse error: " << sSQL; //TODO
}
return qMakePair(TablePtr(new Table("")), false);
return TablePtr(new Table(""));
}
QString Table::sql() const
@@ -487,6 +483,7 @@ QString columnname(const antlr::RefAST& n)
TablePtr CreateTableWalker::table()
{
Table* tab = new Table("");
tab->setFullyParsed(true);
if( m_root ) //CREATE TABLE
{
@@ -521,7 +518,7 @@ TablePtr CreateTableWalker::table()
s = s->getNextSibling(); // USING
s = s->getNextSibling(); // module name
tab->setVirtualUsing(concatTextAST(s, true));
m_bModifySupported = false;
tab->setFullyParsed(false);
// TODO Maybe get the column list using the 'pragma table_info()' approach we're using for views
@@ -585,7 +582,7 @@ TablePtr CreateTableWalker::table()
|| tc->getType() == sqlite3TokenTypes::DESC))
{
// TODO save ASC / DESC information?
m_bModifySupported = false;
tab->setFullyParsed(false);
tc = tc->getNextSibling();
}
@@ -623,7 +620,7 @@ TablePtr CreateTableWalker::table()
|| tc->getType() == sqlite3TokenTypes::DESC))
{
// TODO save ASC / DESC information?
m_bModifySupported = false;
tab->setFullyParsed(false);
tc = tc->getNextSibling();
}
@@ -692,7 +689,7 @@ TablePtr CreateTableWalker::table()
break;
default:
{
m_bModifySupported = false;
tab->setFullyParsed(false);
}
break;
}
@@ -760,7 +757,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
if(con != antlr::nullAST && (con->getType() == sqlite3TokenTypes::ASC
|| con->getType() == sqlite3TokenTypes::DESC))
{
m_bModifySupported = false;
table->setFullyParsed(false);
con = con->getNextSibling(); //skip
}
if(con != antlr::nullAST && con->getType() == sqlite3TokenTypes::AUTOINCREMENT)
@@ -771,7 +768,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
table->setFullyParsed(false);
notnull = true;
}
@@ -785,7 +782,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
table->setFullyParsed(false);
con = con->getNextSibling(); //LPAREN
check = concatTextAST(con, true);
@@ -799,7 +796,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
table->setFullyParsed(false);
con = con->getNextSibling(); //SIGNEDNUMBER,STRING,LPAREN
defaultvalue = concatTextAST(con);
@@ -809,7 +806,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
{
// TODO Support constraint names here
if(!constraint_name.isEmpty())
m_bModifySupported = false;
table->setFullyParsed(false);
unique = true;
}
@@ -844,7 +841,7 @@ void CreateTableWalker::parsecolumn(Table* table, antlr::RefAST c)
break;
default:
{
m_bModifySupported = false;
table->setFullyParsed(false);
}
break;
}
@@ -944,7 +941,7 @@ QString Index::sql() const
return sql + ";";
}
QPair<ObjectPtr, bool> Index::parseSQL(const QString& sSQL)
ObjectPtr Index::parseSQL(const QString& sSQL)
{
std::stringstream s;
s << sSQL.toStdString();
@@ -961,11 +958,7 @@ QPair<ObjectPtr, bool> Index::parseSQL(const QString& sSQL)
parser.createindex();
CreateIndexWalker ctw(parser.getAST());
// Note: this needs to be done in two separate lines because otherwise the optimiser might decide to
// fetch the value for the second part of the pair (the modify supported flag) first. If it does so it will
// always be set to true because the table() method hasn't run yet and it's only set to false in there.
sqlb::IndexPtr index = ctw.index();
return qMakePair(index, ctw.modifysupported());
return ctw.index();
}
catch(antlr::ANTLRException& ex)
{
@@ -976,12 +969,13 @@ QPair<ObjectPtr, bool> Index::parseSQL(const QString& sSQL)
qCritical() << "Sqlite parse error: " << sSQL; //TODO
}
return qMakePair(IndexPtr(new Index("")), false);
return IndexPtr(new Index(""));
}
IndexPtr CreateIndexWalker::index()
{
Index* index = new Index("");
index->setFullyParsed(true);
if(m_root) // CREATE INDEX
{
@@ -1030,7 +1024,7 @@ IndexPtr CreateIndexWalker::index()
if(s->getType() != sqlite3TokenTypes::WHERE)
{
// It is something else
m_bModifySupported = false;
index->setFullyParsed(false);
} else {
s = s->getNextSibling(); // expr
index->setWhereExpr(concatTextAST(s, true));
@@ -1089,7 +1083,7 @@ void CreateIndexWalker::parsecolumn(Index* index, antlr::RefAST c)
break;
default:
// TODO Add support for COLLATE
m_bModifySupported = false;
index->setFullyParsed(false);
}
c = c->getNextSibling();

29
src/sqlitetypes.h
View File

@@ -41,7 +41,7 @@ public:
Trigger
};
explicit Object(const QString& name): m_name(name), m_temporary(false) {}
explicit Object(const QString& name): m_name(name), m_temporary(false), m_fullyParsed(false) {}
virtual ~Object() {}
virtual ObjectTypes type() const = 0;
@@ -57,6 +57,9 @@ public:
virtual QString baseTable() const { return QString(); }
void setFullyParsed(bool fully_parsed) { m_fullyParsed = fully_parsed; }
bool fullyParsed() const { return m_fullyParsed; }
virtual void clear() {}
/**
@@ -69,15 +72,15 @@ public:
* @brief parseSQL Parses the CREATE statement in sSQL.
* @param sSQL The type of the object.
* @param sSQL The create statement.
* @return A pair. The first part is the parsed database object, the second a bool indicating if our
* parser fully understood the statement. The object may be empty if parsing failed.
* @return The parsed database object. The object may be empty if parsing failed.
*/
static QPair<ObjectPtr, bool> parseSQL(Object::ObjectTypes type, const QString& sSQL);
static ObjectPtr parseSQL(Object::ObjectTypes type, const QString& sSQL);
protected:
QString m_name;
QString m_originalSql;
bool m_temporary;
bool m_fullyParsed;
};
class Constraint
@@ -272,11 +275,9 @@ public:
/**
* @brief parseSQL Parses the create Table statement in sSQL.
* @param sSQL The create table statement.
* @return A pair first is a table object, second is a bool indicating
* if our modify dialog supports the table.
* The table object may be a empty table if parsing failed.
* @return The table object. The table object may be empty if parsing failed.
*/
static QPair<ObjectPtr, bool> parseSQL(const QString& sSQL);
static ObjectPtr parseSQL(const QString& sSQL);
private:
QStringList fieldList() const;
bool hasAutoIncrement() const;
@@ -298,18 +299,15 @@ class CreateTableWalker
public:
explicit CreateTableWalker(antlr::RefAST r)
: m_root(r)
, m_bModifySupported(true)
{}
TablePtr table();
bool modifysupported() const { return m_bModifySupported; }
private:
void parsecolumn(Table* table, antlr::RefAST c);
private:
antlr::RefAST m_root;
bool m_bModifySupported;
};
QStringList fieldVectorToFieldNames(const sqlb::FieldVector& vector);
@@ -381,11 +379,9 @@ public:
/**
* @brief parseSQL Parses the CREATE INDEX statement in sSQL.
* @param sSQL The create index statement.
* @return A pair. The first part is an index object, the second a bool indicating
* if our parser fully understood the statement.
* The index object may be if parsing failed.
* @return The index object. The index object may be empty if the parsing failed.
*/
static QPair<ObjectPtr, bool> parseSQL(const QString& sSQL);
static ObjectPtr parseSQL(const QString& sSQL);
private:
bool m_unique;
@@ -404,18 +400,15 @@ class CreateIndexWalker
public:
explicit CreateIndexWalker(antlr::RefAST r)
: m_root(r)
, m_bModifySupported(true)
{}
IndexPtr index();
bool modifysupported() const { return m_bModifySupported; }
private:
void parsecolumn(Index* index, antlr::RefAST c);
private:
antlr::RefAST m_root;
bool m_bModifySupported;
};
} //namespace sqlb

26
src/tests/testsqlobjects.cpp
View File

@@ -118,7 +118,7 @@ void TestTable::parseSQL()
"\tinfo VARCHAR(255) CHECK (info == 'x')\n"
");";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "hero");
QVERIFY(tab.rowidColumn() == "_rowid_");
@@ -147,7 +147,7 @@ void TestTable::parseSQLdefaultexpr()
"date datetime default CURRENT_TIMESTAMP,"
"zoi integer)";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QCOMPARE(tab.name(), QString("chtest"));
QCOMPARE(tab.fields().at(0)->name(), QString("id"));
@@ -180,7 +180,7 @@ void TestTable::parseSQLMultiPk()
"PRIMARY KEY(`id1`,`id2`)\n"
");";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "hero");
QVERIFY(tab.fields().at(0)->name() == "id1");
@@ -197,7 +197,7 @@ void TestTable::parseSQLForeignKey()
{
QString sSQL = "CREATE TABLE grammar_test(id, test, FOREIGN KEY(test) REFERENCES other_table);";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "grammar_test");
QVERIFY(tab.fields().at(0)->name() == "id");
@@ -208,7 +208,7 @@ void TestTable::parseSQLSingleQuotes()
{
QString sSQL = "CREATE TABLE 'test'('id','test');";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "test");
QVERIFY(tab.fields().at(0)->name() == "id");
@@ -219,7 +219,7 @@ void TestTable::parseSQLKeywordInIdentifier()
{
QString sSQL = "CREATE TABLE deffered(key integer primary key, if text);";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "deffered");
QVERIFY(tab.fields().at(0)->name() == "key");
@@ -230,7 +230,7 @@ void TestTable::parseSQLWithoutRowid()
{
QString sSQL = "CREATE TABLE test(a integer primary key, b integer) WITHOUT ROWID;";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.fields().at(tab.findPk())->name() == "a");
QVERIFY(tab.rowidColumn() == "a");
@@ -243,7 +243,7 @@ void TestTable::parseNonASCIIChars()
"PRIMARY KEY(`Fieldöäüß`)"
");";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "lösung");
QVERIFY(tab.fields().at(0)->name() == "Fieldöäüß");
@@ -253,7 +253,7 @@ void TestTable::parseSQLEscapedQuotes()
{
QString sSql = "CREATE TABLE double_quotes(a text default 'a''a');";
Table tab = *(Table::parseSQL(sSql).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSql).dynamicCast<sqlb::Table>());
QCOMPARE(tab.name(), QString("double_quotes"));
QCOMPARE(tab.fields().at(0)->name(), QString("a"));
@@ -264,7 +264,7 @@ void TestTable::parseSQLForeignKeys()
{
QString sql = "CREATE TABLE foreign_key_test(a int, b int, foreign key (a) references x, foreign key (b) references w(y,z) on delete set null);";
Table tab = *(Table::parseSQL(sql).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sql).dynamicCast<sqlb::Table>());
QCOMPARE(tab.name(), QString("foreign_key_test"));
QCOMPARE(tab.fields().at(0)->name(), QString("a"));
@@ -279,7 +279,7 @@ void TestTable::parseSQLCheckConstraint()
{
QString sql = "CREATE TABLE a (`b` text CHECK(`b`='A' or `b`='B'));";
Table tab = *(Table::parseSQL(sql).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sql).dynamicCast<sqlb::Table>());
QCOMPARE(tab.name(), QString("a"));
QCOMPARE(tab.fields().at(0)->name(), QString("b"));
@@ -294,7 +294,7 @@ void TestTable::createTableWithIn()
"value NVARCHAR(5) CHECK (value IN ('a', 'b', 'c'))"
");";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "not_working");
QVERIFY(tab.fields().at(1)->check() == "value IN ( 'a' , 'b' , 'c' )");
@@ -312,7 +312,7 @@ void TestTable::createTableWithNotLikeConstraint()
"value7 INTEGER CONSTRAINT 'value' CHECK(NOT EXISTS (1))\n"
");";
Table tab = *(Table::parseSQL(sSQL).first.dynamicCast<sqlb::Table>());
Table tab = *(Table::parseSQL(sSQL).dynamicCast<sqlb::Table>());
QVERIFY(tab.name() == "hopefully_working");
QVERIFY(tab.fields().at(0)->check() == "value NOT LIKE 'prefix%'");