glom r1876 - in branches/glom-1-8: . glom

[murrayc svn gnome org]

Author: murrayc
Date: Tue Feb  3 17:13:17 2009
New Revision: 1876
URL: http://svn.gnome.org/viewvc/glom?rev=1876&view=rev

Log:
2009-02-03  Murray Cumming  <murrayc murrayc com>

* glom/base_db.cc: get_table_names_from_database(): Filter out some 
extra internal table names which may be created/reported by newer 
versions of libgda.

Modified:
   branches/glom-1-8/ChangeLog
   branches/glom-1-8/glom/base_db.cc

Modified: branches/glom-1-8/glom/base_db.cc
==============================================================================
--- branches/glom-1-8/glom/base_db.cc	(original)
+++ branches/glom-1-8/glom/base_db.cc	Tue Feb  3 17:13:17 2009
@@ -317,23 +317,28 @@
         {
           table_name = value.get_string();
 
-          bool add_it = true;
-
           if(ignore_system_tables)
           {
             //Check whether it's a system table:
             const Glib::ustring prefix = "glom_system_";
             const Glib::ustring table_prefix = table_name.substr(0, prefix.size());
             if(table_prefix == prefix)
-              add_it = false;
+              continue;
           }
 
           //Ignore the pga_* tables that pgadmin adds when you use it:
           if(table_name.substr(0, 4) == "pga_")
-            add_it = false;
+            continue;
+
+          //Ignore the pg_* tables that something (Postgres? libgda?) adds:
+          if(table_name.substr(0, 14) == "pg_catalog.pg_")
+            continue;
+
+          //Ignore the information_schema tables that something (libgda?) adds:
+          if(table_name.substr(0, 23) == "information_schema.sql_")
+            continue;
 
-          if(add_it)
-            result.push_back(table_name);
+          result.push_back(table_name);
         }
       }
     }