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

14 files changed, 22 insertions, 22 deletions

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 fc12f2a622e..63989086b88 100644
--- 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};

-USE ${sonar.jdbc.username};

-sp_addalias ${sonar.jdbc.username}, dbo;

+create database ${jdbcUsername};

+USE ${jdbcUsername};

+sp_addalias ${jdbcUsername}, dbo;

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 66a82965dc4..7dbe22ac4af 100644
--- 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 ad92da2ded4..0df041a5fe1 100644
--- 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 e5fa30a9a26..2c26c0be78b 100644
--- 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 e3a1eca1e38..abeeba33763 100644
--- 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 de353c36070..b2bb96a7b8d 100644
--- 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 9f97c9ae458..ac1ee5da0b7 100644
--- 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 aaf18e4eaad..cae40f993ef 100644
--- 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 49b09decb97..302aef07595 100644
--- 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 299ec925be6..dc0c5cf34d3 100644
--- 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 2cdda76defc..9f21e36bd2e 100644
--- 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 d3cf35a438d..96822e499d8 100644
--- 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 12cca84099b..7c7c5cb0f38 100644
--- 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 319856fac78..646dd40346d 100644
--- 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