From 11a4c6c8808e2a2f21224e7f8e76a8e3ecb6df1f Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Wed, 6 May 2020 15:52:40 +0200 Subject: [PATCH] Fix whitespace --- src/sqlitedb.cpp | 78 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp index a798c34e..25df9696 100644 --- a/src/sqlitedb.cpp +++ b/src/sqlitedb.cpp @@ -1906,49 +1906,49 @@ void DBBrowserDB::updateSchema() if(!val_sql.empty()) { - val_sql.erase(std::remove(val_sql.begin(), val_sql.end(), '\r'), val_sql.end()); + val_sql.erase(std::remove(val_sql.begin(), val_sql.end(), '\r'), val_sql.end()); - sqlb::ObjectPtr object; - if(val_type == "table") - object = sqlb::Table::parseSQL(val_sql); - else if(val_type == "index") - object = sqlb::Index::parseSQL(val_sql); - else if(val_type == "trigger") - object = sqlb::Trigger::parseSQL(val_sql); - else if(val_type == "view") - object = sqlb::View::parseSQL(val_sql); - else - return false; + sqlb::ObjectPtr object; + if(val_type == "table") + object = sqlb::Table::parseSQL(val_sql); + else if(val_type == "index") + object = sqlb::Index::parseSQL(val_sql); + else if(val_type == "trigger") + object = sqlb::Trigger::parseSQL(val_sql); + else if(val_type == "view") + object = sqlb::View::parseSQL(val_sql); + else + return false; - // If parsing wasn't successful set the object name and SQL manually, so that at least the name is going to be correct - if(!object->fullyParsed()) - { - object->setName(val_name); - object->setOriginalSql(val_sql); - } + // If parsing wasn't successful set the object name and SQL manually, so that at least the name is going to be correct + if(!object->fullyParsed()) + { + object->setName(val_name); + object->setOriginalSql(val_sql); + } - // For virtual tables, views, and not fully parsed tables query the column list using the SQLite pragma because for both we can't yet rely on our grammar parser - if(!object->fullyParsed() || - (object->type() == sqlb::Object::Types::Table && std::dynamic_pointer_cast(object)->isVirtual()) || - object->type() == sqlb::Object::Types::View) - { - const auto columns = queryColumnInformation(schema_name, val_name); + // For virtual tables, views, and not fully parsed tables query the column list using the SQLite pragma because for both we can't yet rely on our grammar parser + if(!object->fullyParsed() || + (object->type() == sqlb::Object::Types::Table && std::dynamic_pointer_cast(object)->isVirtual()) || + object->type() == sqlb::Object::Types::View) + { + const auto columns = queryColumnInformation(schema_name, val_name); - if(object->type() == sqlb::Object::Types::Table) - { - sqlb::TablePtr tab = std::dynamic_pointer_cast(object); - for(const auto& column : columns) - tab->fields.emplace_back(column.first, column.second); - } else { - sqlb::ViewPtr view = std::dynamic_pointer_cast(object); - for(const auto& column : columns) - view->fields.emplace_back(column.first, column.second); - } - } else if(object->type() == sqlb::Object::Types::Trigger) { - // For triggers set the name of the table the trigger operates on here because we don't have a parser for trigger statements yet. - sqlb::TriggerPtr trg = std::dynamic_pointer_cast(object); - trg->setTable(val_tblname); - } + if(object->type() == sqlb::Object::Types::Table) + { + sqlb::TablePtr tab = std::dynamic_pointer_cast(object); + for(const auto& column : columns) + tab->fields.emplace_back(column.first, column.second); + } else { + sqlb::ViewPtr view = std::dynamic_pointer_cast(object); + for(const auto& column : columns) + view->fields.emplace_back(column.first, column.second); + } + } else if(object->type() == sqlb::Object::Types::Trigger) { + // For triggers set the name of the table the trigger operates on here because we don't have a parser for trigger statements yet. + sqlb::TriggerPtr trg = std::dynamic_pointer_cast(object); + trg->setTable(val_tblname); + } schemata[schema_name].insert({val_type, object}); }