Skip to content

Commit

Permalink
Add better handling of multiple schemata in the Database Structure tab
Browse files Browse the repository at this point in the history 
Commit 532fcd3 added support for
multiple database schemata to the backend code. While doing this, it
removed support for showing temporary database objects in the user
interface.

This functionally is partially reimplemented by this commit. With this
commit temporary database objects are shown in the Database Structure
tab and in the Db Structure dock. Unlike before however, they are
visually separated from 'normal' database objects. Also this commit
tries to make use of the new schema handling code wherever possible to
also separate temporary objects programatically from the normal ones.
This wasn't done in earlier versions and effectively was a source of
all sorts of errors.

This commit still lacks support for temporary tables in the foreign key
editor and in the Browse Data tab. Also a substantial amount of testing
is still required.
  • Loading branch information
@MKleusberg
MKleusberg committed Sep 3, 2017
1 parent c616b39 commit 44eb2d4
Show file tree
Hide file tree
Showing 11 changed files with 267 additions and 156 deletions.
179 changes: 102 additions & 77 deletions src/DbStructureModel.cpp
View file
Expand Up @@ -14,7 +14,7 @@ DbStructureModel::DbStructureModel(DBBrowserDB& db, QObject* parent)
{ {
// Create root item and use its columns to store the header strings // Create root item and use its columns to store the header strings
QStringList header; QStringList header;
header << tr("Name") << tr("Object") << tr("Type") << tr("Schema"); header << tr("Name") << tr("Object") << tr("Type") << tr("Schema") << tr("Database");
rootItem = new QTreeWidgetItem(header); rootItem = new QTreeWidgetItem(header);
} }


Expand Down Expand Up @@ -60,7 +60,7 @@ Qt::ItemFlags DbStructureModel::flags(const QModelIndex &index) const
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled; Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;


// Only enable dragging for entire table objects // Only enable dragging for entire table objects
QString type = data(index.sibling(index.row(), 1), Qt::DisplayRole).toString(); QString type = data(index.sibling(index.row(), ColumnObjectType), Qt::DisplayRole).toString();
if(type == "table" || type == "view" || type == "index" || type == "trigger") if(type == "table" || type == "view" || type == "index" || type == "trigger")
flags |= Qt::ItemIsDragEnabled; flags |= Qt::ItemIsDragEnabled;


Expand Down Expand Up @@ -138,77 +138,22 @@ void DbStructureModel::reloadData()
// In the root node there are two nodes: 'browsables' and 'all'. The first node contains a list of a all browsable objects, i.e. views and tables. // In the root node there are two nodes: 'browsables' and 'all'. The first node contains a list of a all browsable objects, i.e. views and tables.
// The seconds node contains four sub-nodes (tables, indices, views and triggers), each containing a list of objects of that type. // The seconds node contains four sub-nodes (tables, indices, views and triggers), each containing a list of objects of that type.
// This way we only have to have and only have to update one model and can use it in all sorts of places, just by setting a different root node. // This way we only have to have and only have to update one model and can use it in all sorts of places, just by setting a different root node.
QMap<QString, QTreeWidgetItem*> typeToParentItem;

QTreeWidgetItem* itemBrowsables = new QTreeWidgetItem(rootItem); QTreeWidgetItem* itemBrowsables = new QTreeWidgetItem(rootItem);
itemBrowsables->setIcon(0, QIcon(QString(":/icons/view"))); itemBrowsables->setIcon(ColumnName, QIcon(QString(":/icons/view")));
itemBrowsables->setText(0, tr("Browsables (%1)").arg(m_db.schemata["main"].values("table").count() + m_db.schemata["main"].values("view").count())); itemBrowsables->setText(ColumnName, tr("Browsables"));
typeToParentItem.insert("browsable", itemBrowsables);


