diff --git a/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql b/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql index e292447512cc..edbf69e0b3f3 100644 --- a/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql +++ b/tests/queries/0_stateless/01047_window_view_parser_inner_table.sql @@ -3,7 +3,10 @@ SET allow_experimental_analyzer = 0; SET allow_experimental_window_view = 1; DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary; +SET send_logs_level='warning'; DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.mt; DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.mt_2; diff --git a/tests/queries/0_stateless/01048_window_view_parser.sql b/tests/queries/0_stateless/01048_window_view_parser.sql index f87d9aa023e2..7e92aa25b16b 100644 --- a/tests/queries/0_stateless/01048_window_view_parser.sql +++ b/tests/queries/0_stateless/01048_window_view_parser.sql @@ -4,7 +4,10 @@ SET allow_experimental_analyzer = 0; SET allow_experimental_window_view = 1; DROP DATABASE IF EXISTS test_01048; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01048 ENGINE=Ordinary; +SET send_logs_level='warning'; DROP TABLE IF EXISTS test_01048.mt; DROP TABLE IF EXISTS test_01048.mt_2; diff --git a/tests/queries/0_stateless/01053_drop_database_mat_view.sql b/tests/queries/0_stateless/01053_drop_database_mat_view.sql index 2642430eb05a..723c4eac4267 100644 --- a/tests/queries/0_stateless/01053_drop_database_mat_view.sql +++ b/tests/queries/0_stateless/01053_drop_database_mat_view.sql @@ -1,7 +1,10 @@ DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary; -- Different inner table name with Atomic +SET send_logs_level='warning'; set allow_deprecated_syntax_for_merge_tree=1; create table {CLICKHOUSE_DATABASE:Identifier}.my_table ENGINE = MergeTree(day, (day), 8192) as select today() as day, 'mystring' as str; diff --git a/tests/queries/0_stateless/01085_window_view_attach.sql b/tests/queries/0_stateless/01085_window_view_attach.sql index 51a88a04f950..32f7d50d3e9c 100644 --- a/tests/queries/0_stateless/01085_window_view_attach.sql +++ b/tests/queries/0_stateless/01085_window_view_attach.sql @@ -4,7 +4,10 @@ SET allow_experimental_window_view = 1; DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary; +SET send_logs_level='warning'; DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.mt; DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.wv; diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql index c118945887be..9cd2b4b32d04 100644 --- a/tests/queries/0_stateless/01109_exchange_tables.sql +++ b/tests/queries/0_stateless/01109_exchange_tables.sql @@ -31,7 +31,10 @@ DROP DATABASE IF EXISTS test_01109_other_atomic; DROP DATABASE IF EXISTS test_01109_ordinary; CREATE DATABASE test_01109_other_atomic; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01109_ordinary ENGINE=Ordinary; +SET send_logs_level='warning'; CREATE TABLE test_01109_other_atomic.t3 ENGINE=MergeTree() ORDER BY tuple() AS SELECT rowNumberInAllBlocks() + (SELECT max((*,*).1.1) + 1 FROM (SELECT (*,) FROM t1 UNION ALL SELECT (*,) FROM t2)), * @@ -63,6 +66,3 @@ DROP DATABASE test_01109; DROP DATABASE test_01109_other_atomic; DROP DATABASE test_01109_ordinary; DROP DATABASE test_01109_rename_exists; - - - diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql index 505c406c2cca..e21d3bdeac28 100644 --- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql +++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql @@ -32,7 +32,10 @@ SHOW CREATE TABLE test_01148_atomic.rmt3; DROP DATABASE IF EXISTS test_01148_ordinary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01148_ordinary ENGINE=Ordinary; +SET send_logs_level='warning'; RENAME TABLE test_01148_atomic.rmt3 to test_01148_ordinary.rmt3; -- { serverError 48 } DROP DATABASE test_01148_ordinary; DROP DATABASE test_01148_atomic; diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql index 1eff1c0779a9..32e467083fb5 100644 --- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql +++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql @@ -6,7 +6,10 @@ DROP DATABASE IF EXISTS test_01155_ordinary; DROP DATABASE IF EXISTS test_01155_atomic; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01155_ordinary ENGINE=Ordinary; +SET send_logs_level='warning'; CREATE DATABASE test_01155_atomic ENGINE=Atomic; USE test_01155_ordinary; @@ -70,7 +73,10 @@ RENAME DATABASE test_01155_ordinary TO test_01155_atomic; SET check_table_dependencies=1; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01155_ordinary ENGINE=Ordinary; +SET send_logs_level='warning'; SHOW CREATE DATABASE test_01155_atomic; RENAME TABLE test_01155_atomic.mv1 TO test_01155_ordinary.mv1; diff --git a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql index 5db92e706509..cf2fec2f2ddf 100644 --- a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql +++ b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql @@ -3,7 +3,10 @@ DROP DATABASE IF EXISTS dict_db_01224; DROP DATABASE IF EXISTS dict_db_01224_dictionary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE dict_db_01224 ENGINE=Ordinary; -- Different internal dictionary name with Atomic +SET send_logs_level='warning'; CREATE DATABASE dict_db_01224_dictionary Engine=Dictionary; CREATE TABLE dict_db_01224.dict_data (key UInt64, val UInt64) Engine=Memory(); diff --git a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql index bc733a0c5460..35d5c94dc8bf 100644 --- a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql +++ b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql @@ -3,7 +3,10 @@ DROP DATABASE IF EXISTS dict_db_01225; DROP DATABASE IF EXISTS dict_db_01225_dictionary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE dict_db_01225 ENGINE=Ordinary; -- Different internal dictionary name with Atomic +SET send_logs_level='warning'; CREATE DATABASE dict_db_01225_dictionary Engine=Dictionary; CREATE TABLE dict_db_01225.dict_data (key UInt64, val UInt64) Engine=Memory(); diff --git a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql index d187a2e4d4ec..0408e69317f4 100644 --- a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql +++ b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql @@ -2,7 +2,10 @@ DROP DATABASE IF EXISTS test_01249; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01249 ENGINE=Ordinary; -- Full ATTACH requires UUID with Atomic +SET send_logs_level='warning'; USE test_01249; CREATE TABLE bloom_filter_idx_good(`u64` UInt64, `i32` Int32, `f64` Float64, `d` Decimal(10, 2), `s` String, `e` Enum8('a' = 1, 'b' = 2, 'c' = 3), `dt` Date, INDEX bloom_filter_a i32 TYPE bloom_filter(0, 1) GRANULARITY 1) ENGINE = MergeTree() ORDER BY u64 SETTINGS index_granularity = 8192; -- { serverError 42 } diff --git a/tests/queries/0_stateless/01516_create_table_primary_key.sql b/tests/queries/0_stateless/01516_create_table_primary_key.sql index 630c573c2cc6..9f36a5ecff48 100644 --- a/tests/queries/0_stateless/01516_create_table_primary_key.sql +++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql @@ -2,7 +2,10 @@ DROP DATABASE IF EXISTS test_01516; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test_01516 ENGINE=Ordinary; -- Full ATTACH requires UUID with Atomic +SET send_logs_level='warning'; USE test_01516; DROP TABLE IF EXISTS primary_key_test; diff --git a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql index 67a2009b913c..b70da50d6aa2 100644 --- a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql +++ b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql @@ -33,7 +33,10 @@ show tables from db_01517_atomic_sync; --- drop database if exists db_01517_ordinary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; create database db_01517_ordinary Engine=Ordinary; +SET send_logs_level='warning'; create table db_01517_ordinary.source (key Int) engine=Null; create materialized view db_01517_ordinary.mv engine=Null as select * from db_01517_ordinary.source; diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql index 95c80e77213e..3450064e0638 100644 --- a/tests/queries/0_stateless/01601_detach_permanently.sql +++ b/tests/queries/0_stateless/01601_detach_permanently.sql @@ -73,7 +73,10 @@ SELECT 'database ordinary tests'; DROP DATABASE IF EXISTS test1601_detach_permanently_ordinary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE test1601_detach_permanently_ordinary Engine=Ordinary; +SET send_logs_level='warning'; create table test1601_detach_permanently_ordinary.test_name_reuse (number UInt64) engine=MergeTree order by tuple(); diff --git a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql index acf9f5207092..898ac877009e 100644 --- a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql +++ b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql @@ -2,7 +2,10 @@ DROP database IF EXISTS test_1603_rename_bug_ordinary; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; create database test_1603_rename_bug_ordinary engine=Ordinary; +SET send_logs_level='warning'; create table test_1603_rename_bug_ordinary.foo engine=Memory as select * from numbers(100); create table test_1603_rename_bug_ordinary.bar engine=Log as select * from numbers(200); detach table test_1603_rename_bug_ordinary.foo; diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.sql b/tests/queries/0_stateless/02096_rename_atomic_hang.sql index dec5f3f95067..0e9649f4397a 100644 --- a/tests/queries/0_stateless/02096_rename_atomic_hang.sql +++ b/tests/queries/0_stateless/02096_rename_atomic_hang.sql @@ -3,7 +3,10 @@ drop database if exists db_hang; drop database if exists db_hang_temp; set allow_deprecated_database_ordinary=1; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; create database db_hang engine=Ordinary; +SET send_logs_level='warning'; use db_hang; create table db_hang.test(A Int64) Engine=MergeTree order by A; create materialized view db_hang.test_mv(A Int64) Engine=MergeTree order by A as select * from db_hang.test; diff --git a/tests/queries/0_stateless/02988_ordinary_database_warning.sql b/tests/queries/0_stateless/02988_ordinary_database_warning.sql index e77d5c9fd8d5..666b28c08134 100644 --- a/tests/queries/0_stateless/02988_ordinary_database_warning.sql +++ b/tests/queries/0_stateless/02988_ordinary_database_warning.sql @@ -2,7 +2,10 @@ DROP DATABASE IF EXISTS 02988_ordinary; SET allow_deprecated_database_ordinary = 1; SET send_logs_level='fatal'; +-- Creation of a database with ENGINE=Ordinary results in a warning in server logs +SET send_logs_level='fatal'; CREATE DATABASE 02988_ordinary ENGINE=Ordinary; +SET send_logs_level='warning'; SELECT 'Ok.' FROM system.warnings WHERE message ILIKE '%Ordinary%' and message ILIKE '%deprecated%';