- Added foreign tables to the list of tables returned by getTables() and getTableNames() for PostgreSQL databases

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1599 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/sql/Database.java

@@ -787,7 +787,7 @@ public static Table[] getTables(Connection conn){
         java.util.ArrayList<Table> tables = new java.util.ArrayList<>();
         try{
             DatabaseMetaData dbmd = conn.getConnection().getMetaData();
-            try(ResultSet rs = dbmd.getTables(null,null,null,new String[]{"TABLE"})){
+            try(ResultSet rs = dbmd.getTables(null,null,null,getTableFilter(database))){
                 while (rs.next()) {
                     tables.add(new Table(rs, dbmd));
                 }
@@ -827,7 +827,7 @@ public String[] getTableNames() throws SQLException {
             try (Connection conn = getConnection()){
 
                 DatabaseMetaData dbmd = conn.getConnection().getMetaData();
-                try (ResultSet rs = dbmd.getTables(null,null,null,new String[]{"TABLE"})){
+                try (ResultSet rs = dbmd.getTables(null,null,null,getTableFilter(this))){
                     while (rs.next()) {
                         javaxt.utils.Record record = new javaxt.utils.Record();
                         record.set("schema", rs.getString("TABLE_SCHEM"));
@@ -853,6 +853,22 @@ public String[] getTableNames() throws SQLException {
     }
 
 
+  //**************************************************************************
+  //** getTableFilter
+  //**************************************************************************
+  /** Returns a filter used to generate a list of tables via DatabaseMetaData
+   */
+    private static String[] getTableFilter(Database database){
+        if (database!=null){
+            Driver driver = database.getDriver();
+            if (driver!=null && driver.equals("PostgreSQL")){
+                return new String[]{"TABLE", "FOREIGN TABLE"};
+            }
+        }
+        return new String[]{"TABLE"};
+    }
+
+
   //**************************************************************************
   //** getCatalogs
   //**************************************************************************