Merge pull request #36914 from yrodiere/safer-test-init

Reset databases/users for each Hibernate ORM tenancy test module

integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/custom-mariadbconfig/init.sql

@@ -1,13 +1,13 @@
-CREATE DATABASE IF NOT EXISTS base;
-CREATE DATABASE IF NOT EXISTS mycompany;
-CREATE DATABASE IF NOT EXISTS inventory;
-CREATE DATABASE IF NOT EXISTS inventorymycompany;
+CREATE OR REPLACE DATABASE base;
+CREATE OR REPLACE DATABASE mycompany;
+CREATE OR REPLACE DATABASE inventory;
+CREATE OR REPLACE DATABASE inventorymycompany;
 
-CREATE USER IF NOT EXISTS 'jane'@'%' IDENTIFIED BY 'abc';
+CREATE OR REPLACE USER 'jane'@'%' IDENTIFIED BY 'abc';
 GRANT ALL privileges ON base.* TO 'jane'@'%';
 GRANT ALL privileges ON mycompany.* TO 'jane'@'%';
 
-CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
+CREATE OR REPLACE USER 'john'@'%' IDENTIFIED BY 'def';
 GRANT ALL privileges ON inventory.* TO 'john'@'%';
 GRANT ALL privileges ON inventorymycompany.* TO 'john'@'%';
 

integration-tests/hibernate-orm-tenancy/connection-resolver/custom-mariadbconfig/init.sql

@@ -1,13 +1,13 @@
-CREATE DATABASE IF NOT EXISTS base;
-CREATE DATABASE IF NOT EXISTS mycompany;
-CREATE DATABASE IF NOT EXISTS inventory;
-CREATE DATABASE IF NOT EXISTS inventorymycompany;
+CREATE OR REPLACE DATABASE base;
+CREATE OR REPLACE DATABASE mycompany;
+CREATE OR REPLACE DATABASE inventory;
+CREATE OR REPLACE DATABASE inventorymycompany;
 
-CREATE USER IF NOT EXISTS 'jane'@'%' IDENTIFIED BY 'abc';
+CREATE OR REPLACE USER 'jane'@'%' IDENTIFIED BY 'abc';
 GRANT ALL privileges ON base.* TO 'jane'@'%';
 GRANT ALL privileges ON mycompany.* TO 'jane'@'%';
 
-CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
+CREATE OR REPLACE USER 'john'@'%' IDENTIFIED BY 'def';
 GRANT ALL privileges ON inventory.* TO 'john'@'%';
 GRANT ALL privileges ON inventorymycompany.* TO 'john'@'%';
 

integration-tests/hibernate-orm-tenancy/datasource/custom-mariadbconfig/init.sql

@@ -1,17 +1,14 @@
-CREATE DATABASE IF NOT EXISTS base;
-CREATE USER IF NOT EXISTS 'jane'@'%' IDENTIFIED BY 'abc';
-GRANT ALL privileges ON base.* TO 'jane'@'%';
-
-CREATE DATABASE IF NOT EXISTS mycompany;
-CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
-GRANT ALL privileges ON mycompany.* TO 'john'@'%';
+CREATE OR REPLACE DATABASE base;
+CREATE OR REPLACE DATABASE mycompany;
+CREATE OR REPLACE DATABASE inventory;
+CREATE OR REPLACE DATABASE inventorymycompany;
 
-CREATE DATABASE IF NOT EXISTS inventory;
-CREATE USER IF NOT EXISTS 'jane'@'%' IDENTIFIED BY 'abc';
+CREATE OR REPLACE USER 'jane'@'%' IDENTIFIED BY 'abc';
+GRANT ALL privileges ON base.* TO 'jane'@'%';
 GRANT ALL privileges ON inventory.* TO 'jane'@'%';
 
-CREATE DATABASE IF NOT EXISTS inventorymycompany;
-CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
+CREATE OR REPLACE USER 'john'@'%' IDENTIFIED BY 'def';
+GRANT ALL privileges ON mycompany.* TO 'john'@'%';
 GRANT ALL privileges ON inventorymycompany.* TO 'john'@'%';
 
 FLUSH PRIVILEGES;