Recover tool: the script generated by the recover tool didn't work if fulltext…

Recover tool: the script generated by the recover tool didn't work if fulltext search was used, because the triggers were created before the primary keys.

h2/src/main/org/h2/tools/Recover.java

@@ -1184,8 +1184,7 @@ public class Recover extends Tool implements DataHandler {
         writer.println("---- Schema ----");
         Collections.sort(schema);
         for (MetaRecord m : schema) {
-            int t = m.getObjectType();
-            if (t != DbObject.INDEX && t != DbObject.CONSTRAINT) {
+            if (!isSchemaObjectTypeDelayed(m)) {
                 // create, but not referential integrity constraints and so on
                 // because they could fail on duplicate keys
                 String sql = m.getSQL();
@@ -1234,15 +1233,23 @@ public class Recover extends Tool implements DataHandler {
             writer.println("DELETE FROM INFORMATION_SCHEMA.LOBS WHERE TABLE = " + LobStorage.TABLE_TEMP + ";");
         }
         for (MetaRecord m : schema) {
-            int t = m.getObjectType();
-            if (t == DbObject.INDEX || t == DbObject.CONSTRAINT) {
-                // create indexes and constraints
+            if (isSchemaObjectTypeDelayed(m)) {
                 String sql = m.getSQL();
                 writer.println(sql + ";");
             }
         }
     }
 
+    private boolean isSchemaObjectTypeDelayed(MetaRecord m) {
+        switch (m.getObjectType()) {
+        case DbObject.INDEX:
+        case DbObject.CONSTRAINT:
+        case DbObject.TRIGGER:
+            return true;
+        }
+        return false;
+    }
+
     private void createTemporaryTable(PrintWriter writer) {
         if (!objectIdSet.contains(storageId)) {
             objectIdSet.add(storageId);

h2/src/test/org/h2/test/unit/TestRecovery.java

@@ -36,6 +36,7 @@ public class TestRecovery extends TestBase {
     }
 
     public void test() throws Exception {
+        testRecoverFulltext();
         testRedoTransactions();
         testCorrupt();
         testWithTransactionLog();
@@ -43,6 +44,21 @@ public class TestRecovery extends TestBase {
         testRunScript();
     }
 
+    private void testRecoverFulltext() throws Exception {
+        DeleteDbFiles.execute(getBaseDir(), "recovery", true);
+        Connection conn = getConnection("recovery");
+        Statement stat = conn.createStatement();
+        stat.execute("CREATE ALIAS IF NOT EXISTS FTL_INIT FOR \"org.h2.fulltext.FullTextLucene.init\"");
+        stat.execute("CALL FTL_INIT()");
+        stat.execute("create table test(id int primary key, name varchar) as select 1, 'Hello'");
+        stat.execute("CALL FTL_CREATE_INDEX('PUBLIC', 'TEST', 'NAME')");
+        conn.close();
+        Recover.main("-dir", getBaseDir(), "-db", "recovery");
+        DeleteDbFiles.execute(getBaseDir(), "recovery", true);
+        conn = getConnection("recovery;init=runscript from '" + getBaseDir() + "/recovery.h2.sql'");
+        conn.close();
+    }
+
     private void testRedoTransactions() throws Exception {
         DeleteDbFiles.execute(getBaseDir(), "recovery", true);
         Connection conn = getConnection("recovery");