Automatic merge from master

* origin/master:
  Db migration: do not test presence of table as it does not work for table "events" on mssql
  Complete documentation of db section in sonar.properties

2 files changed, 7 insertions, 6 deletions

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
index 3e0fed42893..20db504e78b 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
@@ -191,10 +191,8 @@ class ActiveRecord::Migration
     # Oracle constraint (see names of triggers and indices)
     raise ArgumentError, "Table name is too long: #{table_name}" if table_name.to_s.length>25
 
-    unless table_exists?(table_name)
-      super(table_name, options)
-      create_id_trigger(table_name) if dialect()=='oracle' && options[:id] != false
-    end
+    super(table_name, options)
+    create_id_trigger(table_name) if dialect()=='oracle' && options[:id] != false
   end
 
   def drop_table(table_name, options = {})
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index f01fac2ebd2..22d2367f4fd 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -28,6 +28,8 @@
 
 
 #----- MySQL 5.x
+# Only InnoDB storage engine is supported (not myISAM).
+# Only the bundled driver is supported.
 #sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance
 
 
@@ -44,8 +46,9 @@
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonar
 
 
-#----- Microsoft SQLServer 2005/2008
-# Only the distributed jTDS driver is supported.
+#----- Microsoft SQLServer 2008/2012
+# Only the bundled jTDS driver is supported.
+# Collation must be case-sensitive (CS) and accent-sensitive (AS).
 #sonar.jdbc.url=jdbc:jtds:sqlserver://localhost/sonar;SelectMethod=Cursor