Merge "Fix schema migration that creates index for submodule subscriptions"

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java

@@ -190,6 +190,11 @@ public class Init extends SiteProgram {
           return ui.yesno(def, msg);
         }
 
+        @Override
+        public boolean isBatch() {
+          return ui.isBatch();
+        }
+
         @Override
         public void pruneSchema(StatementExecutor e, List<String> prune) {
           for (String p : prune) {

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_68.java

@@ -35,6 +35,24 @@ public class Schema_68 extends SchemaVersion {
     try {
       stmt.execute("CREATE INDEX submodule_subscription_access_bySubscription"
           + " ON submodule_subscriptions (submodule_project_name, submodule_branch_name)");
+    } catch (SQLException e) {
+      // the index creation might have failed because the index exists already,
+      // in this case the exception can be safely ignored,
+      // but there are also other possible reasons for an exception here that
+      // should not be ignored,
+      // -> ask the user whether to ignore this exception or not
+      ui.message("warning: Cannot create index for submodule subscriptions");
+      ui.message(e.getMessage());
+
+      if (ui.isBatch()) {
+        ui.message("you may ignore this warning when running in interactive mode");
+        throw e;
+      } else {
+        final boolean answer = ui.yesno(false, "Ignore warning and proceed with schema upgrade");
+        if (!answer) {
+          throw e;
+        }
+      }
     } finally {
       stmt.close();
     }

gerrit-server/src/main/java/com/google/gerrit/server/schema/UpdateUI.java

@@ -24,6 +24,8 @@ public interface UpdateUI {
 
   boolean yesno(boolean def, String msg);
 
+  boolean isBatch();
+
   void pruneSchema(StatementExecutor e, List<String> pruneList)
       throws OrmException;
 }

gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java

@@ -107,6 +107,11 @@ public class SchemaUpdaterTest extends TestCase {
         return def;
       }
 
+      @Override
+      public boolean isBatch() {
+        return true;
+      }
+
       @Override
       public void pruneSchema(StatementExecutor e, List<String> pruneList)
           throws OrmException {