QTreeWidgetItem* itemAll = new QTreeWidgetItem(rootItem); QTreeWidgetItem* itemAll = new QTreeWidgetItem(rootItem);
itemAll->setIcon(0, QIcon(QString(":/icons/view"))); itemAll->setIcon(ColumnName, QIcon(QString(":/icons/database")));
itemAll->setText(0, tr("All")); itemAll->setText(ColumnName, tr("All"));

buildTree(itemAll, itemBrowsables, "main");
QTreeWidgetItem* itemTables = new QTreeWidgetItem(itemAll);
itemTables->setIcon(0, QIcon(QString(":/icons/table")));
itemTables->setText(0, tr("Tables (%1)").arg(m_db.schemata["main"].values("table").count()));
typeToParentItem.insert("table", itemTables);

QTreeWidgetItem* itemIndices = new QTreeWidgetItem(itemAll);
itemIndices->setIcon(0, QIcon(QString(":/icons/index")));
itemIndices->setText(0, tr("Indices (%1)").arg(m_db.schemata["main"].values("index").count()));
typeToParentItem.insert("index", itemIndices);

QTreeWidgetItem* itemViews = new QTreeWidgetItem(itemAll);
itemViews->setIcon(0, QIcon(QString(":/icons/view")));
itemViews->setText(0, tr("Views (%1)").arg(m_db.schemata["main"].values("view").count()));
typeToParentItem.insert("view", itemViews);

QTreeWidgetItem* itemTriggers = new QTreeWidgetItem(itemAll);
itemTriggers->setIcon(0, QIcon(QString(":/icons/trigger")));
itemTriggers->setText(0, tr("Triggers (%1)").arg(m_db.schemata["main"].values("trigger").count()));
typeToParentItem.insert("trigger", itemTriggers);

// Get all database objects and sort them by their name
QMultiMap<QString, sqlb::ObjectPtr> dbobjs;
for(auto it=m_db.schemata["main"].constBegin(); it != m_db.schemata["main"].constEnd(); ++it)
dbobjs.insert((*it)->name(), (*it));


// Add the actual table objects // Add the temporary database as a node if it isn't empty
for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it) if(!m_db.schemata["temp"].isEmpty())
{ {
// Object node QTreeWidgetItem* itemTemp = new QTreeWidgetItem(itemAll);
QTreeWidgetItem* item = addNode(typeToParentItem.value(sqlb::Object::typeToString((*it)->type())), *it); itemTemp->setIcon(ColumnName, QIcon(QString(":/icons/database")));

itemTemp->setText(ColumnName, tr("Temporary"));
// If it is a table or view add the field nodes, add an extra node for the browsable section buildTree(itemTemp, itemBrowsables, "temp");
if((*it)->type() == sqlb::Object::Types::Table || (*it)->type() == sqlb::Object::Types::View)
addNode(typeToParentItem.value("browsable"), *it);

// Add field nodes if there are any
sqlb::FieldInfoList fieldList = (*it)->fieldInformation();
if(!fieldList.empty())
{
QStringList pk_columns;
if((*it)->type() == sqlb::Object::Types::Table)
{
sqlb::FieldVector pk = (*it).dynamicCast<sqlb::Table>()->primaryKey();
foreach(sqlb::FieldPtr pk_col, pk)
pk_columns.push_back(pk_col->name());

}
foreach(const sqlb::FieldInfo& field, fieldList)
{
QTreeWidgetItem *fldItem = new QTreeWidgetItem(item);
fldItem->setText(0, field.name);
fldItem->setText(1, "field");
fldItem->setText(2, field.type);
fldItem->setText(3, field.sql);
if(pk_columns.contains(field.name))
fldItem->setIcon(0, QIcon(":/icons/field_key"));
else
fldItem->setIcon(0, QIcon(":/icons/field"));
}
}
} }


