New schema support for tests. (#2355)

2018-04-12 18:42:43 +05:00 · 2018-04-12 18:42:43 +05:00 · 89d91b609a
parent d28064518b
commit 89d91b609a
1 changed files with 14 additions and 2 deletions
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@ -1083,9 +1083,21 @@ create_sql_tables(sqlite, _BaseDir) ->
 create_sql_tables(Type, BaseDir) ->
    {VHost, File} = case Type of
                        mysql ->
-                            {?MYSQL_VHOST, "mysql.sql"};
+                            Path = case ejabberd_sql:use_new_schema() of
+                                true ->
+                                    "mysql.new.sql";
+                                false ->
+                                    "mysql.sql"
+                            end,
+                            {?MYSQL_VHOST, Path};
                        pgsql ->
-                            {?PGSQL_VHOST, "pg.sql"}
+                            Path = case ejabberd_sql:use_new_schema() of
+                                true ->
+                                    "pg.new.sql";
+                                false ->
+                                    "pg.sql"
+                            end,
+                            {?PGSQL_VHOST, Path}
                    end,
    SQLFile = filename:join([BaseDir, "sql", File]),
    CreationQueries = read_sql_queries(SQLFile),