From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 10 Sep 2012 20:19:25 +0000 (+0200)
Subject: SONAR-3542 remove the JDBC parameters that are not supposed to be used by ActiveRecord
X-Git-Tag: 3.3~307
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eb794619ba4ceca7619283d5d4ca29270fe2f94a;p=sonarqube.git

SONAR-3542 remove the JDBC parameters that are not supposed to be used by ActiveRecord
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/config/database.yml b/sonar-server/src/main/webapp/WEB-INF/config/database.yml
index 0677de89998..fa2f9cc3b68 100644
--- a/sonar-server/src/main/webapp/WEB-INF/config/database.yml
+++ b/sonar-server/src/main/webapp/WEB-INF/config/database.yml
@@ -1,9 +1,6 @@
 base: &base
   adapter: jdbc
-  url: <%= ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getConfigurationValue('sonar.jdbc.url') %>
   dialect: <%= ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getDatabase().getDialect().getActiveRecordDialectCode() %>
-  driver: <%= ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getConfigurationValue('sonar.jdbc.driverClassName') %>
-  pool: <%= ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getConfigurationValue('sonar.jdbc.maxActive') || 10 %>
 
   # postgreSQL
   schema_search_path: <%= ::Java::OrgSonarServerUi::JRubyFacade.getInstance().getDatabase().getSchema() %>