1 files changed, 8 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
index 9dd1eed5611..e40d012dda0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
@@ -59,7 +59,7 @@ class DatabaseVersion
     $uptodate
   end
 
-  def self.migrate_and_start
+  def self.upgrade_and_start
     ActiveRecord::Migrator.migrate(migrations_path)
     Java::OrgSonarServerPlatform::Platform.getInstance().start()
     load_plugin_webservices()
@@ -72,10 +72,12 @@ class DatabaseVersion
   def self.automatic_setup
     if current_version<=0
       try_restore_structure_dump() if use_structure_dump?
-      migrate_and_start()
+      upgrade_and_start()
     end
     if uptodate?
       load_plugin_webservices()
+    else
+      puts "Server must be upgraded. Please browse /setup"
     end
     uptodate?
   end
@@ -117,4 +119,8 @@ class DatabaseVersion
     # default value is true
     ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getConfigurationValue('sonar.useStructureDump')!='false'
   end
+
+  def self.upgradable?
+    dialect()!='derby'
+  end
 end
 \ No newline at end of file