From 268057f5ed963b10ea1993db9010dbee837eb5d6 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 3 Jul 2012 19:37:00 +0200 Subject: [PATCH] Forgot these files during H2 migration --- sonar-server/src/main/webapp/WEB-INF/config/environment.rb | 4 ++-- sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb | 2 +- start-mac-derby.sh => start-mac-h2.sh | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename start-mac-derby.sh => start-mac-h2.sh (100%) diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb index fa5caee27e7..f70f92d15c3 100644 --- a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb +++ b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb @@ -80,8 +80,8 @@ class ActiveRecord::Migration execute "ALTER TABLE #{tablename} ALTER COLUMN id TYPE bigint" when "mysql" execute "ALTER TABLE #{tablename} CHANGE id id BIGINT AUTO_INCREMENT" - when "derby" - # do nothing as alter can not do the job in Derby + when "h2" + # not needed? when "oracle" # do nothing, oracle integer are big enough when "sqlserver" 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 16307e73596..2f4870706d4 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 @@ -106,7 +106,7 @@ class DatabaseVersion def self.production? @@production ||= begin - dialect()!='derby' + dialect()!='h2' end end end diff --git a/start-mac-derby.sh b/start-mac-h2.sh similarity index 100% rename from start-mac-derby.sh rename to start-mac-h2.sh -- 2.39.5