From 27c9d0fd5ead1cb27a2e8b2e5c5d89c88451f6b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:05:19 -0400 Subject: [PATCH] chore(deps): update clickhouse/clickhouse-server docker tag to v24.3.2.23 (#8885) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Phillip Cloud <417981+cpcloud@users.noreply.github.com> --- compose.yaml | 2 +- ibis/backends/clickhouse/tests/test_select.py | 3 ++- ibis/backends/tests/test_array.py | 5 ---- ibis/backends/tests/test_generic.py | 23 ++++++------------- ibis/backends/tests/test_window.py | 5 ---- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/compose.yaml b/compose.yaml index 265a21f87947..1fdfc09cc8fc 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: clickhouse: - image: clickhouse/clickhouse-server:24.2.2.71-alpine + image: clickhouse/clickhouse-server:24.3.2.23-alpine ports: - 8123:8123 # http port - 9000:9000 # native protocol port diff --git a/ibis/backends/clickhouse/tests/test_select.py b/ibis/backends/clickhouse/tests/test_select.py index 609e44782238..9b9e69f3d52c 100644 --- a/ibis/backends/clickhouse/tests/test_select.py +++ b/ibis/backends/clickhouse/tests/test_select.py @@ -6,6 +6,7 @@ from pytest import param import ibis +from ibis.backends.tests.errors import ClickHouseDatabaseError cc = pytest.importorskip("clickhouse_connect") @@ -196,7 +197,7 @@ def test_non_equijoin(alltypes): expr.compile() # while execution should fail since clickhouse doesn't support non-equijoin - with pytest.raises(Exception, match="Unsupported JOIN ON conditions"): + with pytest.raises(ClickHouseDatabaseError, match="INVALID_JOIN_ON_EXPRESSION"): expr.execute() diff --git a/ibis/backends/tests/test_array.py b/ibis/backends/tests/test_array.py index c9768eff3d72..de04c9557665 100644 --- a/ibis/backends/tests/test_array.py +++ b/ibis/backends/tests/test_array.py @@ -796,11 +796,6 @@ def test_array_intersect(con, data): @builtin_array -@pytest.mark.notimpl( - ["clickhouse"], - raises=ClickHouseDatabaseError, - reason="ClickHouse won't accept dicts for struct type values", -) @pytest.mark.notimpl(["postgres"], raises=PsycoPg2SyntaxError) @pytest.mark.notimpl(["risingwave"], raises=PsycoPg2InternalError) @pytest.mark.notimpl(["datafusion", "flink"], raises=com.OperationNotDefinedError) diff --git a/ibis/backends/tests/test_generic.py b/ibis/backends/tests/test_generic.py index 1013bfb7c7b4..ceb49f793807 100644 --- a/ibis/backends/tests/test_generic.py +++ b/ibis/backends/tests/test_generic.py @@ -1595,7 +1595,12 @@ def test_static_table_slice(backend, slc, expected_count_fn): # negative stop param(slice(-3, -2), lambda _: 1, id="[-3:-2]"), # positive stop - param(slice(-4000, 7000), lambda _: 3700, id="[-4000:7000]"), + param( + slice(-4000, 7000), + lambda _: 3700, + id="[-4000:7000]", + marks=[pytest.mark.notyet("clickhouse", raises=ClickHouseDatabaseError)], + ), param( slice(-3, 2), lambda _: 0, @@ -1606,6 +1611,7 @@ def test_static_table_slice(backend, slc, expected_count_fn): raises=PyODBCProgrammingError, reason="sqlglot generates code that requires > 0 fetch rows", ), + pytest.mark.notyet("clickhouse", raises=ClickHouseDatabaseError), ], ), ################## @@ -1642,11 +1648,6 @@ def test_static_table_slice(backend, slc, expected_count_fn): reason="backend doesn't support dynamic limit/offset", ) @pytest.mark.notimpl(["exasol"], raises=ExaQueryError) -@pytest.mark.notyet( - ["clickhouse"], - raises=ClickHouseDatabaseError, - reason="clickhouse doesn't support dynamic limit/offset", -) @pytest.mark.notyet(["druid"], reason="druid doesn't support dynamic limit/offset") @pytest.mark.notyet(["polars"], reason="polars doesn't support dynamic limit/offset") @pytest.mark.notyet( @@ -1697,11 +1698,6 @@ def test_dynamic_table_slice(backend, slc, expected_count_fn): reason="backend doesn't support dynamic limit/offset", ) @pytest.mark.notimpl(["exasol"], raises=ExaQueryError) -@pytest.mark.notyet( - ["clickhouse"], - raises=ClickHouseDatabaseError, - reason="clickhouse doesn't support dynamic limit/offset", -) @pytest.mark.notyet(["druid"], reason="druid doesn't support dynamic limit/offset") @pytest.mark.notyet(["polars"], reason="polars doesn't support dynamic limit/offset") @pytest.mark.notyet( @@ -1975,11 +1971,6 @@ def test_select_sort_sort_deferred(backend, alltypes, df): backend.assert_frame_equal(result, expected) -@pytest.mark.broken( - ["clickhouse"], - raises=AssertionError, - reason="https://github.com/ClickHouse/ClickHouse/issues/61313", -) @pytest.mark.notimpl( ["pandas", "dask"], raises=IndexError, reason="NaN isn't treated as NULL" ) diff --git a/ibis/backends/tests/test_window.py b/ibis/backends/tests/test_window.py index 802de0ab8bd0..a41787985df5 100644 --- a/ibis/backends/tests/test_window.py +++ b/ibis/backends/tests/test_window.py @@ -924,11 +924,6 @@ def test_ungrouped_unbounded_window( @pytest.mark.notimpl( ["impala"], raises=ImpalaHiveServer2Error, reason="limited RANGE support" ) -@pytest.mark.notyet( - ["clickhouse"], - reason="RANGE OFFSET frame for 'DB::ColumnNullable' ORDER BY column is not implemented", - raises=ClickHouseDatabaseError, -) @pytest.mark.notyet(["mssql"], raises=PyODBCProgrammingError) @pytest.mark.broken( ["mysql"],