SONAR-3662 Remove the property sonar.jdbc.validationQuery

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index e48cda0d6d52396f751f58c2c5e8b01acc26717d..acdaba0433cee3954b0325cdbac4513190a924d3 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -45,7 +45,6 @@ sonar.jdbc.password:                       sonar
 # Comment the following line to deactivate the default embedded database.
 sonar.jdbc.url:                            jdbc:h2:tcp://localhost:9092/sonar
 #sonar.jdbc.driverClassName:                org.h2.Driver
-#sonar.jdbc.validationQuery:                values(1)
 
 # directory containing H2 database files. By default it's the /data directory in the sonar installation.
 #sonar.embeddedDatabase.dataDir:
@@ -59,7 +58,6 @@ sonar.jdbc.url:                            jdbc:h2:tcp://localhost:9092/sonar
 
 # Optional properties
 #sonar.jdbc.driverClassName:                com.mysql.jdbc.Driver
-#sonar.jdbc.validationQuery:                select 1
 
 
 #----- Oracle 10g/11g
@@ -73,7 +71,6 @@ sonar.jdbc.url:                            jdbc:h2:tcp://localhost:9092/sonar
 
 # Optional properties
 #sonar.jdbc.driverClassName:                oracle.jdbc.OracleDriver
-#sonar.jdbc.validationQuery:                select 1 from dual
 
 # Uncomment the following property if the Oracle account has permissions to access multiple schemas,
 # for example sonar schemas with different versions. In that case, use the same property during project analysis
@@ -87,7 +84,6 @@ sonar.jdbc.url:                            jdbc:h2:tcp://localhost:9092/sonar
 
 # Optional properties
 #sonar.jdbc.driverClassName:                org.postgresql.Driver
-#sonar.jdbc.validationQuery:                select 1
 
 # Uncomment the following property if the PostgreSQL account has permissions to access multiple schemas,
 # for example sonar schemas with different versions. In that case, use the same property during project analysis
@@ -101,7 +97,6 @@ sonar.jdbc.url:                            jdbc:h2:tcp://localhost:9092/sonar
 
 # Optional properties
 #sonar.jdbc.driverClassName:                net.sourceforge.jtds.jdbc.Driver
-#sonar.jdbc.validationQuery:                select 1  
 
 
 #----- Connection pool settings

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
index 7541819bee4c45fb2628b64078b364f8ebf419c5..d2e50aafbac992b00c160571cf34e6a08c2785c8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb
@@ -68,7 +68,6 @@ class Server
     add_property(sonar_info, 'Database Driver') {"#{jdbc_metadata.getDriverName()} #{jdbc_metadata.getDriverVersion()}"}
     add_property(sonar_info, 'Database Driver Class') {sonar_property('sonar.jdbc.driverClassName')}
     add_property(sonar_info, 'Database Dialect (Hibernate)') {"#{Java::OrgSonarServerUi::JRubyFacade.getInstance().getDatabase().getDialect().getId()} (#{Java::OrgSonarServerUi::JRubyFacade.getInstance().getDatabase().getDialect().getHibernateDialectClass().getName()})"}
-    add_property(sonar_info, 'Database Validation Query') {sonar_property('sonar.jdbc.validationQuery')}
     add_property(sonar_info, 'Hibernate Default Schema') {sonar_property('sonar.hibernate.default_schema')}
     add_property(sonar_info, 'External User Authentication') {sonar_property(org.sonar.api.CoreProperties.CORE_AUTHENTICATOR_CLASS)}
     add_property(sonar_info, 'Automatic User Creation') {sonar_property(org.sonar.api.CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS)}