ClickHouse#58363 - add change to SettingsChangesHistory.h and fix fai…

…ling tests which use pretty by setting output_format_pretty_color=1

src/Core/SettingsChangesHistory.h

@@ -85,6 +85,7 @@ static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> sett
               {"input_format_parquet_allow_missing_columns", false, true, "Allow missing columns in Parquet files by default"},
               {"input_format_orc_allow_missing_columns", false, true, "Allow missing columns in ORC files by default"},
               {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}}},
+              {"output_format_pretty_color",true,"auto","Setting is changed to allow also for auto value, disabling ANSI escapes if output is not a tty"}
     {"23.9", {{"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
               {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
               {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},

tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql

@@ -1 +1,2 @@
+SET output_format_pretty_color=1;
 SELECT (toDate('2000-01-01'), toDate('2000-01-01')) AS x FORMAT PrettyCompact;

tests/queries/0_stateless/00098_k_union_all.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SELECT 1 FORMAT PrettySpace;
 SELECT 1 UNION ALL SELECT 1 FORMAT PrettySpace;
 SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1 FORMAT PrettySpace;

tests/queries/0_stateless/00298_enum_width_and_cast.sql

@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS enum;
 
+SET output_format_pretty_color=1;
 CREATE TABLE enum (x Enum8('Hello' = -100, '\\' = 0, '\t\\t' = 111), y UInt8) ENGINE = TinyLog;
 INSERT INTO enum (y) VALUES (0);
 SELECT * FROM enum ORDER BY x, y FORMAT PrettyCompact;

tests/queries/0_stateless/00405_PrettyCompactMonoBlock.sh

@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 echo 'one block'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(2)" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(2) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock
 echo 'two blocks'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(1) UNION ALL SELECT * FROM numbers(1)" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(1) UNION ALL SELECT * FROM numbers(1) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock
 echo 'extremes'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(3)" --format PrettyCompactMonoBlock --extremes=1
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(3) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock --extremes=1
 echo 'totals'
-${CLICKHOUSE_LOCAL} --query="SELECT sum(number) FROM numbers(3) GROUP BY number%2 WITH TOTALS ORDER BY number%2" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT sum(number) FROM numbers(3) GROUP BY number%2 WITH TOTALS ORDER BY number%2 SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock

tests/queries/0_stateless/00405_pretty_formats.sql

@@ -1,3 +1,5 @@
+SET output_format_pretty_color = 1;
+
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT Pretty;
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompact;
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpace;

tests/queries/0_stateless/00476_pretty_formats_and_widths.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT Pretty;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT PrettyCompact;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT PrettySpace;

tests/queries/0_stateless/00818_inner_join_bug_3567.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color = 1;
 SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;

tests/queries/0_stateless/01018_ambiguous_column.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SET allow_experimental_analyzer = 1;
 
 select * from system.one cross join system.one;

tests/queries/0_stateless/01074_partial_revokes.sql

@@ -43,7 +43,7 @@ REVOKE SELECT ON db.* FROM test_user_01074;
 GRANT SELECT ON db.table TO test_user_01074;
 REVOKE SELECT(col1) ON db.table FROM test_user_01074;
 SHOW GRANTS FOR test_user_01074;
-SELECT * FROM system.grants WHERE user_name = 'test_user_01074' format Pretty;
+SELECT * FROM system.grants WHERE user_name = 'test_user_01074' SETTINGS output_format_pretty_color=1 FORMAT Pretty;
 
 SELECT '--cleanup';
 REVOKE SELECT ON *.* FROM test_user_01074;
@@ -73,7 +73,7 @@ SELECT '--grant option 1';
 GRANT SELECT ON *.* TO test_user_01074 WITH GRANT OPTION;
 REVOKE GRANT OPTION FOR SELECT(col1) ON db.table FROM test_user_01074;
 SHOW GRANTS FOR test_user_01074;
-SELECT * FROM system.grants WHERE user_name = 'test_user_01074' format Pretty;
+SELECT * FROM system.grants WHERE user_name = 'test_user_01074' SETTINGS output_format_pretty_color=1 FORMAT Pretty;
 
 SELECT '--cleanup';
 REVOKE SELECT ON *.* FROM test_user_01074;

tests/queries/0_stateless/01293_pretty_max_value_width.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
 
 SET output_format_pretty_max_value_width = 5;

tests/queries/0_stateless/01472_many_rows_in_totals.sql

@@ -1,3 +1,5 @@
+set output_format_pretty_color=1;
+
 -- Disable external aggregation because it may produce several blocks instead of one.
 set max_bytes_before_external_group_by = 0;
 set output_format_write_statistics = 0;

tests/queries/0_stateless/01509_output_format_pretty_row_numbers.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SELECT * FROM numbers(10) FORMAT Pretty;
 SELECT * FROM numbers(10) FORMAT PrettyCompact;
 SELECT * FROM numbers(10) FORMAT PrettyCompactMonoBlock;

tests/queries/0_stateless/01670_neighbor_lc_bug.sql

@@ -40,6 +40,7 @@ FROM
     ORDER BY val_string, rowNr
 )
 ORDER BY rowNr, val_string, str_m1, str_p1, val_low, low_m1, low_p1
+SETTINGS output_format_pretty_color=1
 format PrettyCompact;
 
 drop table if exists neighbor_test;

tests/queries/0_stateless/01671_merge_join_and_constants.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;

tests/queries/0_stateless/02152_bool_type.sql

@@ -1,3 +1,5 @@
+SET output_format_pretty_color=1;
+
 SELECT CAST('True', 'Bool');
 SELECT CAST('TrUe', 'Bool');
 SELECT CAST('true', 'Bool');

tests/queries/0_stateless/02375_pretty_formats.sql.j2

@@ -3,6 +3,6 @@
                   'PrettySpaceNoEscapesMonoBlock'] -%}
 
 select '{{ format }}';
-select number as x, number + 1 as y from numbers(4) settings max_block_size=2 format {{ format }};
+select number as x, number + 1 as y from numbers(4) settings max_block_size=2, output_format_pretty_color=1 format {{ format }};
 
 {% endfor -%}

tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.sh

@@ -13,7 +13,7 @@ ${CLICKHOUSE_CURL} \
      from numbers_mt(1e6)
      where number = 42
      group by number
-     settings max_threads = 10, max_bytes_before_external_group_by = 1, group_by_two_level_threshold = 1
+     settings max_threads = 10, max_bytes_before_external_group_by = 1, group_by_two_level_threshold = 1, output_format_pretty_color=1
      format PrettyCompact"
 
 ${CLICKHOUSE_CURL} \
@@ -24,5 +24,5 @@ ${CLICKHOUSE_CURL} \
     from numbers_mt(1e6)
     where number = 42
     group by number
-    settings max_threads = 10, max_bytes_before_external_group_by = 0, group_by_two_level_threshold = 1
+    settings max_threads = 10, max_bytes_before_external_group_by = 0, group_by_two_level_threshold = 1, output_format_pretty_color=1
     format PrettyCompact"

tests/queries/0_stateless/02798_explain_settings_not_applied_bug.sql

@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SET read_in_order_two_level_merge_threshold=1000000;
 
 DROP TABLE IF EXISTS t;

tests/queries/0_stateless/02896_union_distinct_http_format.sh

@@ -4,5 +4,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT 1 UNION DISTINCT SELECT 1 FORMAT PrettyCompactMonoBlock'
-curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT * FROM (SELECT 1 as a UNION DISTINCT SELECT 2 as a) ORDER BY a FORMAT PrettyCompactMonoBlock'
+curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT 1 UNION DISTINCT SELECT 1 SETTINGS output_format_pretty_color=1 FORMAT PrettyCompactMonoBlock'
+curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT * FROM (SELECT 1 as a UNION DISTINCT SELECT 2 as a) ORDER BY a SETTINGS output_format_pretty_color=1 FORMAT PrettyCompactMonoBlock'