From ec13350b240ce3c43084418bf92726124def9b90 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 4 Oct 2023 21:15:07 +0200
Subject: [PATCH] Test: Enable update_sql_schema

- Test: Enable update_sql_schema by default
- Update test/README about new option
- enable new_schema in tests
---
 test/README                           | 6 ++++--
 test/ejabberd_SUITE_data/ejabberd.yml | 2 ++
 test/ejabberd_SUITE_data/macros.yml   | 1 +
 test/suite.erl                        | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/README b/test/README
index 68ff183dc..8254230d2 100644
--- a/test/README
+++ b/test/README
@@ -17,7 +17,8 @@ $ psql template1
 template1=# CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';
 template1=# CREATE DATABASE ejabberd_test;
 template1=# GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;
-$ psql ejabberd_test -f sql/pg.sql
+# If you disabled the update_sql_schema option, create the schema manually:
+# $ psql ejabberd_test -f sql/pg.sql
 
 -------------------
   MySQL
@@ -26,7 +27,8 @@ $ mysql
 mysql> CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';
 mysql> CREATE DATABASE ejabberd_test;
 mysql> GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';
-$ mysql ejabberd_test < sql/mysql.sql
+# If you disabled the update_sql_schema option, create the schema manually:
+# $ mysql ejabberd_test < sql/mysql.sql
 
 -------------------
   MS SQL Server
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index ebbcfa596..d3a24315f 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -161,6 +161,8 @@ certfiles:
 
 new_sql_schema: NEW_SCHEMA
 
+update_sql_schema: UPDATE_SQL_SCHEMA
+
 api_permissions:
   "public commands":
     who: all
diff --git a/test/ejabberd_SUITE_data/macros.yml b/test/ejabberd_SUITE_data/macros.yml
index e4270d4c1..5391562ba 100644
--- a/test/ejabberd_SUITE_data/macros.yml
+++ b/test/ejabberd_SUITE_data/macros.yml
@@ -14,6 +14,7 @@ define_macro:
   PUT_URL: "http://upload.@HOST@:@@web_port@@/upload"
   GET_URL: "http://upload.@HOST@:@@web_port@@/upload"
   NEW_SCHEMA: @@new_schema@@
+  UPDATE_SQL_SCHEMA: @@update_sql_schema@@
   MYSQL_USER: "@@mysql_user@@"
   MYSQL_SERVER: "@@mysql_server@@"
   MYSQL_PORT: @@mysql_port@@
diff --git a/test/suite.erl b/test/suite.erl
index 38803c517..198a4b596 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -59,6 +59,7 @@ init_config(Config) ->
 		      [{c2s_port, 5222},
 		       {loglevel, 4},
 		       {new_schema, false},
+		       {update_sql_schema, true},
 		       {s2s_port, 5269},
 		       {stun_port, 3478},
 		       {component_port, 5270},