// Refresh the view // Refresh the view
Expand All @@ -229,19 +174,20 @@ QMimeData* DbStructureModel::mimeData(const QModelIndexList& indices) const
foreach(QModelIndex index, indices) foreach(QModelIndex index, indices)
{ {
// Only export data for valid indices and only for the SQL column, i.e. only once per row // Only export data for valid indices and only for the SQL column, i.e. only once per row
if(index.isValid() && index.column() == 3) if(index.isValid() && index.column() == ColumnSQL)
{ {
// Add the SQL code used to create the object // Add the SQL code used to create the object
d = d.append(data(index, Qt::DisplayRole).toString() + ";\n"); d = d.append(data(index, Qt::DisplayRole).toString() + ";\n");


// If it is a table also add the content // If it is a table also add the content
if(data(index.sibling(index.row(), 1), Qt::DisplayRole).toString() == "table") if(data(index.sibling(index.row(), ColumnObjectType), Qt::DisplayRole).toString() == "table")
{ {
SqliteTableModel tableModel(m_db); SqliteTableModel tableModel(m_db);
tableModel.setTable(sqlb::ObjectIdentifier("main", data(index.sibling(index.row(), 0), Qt::DisplayRole).toString())); tableModel.setTable(sqlb::ObjectIdentifier(data(index.sibling(index.row(), ColumnSchema), Qt::DisplayRole).toString(),
data(index.sibling(index.row(), ColumnName), Qt::DisplayRole).toString()));
for(int i=0; i < tableModel.rowCount(); ++i) for(int i=0; i < tableModel.rowCount(); ++i)
{ {
QString insertStatement = "INSERT INTO " + sqlb::escapeIdentifier(data(index.sibling(index.row(), 0), Qt::DisplayRole).toString()) + " VALUES("; QString insertStatement = "INSERT INTO " + sqlb::escapeIdentifier(data(index.sibling(index.row(), ColumnName), Qt::DisplayRole).toString()) + " VALUES(";
for(int j=1; j < tableModel.columnCount(); ++j) for(int j=1; j < tableModel.columnCount(); ++j)
insertStatement += QString("'%1',").arg(tableModel.data(tableModel.index(i, j)).toString()); insertStatement += QString("'%1',").arg(tableModel.data(tableModel.index(i, j)).toString());
insertStatement.chop(1); insertStatement.chop(1);
Expand Down Expand Up @@ -285,15 +231,94 @@ bool DbStructureModel::dropMimeData(const QMimeData* data, Qt::DropAction action
} }
} }


QTreeWidgetItem* DbStructureModel::addNode(QTreeWidgetItem* parent, const sqlb::ObjectPtr& object) void DbStructureModel::buildTree(QTreeWidgetItem* parent, QTreeWidgetItem* browsables, const QString& schema)
{
// Build a map from object type to tree node to simplify finding the correct tree node later
QMap<QString, QTreeWidgetItem*> typeToParentItem;

// Get object map for the given schema
objectMap objmap = m_db.schemata[schema];

// Prepare tree
QTreeWidgetItem* itemTables = new QTreeWidgetItem(parent);
itemTables->setIcon(ColumnName, QIcon(QString(":/icons/table")));
itemTables->setText(ColumnName, tr("Tables (%1)").arg(objmap.values("table").count()));
typeToParentItem.insert("table", itemTables);

QTreeWidgetItem* itemIndices = new QTreeWidgetItem(parent);
itemIndices->setIcon(ColumnName, QIcon(QString(":/icons/index")));
itemIndices->setText(ColumnName, tr("Indices (%1)").arg(objmap.values("index").count()));
typeToParentItem.insert("index", itemIndices);

QTreeWidgetItem* itemViews = new QTreeWidgetItem(parent);
itemViews->setIcon(ColumnName, QIcon(QString(":/icons/view")));
itemViews->setText(ColumnName, tr("Views (%1)").arg(objmap.values("view").count()));
typeToParentItem.insert("view", itemViews);

QTreeWidgetItem* itemTriggers = new QTreeWidgetItem(parent);
itemTriggers->setIcon(ColumnName, QIcon(QString(":/icons/trigger")));
itemTriggers->setText(ColumnName, tr("Triggers (%1)").arg(objmap.values("trigger").count()));
typeToParentItem.insert("trigger", itemTriggers);

// Get all database objects and sort them by their name
QMultiMap<QString, sqlb::ObjectPtr> dbobjs;
for(auto it=objmap.constBegin(); it != objmap.constEnd(); ++it)
dbobjs.insert((*it)->name(), (*it));

// Add the database objects to the tree nodes
for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it)
{
// Object node
QTreeWidgetItem* item = addNode(typeToParentItem.value(sqlb::Object::typeToString((*it)->type())), *it, schema);

// If it is a table or view add the field nodes, add an extra node for the browsable section
if((*it)->type() == sqlb::Object::Types::Table || (*it)->type() == sqlb::Object::Types::View)
{
// TODO We're currently only adding objects in the main schema to the list of browsable objects because browsing non-main objects
// isn't really supported in the main window yet. As soon as this is implemented the following if statement can be removed.
if(schema == "main")
addNode(browsables, *it, schema);
}

// Add field nodes if there are any
sqlb::FieldInfoList fieldList = (*it)->fieldInformation();
if(!fieldList.empty())
{
QStringList pk_columns;
if((*it)->type() == sqlb::Object::Types::Table)
{
sqlb::FieldVector pk = (*it).dynamicCast<sqlb::Table>()->primaryKey();
foreach(sqlb::FieldPtr pk_col, pk)
pk_columns.push_back(pk_col->name());

}
foreach(const sqlb::FieldInfo& field, fieldList)
{
QTreeWidgetItem *fldItem = new QTreeWidgetItem(item);
fldItem->setText(ColumnName, field.name);
fldItem->setText(ColumnObjectType, "field");
fldItem->setText(ColumnDataType, field.type);
fldItem->setText(ColumnSQL, field.sql);
fldItem->setText(ColumnSchema, schema);
if(pk_columns.contains(field.name))
fldItem->setIcon(ColumnName, QIcon(":/icons/field_key"));
else
fldItem->setIcon(ColumnName, QIcon(":/icons/field"));
}
}
}
}

QTreeWidgetItem* DbStructureModel::addNode(QTreeWidgetItem* parent, const sqlb::ObjectPtr& object, const QString& schema)
{ {
QString type = sqlb::Object::typeToString(object->type()); QString type = sqlb::Object::typeToString(object->type());


QTreeWidgetItem *item = new QTreeWidgetItem(parent); QTreeWidgetItem *item = new QTreeWidgetItem(parent);
item->setIcon(0, QIcon(QString(":/icons/%1").arg(type))); item->setIcon(ColumnName, QIcon(QString(":/icons/%1").arg(type)));
item->setText(0, object->name()); item->setText(ColumnName, object->name());
item->setText(1, type); item->setText(ColumnObjectType, type);
item->setText(3, object->originalSql()); item->setText(ColumnSQL, object->originalSql());
item->setText(ColumnSchema, schema);


return item; return item;
} }
12 changes: 11 additions & 1 deletion src/DbStructureModel.h
View file
Expand Up @@ -29,11 +29,21 @@ class DbStructureModel : public QAbstractItemModel
QMimeData* mimeData(const QModelIndexList& indices) const; QMimeData* mimeData(const QModelIndexList& indices) const;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);


enum Columns
{
ColumnName,
ColumnObjectType,
ColumnDataType,
ColumnSQL,
ColumnSchema,
};

private: private:
QTreeWidgetItem* rootItem; QTreeWidgetItem* rootItem;
DBBrowserDB& m_db; DBBrowserDB& m_db;


QTreeWidgetItem* addNode(QTreeWidgetItem* parent, const sqlb::ObjectPtr& object); void buildTree(QTreeWidgetItem* parent, QTreeWidgetItem* browsables, const QString& schema);
QTreeWidgetItem* addNode(QTreeWidgetItem* parent, const sqlb::ObjectPtr& object, const QString& schema);
}; };


#endif #endif
46 changes: 32 additions & 14 deletions src/EditIndexDialog.cpp
View file
Expand Up @@ -5,11 +5,11 @@
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>


EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const QString& indexName, bool createIndex, QWidget* parent) EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier& indexName, bool createIndex, QWidget* parent)
: QDialog(parent), : QDialog(parent),
pdb(db), pdb(db),
curIndex(indexName), curIndex(indexName),
index(indexName), index(indexName.name()),
newIndex(createIndex), newIndex(createIndex),
ui(new Ui::EditIndexDialog), ui(new Ui::EditIndexDialog),
m_sRestorePointName(pdb.generateSavepointName("editindex")) m_sRestorePointName(pdb.generateSavepointName("editindex"))
Expand All @@ -18,13 +18,31 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const QString& indexName, bool
ui->setupUi(this); ui->setupUi(this);


