Add index columns to database structure tree

In the Database Structure tab and dock tree widgets, make the indices expandable and show their indexed columns as child nodes.
yunzixun · Jan 27, 2017 · 901e087 · 901e087
1 parent 28ddbc4
commit 901e087
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/DbStructureModel.cpp b/src/DbStructureModel.cpp
@@ -180,13 +180,14 @@ void DbStructureModel::reloadData()
         // Object node
         QTreeWidgetItem* item = addNode(typeToParentItem.value(sqlb::Object::typeToString((*it)->type())), *it);
 
-        // If it is a table or view add the field nodes
+        // 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)
-        {
-            // Add extra node for browsable section
             addNode(typeToParentItem.value("browsable"), *it);
 
-            // Add field nodes
+        // 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)
             {
@@ -195,7 +196,6 @@ void DbStructureModel::reloadData()
                     pk_columns.push_back(pk_col->name());
 
             }
-            sqlb::FieldInfoList fieldList = (*it)->fieldInformation();
             foreach(const sqlb::FieldInfo& field, fieldList)
             {
                 QTreeWidgetItem *fldItem = new QTreeWidgetItem(item);

diff --git a/src/sqlitetypes.cpp b/src/sqlitetypes.cpp
@@ -1055,6 +1055,14 @@ QString Index::sql() const
     return sql + ";";
 }
 
+FieldInfoList Index::fieldInformation() const
+{
+    FieldInfoList result;
+    foreach(IndexedColumnPtr c, m_columns)
+        result.append({c->name(), c->order(), c->toString("  ", " ")});
+    return result;
+}
+
 ObjectPtr Index::parseSQL(const QString& sSQL)
 {
     std::stringstream s;

diff --git a/src/sqlitetypes.h b/src/sqlitetypes.h
@@ -377,6 +377,8 @@ class Index : public Object
      */
     static ObjectPtr parseSQL(const QString& sSQL);
 
+    virtual FieldInfoList fieldInformation() const;
+
 private:
     QStringList columnSqlList() const;