fix issue levinsv#6 (Child tables are not dispayed)

fix issue levinsv#6

Author: levinsv

README.md

@@ -126,7 +126,12 @@ This text Russian language.
 
 06.05.2020
  * исправлена проблема #4 (Crash after close sql editor)
- 
+  
+08.05.2020
+ * исправлена проблема #6 (Child tables are not dispayed). Отображение секций из других схем нарушает строгую иерархичность обектов 
+   и нужно убедиться что всё нормально в вашем случае. Секции всегда группируются в узел Partitions который находиться в родительской таблице.
+   В родной схеме, секции как таблицы увидеть нельзя.
+ * мелкие улучшения
 
 
 

Release_(3.0)/pgAdmin3.exe

@@ -4133,6 +4133,12 @@ void frmQuery::OnNotebookOutpaneTabRDown(wxAuiNotebookEvent &event) {
 	if (b.IsOk()) {
 		if (sqlQuery!=NULL) {
 			wxString sql=sqlResult->sqlquerytext;
+			if (sql.StartsWith("EXPLAIN")) sql=sql.AfterFirst(')');
+			if (sql.StartsWith("\nBEGIN;\nEXPLAIN")) { 
+				sql=sql.AfterFirst(')');
+				//"\n;\nROLLBACK;"
+				sql=sql.Mid(0,sql.Length()-12);
+			}
 			if (!sqlQuery->Find(sql,false,false,false,true,false,true)) {
 				wxString t=sqlQuery->GetText();
 				if (t.Find(sql)>-1) {

frm/frmQuery.cpp

@@ -210,7 +210,7 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
 
 	pgSet *tables;
 
-		query = wxT("SELECT rel.oid, rel.relname, rel.reltablespace AS spcoid, spc.spcname, pg_get_userbyid(rel.relowner) AS relowner, rel.relacl, ")
+		query = wxT("SELECT rel.oid, rel.relname,rel.relnamespace::regnamespace AS nspace, rel.reltablespace AS spcoid, spc.spcname, pg_get_userbyid(rel.relowner) AS relowner, rel.relacl, ")
 		        wxT("rel.relhassubclass, rel.reltuples, des.description, con.conname, con.conkey,\n")
 		        wxT("       EXISTS(select 1 FROM pg_trigger\n")
 		        wxT("                       JOIN pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger'\n")
@@ -262,7 +262,9 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
 		query += wxT("  LEFT OUTER JOIN pg_class tst ON tst.oid = rel.reltoastrelid\n");
 			query += wxT("LEFT JOIN pg_type typ ON rel.reloftype=typ.oid\n");
 
-		query += wxT(" WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = ") + collection->GetSchema()->GetOidStr() + wxT("\n");
+		query += wxT(" WHERE rel.relkind IN ('r','s','t','p')\n");
+		// show partitions in other schema
+		//query += wxT(" AND rel.relnamespace = ") + collection->GetSchema()->GetOidStr() + wxT("\n");
 		query += wxT("--AND (not (rel.relkind='r' and rel.relpartbound IS NOT NULL))\n ")
 				 wxT(" AND i.inhparent = ") + collection->GetOidStr() + wxT("\n");
 
@@ -273,9 +275,35 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
 	tables = collection->GetDatabase()->ExecuteSet(query);
 	if (tables)
 	{
+		wxString currns=collection->GetSchema()->GetName();
+//		wxArrayObject schemaArr;
+		std::vector<pgSchema*> schemaArr;
 		while (!tables->Eof())
 		{
-			table = new pgPartition(collection->GetSchema(), tables->GetVal(wxT("relname")));
+			wxString ns=tables->GetVal(wxT("nspace"));
+			if (currns!=ns) {
+				// find pgSchema object in tree
+			  if (!(schemaArr.size()>0)) {
+				wxTreeItemId currentItem = collection->GetSchema()->GetId();
+				pgCollection *collsch;
+				wxTreeItemId scItem;
+				if (currentItem) scItem = browser->GetItemParent(currentItem);
+				    collsch = (pgCollection *) browser->GetObject(scItem);
+					if (!collsch) continue;
+					treeObjectIterator schemaIterator(browser, collsch);
+					pgSchema *s;
+					while ((s = (pgSchema *)schemaIterator.GetNextObject()) != 0)
+						schemaArr.push_back(s);
+			  }
+			  table = 0;
+			  for (size_t j=0;j<schemaArr.size();j++)	{
+				  if (ns==schemaArr[j]->GetName()) {
+					  table = new pgPartition(schemaArr[j], tables->GetVal(wxT("relname")));
+					  break;
+				  }
+			  }
+			  if (!table) continue;
+			} else 	table = new pgPartition(collection->GetSchema(), tables->GetVal(wxT("relname")));
 
 			table->iSetOid(tables->GetOid(wxT("oid")));
 			table->iSetOwner(tables->GetVal(wxT("relowner")));
@@ -394,7 +422,7 @@ pgObject *pgPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser
 			else
 				break;
 		}
-
+		if (schemaArr.size()>0) schemaArr.clear();
 		delete tables;
 	}
 	return table;

schema/pgPartition.cpp

@@ -1556,7 +1556,7 @@ pgObject *pgTableFactory::CreateObjects(pgCollection *collection, ctlTree *brows
 			query += wxT(",\n(SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=rel.oid AND sl2.objsubid=0) AS providers");
 		}
 		wxString pg10=wxEmptyString;
-		if (collection->GetDatabase()->BackendMinimumVersion(10, 1))
+		if (collection->GetDatabase()->BackendMinimumVersion(10, 0))
 		{
 			query += wxT(",case when lk.relation=rel.oid then null else pg_get_partkeydef(rel.oid) end \n AS partkeydef");
 			query += wxT(",case when lk.relation=rel.oid then null else pg_get_expr(rel.relpartbound, rel.oid) end \n AS partexp");