Escape the value of sonar.jdbc.schema on Oracle

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
index 85347d471069b7d5c152e483ee50c16ef05534f7..eb92ca54b4a274d2b414019e26b2e4639d17d7ef 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
@@ -72,7 +72,7 @@ public class Oracle implements Dialect {
 
   public String getConnectionInitStatement(String schema) {
     if (StringUtils.isNotBlank(schema)) {
-      return "ALTER SESSION SET CURRENT_SCHEMA = " + schema;
+      return "ALTER SESSION SET CURRENT_SCHEMA = \"" + schema + "\"";
     }
     return null;
   }

diff --git a/sonar-core/src/test/java/org/sonar/jpa/dialect/OracleTest.java b/sonar-core/src/test/java/org/sonar/jpa/dialect/OracleTest.java
index 008e076acd457d04c0148392d38d8ad612581cf4..b7c549d78e5af4d3f1a1791bd92e40ed0f25577f 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/jpa/dialect/OracleTest.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/dialect/OracleTest.java
@@ -40,7 +40,7 @@ public class OracleTest {
   public void shouldChangeOracleSchema() {
     String initStatement = new Oracle().getConnectionInitStatement("my_schema");
 
-    assertThat(initStatement, Is.is("ALTER SESSION SET CURRENT_SCHEMA = my_schema"));
+    assertThat(initStatement, Is.is("ALTER SESSION SET CURRENT_SCHEMA = \"my_schema\""));
   }
 
   @Test