// Get list of tables, sort it alphabetically and fill the combobox // Get list of tables, sort it alphabetically and fill the combobox
objectMap dbobjs; QMap<QString, sqlb::ObjectIdentifier> dbobjs; // Map from display name to full object identifier
QList<sqlb::ObjectPtr> tables = pdb.schemata["main"].values("table"); if(newIndex) // If this is a new index, offer all tables of all database schemata
for(auto it=tables.constBegin();it!=tables.constEnd();++it) {
dbobjs.insert((*it)->name(), (*it)); for(auto it=pdb.schemata.constBegin();it!=pdb.schemata.constEnd();++it)
{
QList<sqlb::ObjectPtr> tables = it->values("table");
for(auto jt=tables.constBegin();jt!=tables.constEnd();++jt)
{
// Only show the schema name for non-main schemata
sqlb::ObjectIdentifier obj(it.key(), (*jt)->name());
dbobjs.insert(obj.toDisplayString(), obj);
}
}
} else { // If this is an existing index, only offer tables of the current database schema
QList<sqlb::ObjectPtr> tables = pdb.schemata[curIndex.schema()].values("table");
for(auto it=tables.constBegin();it!=tables.constEnd();++it)
{
// Only show the schema name for non-main schemata
sqlb::ObjectIdentifier obj(curIndex.schema(), (*it)->name());
dbobjs.insert(obj.toDisplayString(), obj);
}
}
ui->comboTableName->blockSignals(true); ui->comboTableName->blockSignals(true);
for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it) for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it)
ui->comboTableName->addItem(QIcon(QString(":icons/table")), (*it)->name()); ui->comboTableName->addItem(QIcon(QString(":icons/table")), it.key(), it.value().toVariant());
ui->comboTableName->blockSignals(false); ui->comboTableName->blockSignals(false);


