SVN Commit by dpage: r4847 - in trunk/pgadmin3: . src/schema

Author: dpage
Date: 2005-12-15 09:28:22 +0000 (Thu, 15 Dec 2005)
New Revision: 4847

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/schema/pgSchema.cpp
Log:
Exclude system schemas by name rather than OID, so that 'public' can be safely renamed.

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-12-15 09:28:08 UTC (rev 4846)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-12-15 09:28:22 UTC (rev 4847)
@@ -18,6 +18,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-12-15 DP  1.4.2  Exclude system schemas by name rather than OID, so that 'public' can be safely renamed.
     <li>2005-12-12 AP  1.4.2  fix slony node statistics
     <li>2005-12-11 AP         support 8.1 language templates
     <li>2005-12-11 AP  1.4.2  Fix: Unsubscribe set on receiver

Modified: trunk/pgadmin3/src/schema/pgSchema.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgSchema.cpp    2005-12-15 09:28:08 UTC (rev 4846)
+++ trunk/pgadmin3/src/schema/pgSchema.cpp    2005-12-15 09:28:22 UTC (rev 4847)
@@ -174,8 +174,7 @@

     pgSet *schemas = collection->GetDatabase()->ExecuteSet(
         wxT("SELECT CASE WHEN nspname LIKE 'pg\\_temp\\_%%' THEN 1\n")
-        wxT("            WHEN (nsp.oid<") + NumToStr(collection->GetServer()->GetLastSystemOID()) +
-                         wxT(" OR nspname like 'pg\\_%') AND nspname != 'public' THEN 0\n")
+        wxT("            WHEN (nspname LIKE 'pg\\_%' OR nspname = 'information_schema') THEN 0\n")
         wxT("            ELSE 3 END AS nsptyp,\n")
         wxT("       nsp.nspname, nsp.oid, pg_get_userbyid(nspowner) AS namespaceowner, nspacl, description,")
         wxT("       has_schema_privilege(nsp.oid, 'CREATE') as cancreate\n")