Pull request #2: Add external metadata type support

h2/src/docsrc/html/changelog.html

@@ -20,7 +20,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>MS SQL Server: the CONVERT method did not work in views
+<ul><li>Pull request #2: Add external metadata type support (table type "external")
+</li><li>MS SQL Server: the CONVERT method did not work in views
     and derrived tables.
 </li><li>Java 8 compatibility for "regexp_replace".
 </li></ul>

h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java

@@ -769,10 +769,8 @@ public class JdbcDatabaseMetaData extends TraceObject implements
     }
 
     /**
-     * Gets the list of table types. This call returns a result set with three
-     * records: "SYSTEM TABLE", "TABLE", "and "VIEW".
-     * The result set is sorted by TABLE_TYPE.
-     *
+     * Gets the list of table types. This call returns a result set with five
+     * records: "SYSTEM TABLE", "TABLE", "VIEW", "TABLE LINK" and "EXTERNAL".
      * <ul>
      * <li>1 TABLE_TYPE (String) table type
      * </li></ul>

h2/src/main/org/h2/table/MetaTable.java

@@ -893,6 +893,7 @@ public class MetaTable extends Table {
             add(rows, Table.TABLE_LINK);
             add(rows, Table.SYSTEM_TABLE);
             add(rows, Table.VIEW);
+            add(rows, Table.EXTERNAL_TABLE_ENGINE);
             break;
         }
         case CATALOGS: {

h2/src/test/org/h2/test/jdbc/TestMetaData.java

@@ -943,7 +943,8 @@ public class TestMetaData extends TestBase {
         rs = meta.getTableTypes();
         assertResultSetMeta(rs, 1, new String[] { "TABLE_TYPE" },
                 new int[] { Types.VARCHAR }, null, null);
-        assertResultSetOrdered(rs, new String[][] { { "SYSTEM TABLE" },
+        assertResultSetOrdered(rs, new String[][] {
+                { "EXTERNAL" }, { "SYSTEM TABLE" },
                 { "TABLE" }, { "TABLE LINK" }, { "VIEW" } });
 
         rs = meta.getTypeInfo();
@@ -1019,6 +1020,8 @@ public class TestMetaData extends TestBase {
 
         rs = meta.getTableTypes();
         rs.next();
+        assertEquals("EXTERNAL", rs.getString("TABLE_TYPE"));
+        rs.next();
         assertEquals("SYSTEM TABLE", rs.getString("TABLE_TYPE"));
         rs.next();
         assertEquals("TABLE", rs.getString("TABLE_TYPE"));