QHeaderView *tableHeaderView = ui->tableIndexColumns->horizontalHeader(); QHeaderView *tableHeaderView = ui->tableIndexColumns->horizontalHeader();
Expand All @@ -34,7 +52,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const QString& indexName, bool
if(!newIndex) if(!newIndex)
{ {
// Load the current layout and fill in the dialog fields // Load the current layout and fill in the dialog fields
index = *(pdb.getObjectByName(sqlb::ObjectIdentifier("main", curIndex)).dynamicCast<sqlb::Index>()); index = *(pdb.getObjectByName(curIndex).dynamicCast<sqlb::Index>());


ui->editIndexName->blockSignals(true); ui->editIndexName->blockSignals(true);
ui->editIndexName->setText(index.name()); ui->editIndexName->setText(index.name());
Expand Down Expand Up @@ -76,7 +94,7 @@ void EditIndexDialog::tableChanged(const QString& new_table, bool initialLoad)
// Set the table name and clear all index columns // Set the table name and clear all index columns
if(!initialLoad) if(!initialLoad)
{ {
index.setTable(new_table); index.setTable(sqlb::ObjectIdentifier(ui->comboTableName->currentData()).name());
index.clearColumns(); index.clearColumns();
} }


Expand All @@ -94,7 +112,7 @@ void EditIndexDialog::tableChanged(const QString& new_table, bool initialLoad)
void EditIndexDialog::updateColumnLists() void EditIndexDialog::updateColumnLists()
{ {
// Fill the table column list // Fill the table column list
sqlb::FieldInfoList tableFields = pdb.getObjectByName(sqlb::ObjectIdentifier("main", index.table())).dynamicCast<sqlb::Table>()->fieldInformation(); sqlb::FieldInfoList tableFields = pdb.getObjectByName(sqlb::ObjectIdentifier(ui->comboTableName->currentData())).dynamicCast<sqlb::Table>()->fieldInformation();
ui->tableTableColumns->setRowCount(tableFields.size()); ui->tableTableColumns->setRowCount(tableFields.size());
int tableRows = 0; int tableRows = 0;
for(int i=0;i<tableFields.size();++i) for(int i=0;i<tableFields.size();++i)
Expand Down Expand Up @@ -237,15 +255,15 @@ void EditIndexDialog::accept()
// When editing an index, delete the old one first // When editing an index, delete the old one first
if(!newIndex) if(!newIndex)
{ {
if(!pdb.executeSQL(QString("DROP INDEX IF EXISTS %1;").arg(sqlb::escapeIdentifier(curIndex)))) if(!pdb.executeSQL(QString("DROP INDEX IF EXISTS %1;").arg(curIndex.toString())))
{ {
QMessageBox::warning(this, qApp->applicationName(), tr("Deleting the old index failed:\n%1").arg(pdb.lastError())); QMessageBox::warning(this, qApp->applicationName(), tr("Deleting the old index failed:\n%1").arg(pdb.lastError()));
return; return;
} }
} }


// Create the new index // Create the new index in the schema of the selected table
if(pdb.executeSQL(index.sql())) if(pdb.executeSQL(index.sql(sqlb::ObjectIdentifier(ui->comboTableName->currentData()).schema())))
QDialog::accept(); QDialog::accept();
else else
QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n%1").arg(pdb.lastError())); QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n%1").arg(pdb.lastError()));
Expand All @@ -261,7 +279,7 @@ void EditIndexDialog::reject()


void EditIndexDialog::updateSqlText() void EditIndexDialog::updateSqlText()
{ {
ui->sqlTextEdit->setText(index.sql()); ui->sqlTextEdit->setText(index.sql(sqlb::ObjectIdentifier(ui->comboTableName->currentData()).schema()));
} }


void EditIndexDialog::moveColumnUp() void EditIndexDialog::moveColumnUp()
Expand Down
4 changes: 2 additions & 2 deletions src/EditIndexDialog.h
View file
Expand Up @@ -17,7 +17,7 @@ class EditIndexDialog : public QDialog
Q_OBJECT Q_OBJECT


public: public:
explicit EditIndexDialog(DBBrowserDB& db, const QString& indexName, bool createIndex, QWidget* parent = 0); explicit EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier& indexName, bool createIndex, QWidget* parent = 0);
~EditIndexDialog(); ~EditIndexDialog();


private slots: private slots:
Expand All @@ -34,7 +34,7 @@ private slots:


private: private:
DBBrowserDB& pdb; DBBrowserDB& pdb;
QString curIndex; sqlb::ObjectIdentifier curIndex;
sqlb::Index index; sqlb::Index index;
bool newIndex; bool newIndex;
Ui::EditIndexDialog* ui; Ui::EditIndexDialog* ui;
Expand Down

0 comments on commit 44eb2d4

Please sign in to comment.