Keep field information in sqlb::Table object rather than DBBrowserObject

MKleusberg · MKleusberg · commit 7d4248ecb45a · 2014-08-26T17:52:15.000+02:00
Keep all the table and field information in a sqlb::Table object (which
itself is stored in DBBrowserObject) rather than storing field
information in DBBrowserObject and sqlb::Table objects at the same time.
diff --git a/src/DbStructureModel.cpp b/src/DbStructureModel.cpp
@@ -169,12 +169,12 @@ void DbStructureModel::reloadData(DBBrowserDB* db)
         // If it is a table or view add the field Nodes
         if((*it).gettype() == "table" || (*it).gettype() == "view")
         {
-            for(int i=0; i < it->fldmap.size(); ++i)
+            for(int i=0; i < (*it).table.fields().size(); ++i)
             {
                 QTreeWidgetItem *fldItem = new QTreeWidgetItem(tableItem);
-                fldItem->setText(0, (*it).fldmap.at(i)->name());
+                fldItem->setText(0, (*it).table.fields().at(i)->name());
                 fldItem->setText(1, "field");
-                fldItem->setText(2, (*it).fldmap.at(i)->type());
+                fldItem->setText(2, (*it).table.fields().at(i)->type());
                 fldItem->setIcon(0, QIcon(":/icons/field"));
             }
         }
diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
@@ -91,7 +91,7 @@ void ImportCsvDialog::accept()
     {
         if(i.value().gettype() == "table" && i.value().getname() == ui->editName->text())
         {
-            if(i.value().fldmap.size() != numfields)
+            if(i.value().table.fields().size() != numfields)
             {
                 QMessageBox::warning(this, QApplication::applicationName(),
                                      tr("There is already a table of that name and an import into an existing table is only possible if the number of columns match."));
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -268,13 +268,13 @@ void MainWindow::populateStructure()
         if((*it).gettype() == "table" || (*it).gettype() == "view")
         {
             QStandardItemModel* tablefieldmodel = new QStandardItemModel();
-            tablefieldmodel->setRowCount((*it).fldmap.count());
+            tablefieldmodel->setRowCount((*it).table.fields().count());
             tablefieldmodel->setColumnCount(1);
 
             int fldrow = 0;
-            for(int i=0; i < (*it).fldmap.size(); ++i, ++fldrow)
+            for(int i=0; i < (*it).table.fields().size(); ++i, ++fldrow)
             {
-                QString fieldname = (*it).fldmap.at(i)->name();
+                QString fieldname = (*it).table.fields().at(i)->name();
                 QStandardItem* fldItem = new QStandardItem(fieldname);
                 fldItem->setIcon(QIcon(":/icons/field"));
                 tablefieldmodel->setItem(fldrow, 0, fldItem);
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
@@ -750,8 +750,8 @@ QStringList DBBrowserDB::getTableFields(const QString & tablename) const
     {
         if((*it).getname() == tablename)
         {
-            for(int i=0;i<(*it).fldmap.size();i++)
-                res.append((*it).fldmap.at(i)->name());
+            for(int i=0;i<(*it).table.fields().size();i++)
+                res.append((*it).table.fields().at(i)->name());
         }
     }
     return res;
@@ -834,8 +834,7 @@ void DBBrowserDB::updateSchema( )
         // pragma SQLite offers.
         if((*it).gettype() == "table")
         {
-            sqlb::Table t((*it).getname());
-            (*it).fldmap = t.parseSQL((*it).getsql()).first.fields();
+            (*it).table = sqlb::Table::parseSQL((*it).getsql()).first;
         } else if((*it).gettype() == "view") {
             statement = QString("PRAGMA TABLE_INFO(`%1`);").arg((*it).getname());
             logSQL(statement, kLogMsg_App);
@@ -849,7 +848,7 @@ void DBBrowserDB::updateSchema( )
                         QString val_type = QString::fromUtf8((const char *)sqlite3_column_text(vm, 2));
 
                         sqlb::FieldPtr f(new sqlb::Field(val_name, val_type));
-                        (*it).addField(f);
+                        (*it).table.addField(f);
                     }
                 }
                 sqlite3_finalize(vm);
diff --git a/src/sqlitedb.h b/src/sqlitedb.h
@@ -20,25 +20,24 @@ typedef QMultiMap<QString, class DBBrowserObject> objectMap;
 class DBBrowserObject
 {
 public:
-    DBBrowserObject() : name( "" ) { }
+    DBBrowserObject() : table(""), name( "" ) { }
     DBBrowserObject( const QString& wname,const QString& wsql, const QString& wtype, const QString& tbl_name )
-        : name( wname), sql( wsql ), type(wtype), table_name(tbl_name)
+        : table(wname), name( wname), sql( wsql ), type(wtype), table_name(tbl_name)
     { }
 
-    void addField(sqlb::FieldPtr field) { fldmap.push_back(field); }
-
     QString getname() const { return name; }
     QString getsql() const { return sql; }
     QString gettype() const { return type; }
     QString getTableName() const { return table_name; }
-    sqlb::FieldPtr getField(const QString& name) const
+    sqlb::FieldPtr getField(const QString& name)
     {
-        for(int i=0;i<fldmap.size();i++)
-            if(fldmap.at(i)->name() == name)
-                return fldmap.at(i);
-        return sqlb::FieldPtr();
+        int id = table.findField(name);
+        if(id == -1)
+            return sqlb::FieldPtr();
+        else
+            return table.fields().at(id);
     }
-    sqlb::FieldVector fldmap;
+    sqlb::Table table;
 private:
     QString name;
     QString sql;

Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,12 @@ void DbStructureModel::reloadData(DBBrowserDB* db)`
`169`	`169`	`// If it is a table or view add the field Nodes`
`170`	`170`	`if((it).gettype() == "table" \|\| (it).gettype() == "view")`
`171`	`171`	`{`
`172`		`- for(int i=0; i < it->fldmap.size(); ++i)`
	`172`	`+ for(int i=0; i < (*it).table.fields().size(); ++i)`
`173`	`173`	`{`
`174`	`174`	`QTreeWidgetItem *fldItem = new QTreeWidgetItem(tableItem);`
`175`		`- fldItem->setText(0, (*it).fldmap.at(i)->name());`
	`175`	`+ fldItem->setText(0, (*it).table.fields().at(i)->name());`
`176`	`176`	`fldItem->setText(1, "field");`
`177`		`- fldItem->setText(2, (*it).fldmap.at(i)->type());`
	`177`	`+ fldItem->setText(2, (*it).table.fields().at(i)->type());`
`178`	`178`	`fldItem->setIcon(0, QIcon(":/icons/field"));`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void ImportCsvDialog::accept()`
`91`	`91`	`{`
`92`	`92`	`if(i.value().gettype() == "table" && i.value().getname() == ui->editName->text())`
`93`	`93`	`{`
`94`		`- if(i.value().fldmap.size() != numfields)`
	`94`	`+ if(i.value().table.fields().size() != numfields)`
`95`	`95`	`{`
`96`	`96`	`QMessageBox::warning(this, QApplication::applicationName(),`
`97`	`97`	`tr("There is already a table of that name and an import into an existing table is only possible if the number of columns match."));`
Original file line number	Diff line number	Diff line change
`@@ -750,8 +750,8 @@ QStringList DBBrowserDB::getTableFields(const QString & tablename) const`
`750`	`750`	`{`
`751`	`751`	`if((*it).getname() == tablename)`
`752`	`752`	`{`
`753`		`- for(int i=0;i<(*it).fldmap.size();i++)`
`754`		`- res.append((*it).fldmap.at(i)->name());`
	`753`	`+ for(int i=0;i<(*it).table.fields().size();i++)`
	`754`	`+ res.append((*it).table.fields().at(i)->name());`
`755`	`755`	`}`
`756`	`756`	`}`
`757`	`757`	`return res;`
`@@ -834,8 +834,7 @@ void DBBrowserDB::updateSchema( )`
`834`	`834`	`// pragma SQLite offers.`
`835`	`835`	`if((*it).gettype() == "table")`
`836`	`836`	`{`
`837`		`- sqlb::Table t((*it).getname());`
`838`		`- (it).fldmap = t.parseSQL((it).getsql()).first.fields();`
	`837`	`+ (it).table = sqlb::Table::parseSQL((it).getsql()).first;`
`839`	`838`	`} else if((*it).gettype() == "view") {`
`840`	`839`	statement = QString("PRAGMA TABLE_INFO(`%1`);").arg((*it).getname());
`841`	`840`	`logSQL(statement, kLogMsg_App);`
`@@ -849,7 +848,7 @@ void DBBrowserDB::updateSchema( )`
`849`	`848`	`QString val_type = QString::fromUtf8((const char *)sqlite3_column_text(vm, 2));`
`850`	`849`
`851`	`850`	`sqlb::FieldPtr f(new sqlb::Field(val_name, val_type));`
`852`		`- (*it).addField(f);`
	`851`	`+ (*it).table.addField(f);`
`853`	`852`	`}`
`854`	`853`	`}`
`855`	`854`	`sqlite3_finalize(vm);`