Improve foreign key editor when working on tables in non-main schemata

MKleusberg · MKleusberg · commit 315019dd9ce0 · 2017-09-04T10:20:43.000+02:00
This improves commit 44eb2d4 by allowing to choose tables from other schemata than "main" in the foreign key editor in the Edit Table dialog. This still isn't perfect as only tables from the schema of the current table should be shown but with some care it should work for all use cases.
diff --git a/src/ForeignKeyEditorDelegate.cpp b/src/ForeignKeyEditorDelegate.cpp
@@ -81,11 +81,15 @@ ForeignKeyEditorDelegate::ForeignKeyEditorDelegate(const DBBrowserDB& db, sqlb::
     , m_db(db)
     , m_table(table)
 {
-    const auto objects = m_db.getBrowsableObjects("main");
-    for (auto& obj : objects) {
-        if (obj->type() == sqlb::Object::Types::Table) {
-            QString tableName = obj->name();
-            m_tablesIds.insert(tableName, obj.dynamicCast<sqlb::Table>()->fieldNames());
+    for(auto it=m_db.schemata.constBegin();it!=m_db.schemata.constEnd();++it)
+    {
+        for(auto jt=it->constBegin();jt!=it->constEnd();++jt)
+        {
+            if((*jt)->type() == sqlb::Object::Types::Table)
+            {
+                QString tableName = (*jt)->name();
+                m_tablesIds.insert(tableName, (*jt).dynamicCast<sqlb::Table>()->fieldNames());
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,15 @@ ForeignKeyEditorDelegate::ForeignKeyEditorDelegate(const DBBrowserDB& db, sqlb::`
`81`	`81`	`, m_db(db)`
`82`	`82`	`, m_table(table)`
`83`	`83`	`{`
`84`		`- const auto objects = m_db.getBrowsableObjects("main");`
`85`		`- for (auto& obj : objects) {`
`86`		`- if (obj->type() == sqlb::Object::Types::Table) {`
`87`		`- QString tableName = obj->name();`
`88`		`- m_tablesIds.insert(tableName, obj.dynamicCast<sqlb::Table>()->fieldNames());`
	`84`	`+ for(auto it=m_db.schemata.constBegin();it!=m_db.schemata.constEnd();++it)`
	`85`	`+ {`
	`86`	`+ for(auto jt=it->constBegin();jt!=it->constEnd();++jt)`
	`87`	`+ {`
	`88`	`+ if((*jt)->type() == sqlb::Object::Types::Table)`
	`89`	`+ {`
	`90`	`+ QString tableName = (*jt)->name();`
	`91`	`+ m_tablesIds.insert(tableName, (*jt).dynamicCast<sqlb::Table>()->fieldNames());`
	`92`	`+ }`
`89`	`93`	`}`
`90`	`94`	`}`
`91`	`95`	`}`