diff options
| author | David Gageot <david@gageot.net> | 2012-07-03 19:37:00 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-07-04 09:05:59 +0200 |
| commit | 268057f5ed963b10ea1993db9010dbee837eb5d6 (patch) | |
| tree | ec89deaeb5f55120ea96531e33715c8fe68be890 | |
| parent | 9fe8aa8e6f0747203d0c6f3afe04be2970787fe2 (diff) | |
| download | sonarqube-268057f5ed963b10ea1993db9010dbee837eb5d6.tar.gz sonarqube-268057f5ed963b10ea1993db9010dbee837eb5d6.zip | |
Forgot these files during H2 migration
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/config/environment.rb | 4 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb | 2 | ||||
| -rwxr-xr-x | start-mac-h2.sh (renamed from start-mac-derby.sh) | 0 |
3 files changed, 3 insertions, 3 deletions
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 index a26c7b10af0..a26c7b10af0 100755 --- a/start-mac-derby.sh +++ b/start-mac-h2.sh |