SONAR-1821 Regression: creating/dropping database does not work

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-db.sql
index fc12f2a622ea2113e0c065d6f2b8fed8747f0fd6..63989086b888b3d644ba485b605bbdb45dcec2cd 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-db.sql
@@ -1,3 +1,3 @@
-create database ${sonar.jdbc.username};\r
-USE ${sonar.jdbc.username};\r
-sp_addalias ${sonar.jdbc.username}, dbo;\r
+create database ${jdbcUsername};\r
+USE ${jdbcUsername};\r
+sp_addalias ${jdbcUsername}, dbo;\r

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-user.sql
index 66a82965dc4d0a81e04759b87bdadc1685281c30..7dbe22ac4afab19066e08534afccb07d2a9c5a54 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/create-user.sql
@@ -1 +1 @@
-CREATE LOGIN ${sonar.jdbc.username} WITH PASSWORD = '${sonar.jdbc.password}', CHECK_POLICY=OFF;
+CREATE LOGIN ${jdbcUsername} WITH PASSWORD = '${jdbcPassword}', CHECK_POLICY=OFF;

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-db.sql
index ad92da2ded44db5ba2279d2ef02c928beaa5190d..0df041a5fe1032d34625d1eda0c3dfad66607176 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-db.sql
@@ -1 +1 @@
-drop database ${sonar.jdbc.username};
\ No newline at end of file
+drop database ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-user.sql
index e5fa30a9a2603190b152001abf43645bc4d33ea6..2c26c0be78b749c9cc3f4453af3eebfd26c9bf42 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mssql/drop-user.sql
@@ -1 +1 @@
-drop login ${sonar.jdbc.username};
\ No newline at end of file
+drop login ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-db.sql
index e3a1eca1e3848c3cd4eb71dbbee644d000136ebe..abeeba33763eec7f0183827b58b64dcf39a3db73 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-db.sql
@@ -1 +1 @@
-create database ${sonar.jdbc.username} character set utf8;
\ No newline at end of file
+create database ${jdbcUsername} character set utf8;
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-user.sql
index de353c36070a62f7836063b2a0f7c8d3523e183e..b2bb96a7b8d19b0b2907976454c4493ddc1a3433 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/create-user.sql
@@ -1,3 +1,3 @@
-create user '${sonar.jdbc.username}' IDENTIFIED BY '${sonar.jdbc.password}';
-GRANT ALL ON ${sonar.jdbc.username}.* TO '${sonar.jdbc.username}'@'%' IDENTIFIED BY '${sonar.jdbc.password}';
-GRANT ALL ON ${sonar.jdbc.username}.* TO '${sonar.jdbc.username}'@'localhost' IDENTIFIED BY '${sonar.jdbc.password}';
\ No newline at end of file
+create user '${jdbcUsername}' IDENTIFIED BY '${jdbcPassword}';
+GRANT ALL ON ${jdbcUsername}.* TO '${jdbcUsername}'@'%' IDENTIFIED BY '${jdbcPassword}';
+GRANT ALL ON ${jdbcUsername}.* TO '${jdbcUsername}'@'localhost' IDENTIFIED BY '${jdbcPassword}';
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-db.sql
index 9f97c9ae45881226f88be3354abccdca8d165836..ac1ee5da0b7ccd9efab2ad6ebc67bfc004d9d2aa 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-db.sql
@@ -1 +1 @@
-drop database IF EXISTS ${sonar.jdbc.username};
\ No newline at end of file
+drop database IF EXISTS ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-user.sql
index aaf18e4eaadcd70b4aa50a9537d8f98aec31b0d8..cae40f993ef275ebd43f9fa3ed735a5357ca62c7 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/mysql/drop-user.sql
@@ -1 +1 @@
-drop user '${sonar.jdbc.username}'@'%';
\ No newline at end of file
+drop user '${jdbcUsername}'@'%';
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/create-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/create-user.sql
index 49b09decb97960ca02f79e83ce8cac12f00e82c4..302aef0759556e39b34fb9dec5c2f40f5c8b9d9e 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/create-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/create-user.sql
@@ -1,5 +1,5 @@
-CREATE USER ${sonar.jdbc.username} IDENTIFIED BY ${sonar.jdbc.password} DEFAULT TABLESPACE USERS ACCOUNT UNLOCK;
-GRANT CONNECT TO ${sonar.jdbc.username};
-GRANT RESOURCE TO ${sonar.jdbc.username};
-GRANT CREATE TABLE to ${sonar.jdbc.username};
-GRANT CREATE SEQUENCE to ${sonar.jdbc.username};
\ No newline at end of file
+CREATE USER ${jdbcUsername} IDENTIFIED BY ${jdbcPassword} DEFAULT TABLESPACE USERS ACCOUNT UNLOCK;
+GRANT CONNECT TO ${jdbcUsername};
+GRANT RESOURCE TO ${jdbcUsername};
+GRANT CREATE TABLE to ${jdbcUsername};
+GRANT CREATE SEQUENCE to ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/drop-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/drop-user.sql
index 299ec925be6eb34d0cb3033d369de080b31e6e0b..dc0c5cf34d37c873a8509ae49d52744a3deaf6c1 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/drop-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/oracle/drop-user.sql
@@ -1 +1 @@
-DROP USER ${sonar.jdbc.username} CASCADE;
\ No newline at end of file
+DROP USER ${jdbcUsername} CASCADE;
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-db.sql
index 2cdda76defc516f9e9143d6c055c254e4cee6197..9f21e36bd2efd7ca45e2a5e453157e3240a7dd88 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-db.sql
@@ -1 +1 @@
-CREATE DATABASE ${sonar.jdbc.username};
\ No newline at end of file
+CREATE DATABASE ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-user.sql
index d3cf35a438ddba35c52885558a844a06ef21eda7..96822e499d8554f76d7db2e59e8703807e10aa6a 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/create-user.sql
@@ -1 +1 @@
-CREATE USER ${sonar.jdbc.username} WITH PASSWORD '${sonar.jdbc.password}' CREATEDB;
\ No newline at end of file
+CREATE USER ${jdbcUsername} WITH PASSWORD '${jdbcPassword}' CREATEDB;
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-db.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-db.sql
index 12cca84099bd9176068b72afd7feaf012db1ab4c..7c7c5cb0f389b49e092206a5dce7f001e4308f2c 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-db.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-db.sql
@@ -1 +1 @@
-DROP DATABASE IF EXISTS ${sonar.jdbc.username};
\ No newline at end of file
+DROP DATABASE IF EXISTS ${jdbcUsername};
\ No newline at end of file

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-user.sql b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-user.sql
index 319856fac78d1d1eae1247fb47d9422c9338c96b..646dd40346ddbd6ee1ff563bbe05e62d65586d10 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-user.sql
+++ b/subprojects/sonar-dev-maven-plugin/src/main/resources/database/postgresql/drop-user.sql
@@ -1 +1 @@
-DROP USER IF EXISTS ${sonar.jdbc.username};
\ No newline at end of file
+DROP USER IF EXISTS ${jdbcUsername};
\ No newline at end of file