Skip to content

Commit 5177ad2

Browse files
committed
simplify user cleanup (postfix)
DROP USER IF EXISTS for consistenty with other drop users.
1 parent f99ab8b commit 5177ad2

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

10.2/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.3/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.4/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.5/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.6/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.7/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

10.8/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ docker_setup_db() {
303303
SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
304304
305305
DROP USER IF EXISTS root@'127.0.0.1', root@'::1';
306-
EXECUTE IMMEDIATE CONCAT('drop user root@\'', @@hostname,'\'');
306+
EXECUTE IMMEDIATE CONCAT('DROP USER IF EXISTS root@\'', @@hostname,'\'');
307307
308308
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
309309
${rootCreate}

0 commit comments

Comments
 (0)