Fix merge issues

h2/src/main/org/h2/command/ddl/DropSynonym.java

@@ -15,6 +15,7 @@ import org.h2.engine.Session;
 import org.h2.message.DbException;
 import org.h2.schema.Schema;
 import org.h2.table.Table;
+import org.h2.table.TableType;
 import org.h2.table.TableView;
 
 /**
@@ -43,7 +44,7 @@ public class DropSynonym extends SchemaCommand {
                 throw DbException.get(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, synonymName);
             }
         } else {
-            if (!Table.SYNONYM.equals(synonym.getTableType())) {
+            if (!TableType.SYNONYM.equals(synonym.getTableType())) {
                 throw DbException.get(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, synonymName);
             }
             session.getUser().checkRight(synonym, Right.ALL);

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

@@ -1879,7 +1879,7 @@ public class MetaTable extends Table {
         }
         case SYNONYMS: {
                 for (Table table : getAllTables(session)) {
-                    if (!table.getTableType().equals(Table.SYNONYM)) {
+                    if (!table.getTableType().equals(TableType.SYNONYM)) {
                         continue;
                     }
                     String synonymName = identifier(table.getName());

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

@@ -99,8 +99,8 @@ public class TableSynonym extends Table {
     }
 
     @Override
-    public String getTableType() {
-        return SYNONYM;
+    public TableType getTableType() {
+        return TableType.SYNONYM;
     }
 
     @Override

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

@@ -33,7 +33,12 @@ public enum TableType {
     /**
      * The table type name for external table engines.
      */
-    EXTERNAL_TABLE_ENGINE;
+    EXTERNAL_TABLE_ENGINE,
+
+    /**
+     * The table type name for synonyms.
+     */
+    SYNONYM;
 
     @Override
     public String toString() {

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

@@ -1086,6 +1086,8 @@ public class TestMetaData extends TestBase {
         rs.next();
         assertEquals("SETTINGS", rs.getString("TABLE_NAME"));
         rs.next();
+        assertEquals("SYNONYMS", rs.getString("TABLE_NAME"));
+        rs.next();
         assertEquals("TABLES", rs.getString("TABLE_NAME"));
         rs.next();
         assertEquals("TABLE_PRIVILEGES", rs.getString("TABLE_NAME"));