SONAR-3765 Better fix

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java
index 3e572aaae352f250663a2ffab92559f7c956af3d..0c80c7dc445cd54f36884fadde7dadef8c0a9c89 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java
@@ -30,7 +30,7 @@ public class H2 extends AbstractDialect {
   public static final String ID = "h2";
 
   public H2() {
-    super(ID, "h2", "org.h2.Driver", "true", "false", "SELECT 1");
+    super(ID, ".h2.", "org.h2.Driver", "true", "false", "SELECT 1");
   }
 
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java b/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java
index 6c4737514d1eb9fa2605d3ea4dc7df01556063fd..15a519e70f11125f3ca8e5f3ce7e3667db830ac1 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java
@@ -42,7 +42,7 @@ public class H2Test {
   @Test
   public void should_configure() {
     assertThat(h2.getId()).isEqualTo("h2");
-    assertThat(h2.getActiveRecordDialectCode()).isEqualTo("h2");
+    assertThat(h2.getActiveRecordDialectCode()).isEqualTo(".h2.");
     assertThat(h2.getDefaultDriverClassName()).isEqualTo("org.h2.Driver");
     assertThat(h2.getValidationQuery()).isEqualTo("SELECT 1");
   }

diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/better_quoting.rb b/sonar-server/src/main/webapp/WEB-INF/config/initializers/better_quoting.rb
deleted file mode 100644 (file)
index 60071f6..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/config/initializers/better_quoting.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Override quoting for database without a specific jdbc adapter
-# for example, H2
-#
-# Default quoting leads to bugs, see SONAR-3765
-#
-module ActiveRecord
-  module ConnectionAdapters # :nodoc:
-    module Quoting
-      def quote_string(s)
-        s.gsub(/'/, "''") # ' (for ruby-mode)
-      end
-    end
-  end
-end