fix(clickhouse): do not always prefix the table name with database, b…

…ecause temp tables cannot be assigned a database

ibis/backends/clickhouse/__init__.py

@@ -468,9 +468,7 @@ def close(self) -> None:
         self.con.close()
 
     def _fully_qualified_name(self, name: str, database: str | None) -> str:
-        return sg.table(name, db=database or self.current_database or None).sql(
-            dialect="clickhouse"
-        )
+        return sg.table(name, db=database).sql(dialect="clickhouse")
 
     def get_schema(self, table_name: str, database: str | None = None) -> sch.Schema:
         """Return a Schema object for the indicated table and database.

ibis/backends/clickhouse/tests/snapshots/test_select/test_complex_array_expr_projection/out.sql

@@ -4,7 +4,7 @@ FROM (
   SELECT
     t0.string_col,
     count(*) AS count
-  FROM ibis_testing.functional_alltypes AS t0
+  FROM functional_alltypes AS t0
   GROUP BY
     t0.string_col
 ) AS t1

ibis/backends/clickhouse/tests/snapshots/test_select/test_isin_notin_in_select/out1.sql

@@ -1,5 +1,5 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0
 WHERE
   t0.string_col IN ('foo', 'bar')

ibis/backends/clickhouse/tests/snapshots/test_select/test_isin_notin_in_select/out2.sql

@@ -1,5 +1,5 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0
 WHERE
   NOT t0.string_col IN ('foo', 'bar')

ibis/backends/clickhouse/tests/snapshots/test_select/test_isnull_case_expr_rewrite_failure/out.sql

@@ -1,3 +1,3 @@
 SELECT
   sum(CASE WHEN isNull(t0.string_col) THEN 1 ELSE 0 END) AS "Sum(Where(IsNull(string_col), 1, 0))"
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0

ibis/backends/clickhouse/tests/snapshots/test_select/test_join_self_reference/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.functional_alltypes AS t0
-INNER JOIN ibis_testing.functional_alltypes AS t1
+FROM functional_alltypes AS t0
+INNER JOIN functional_alltypes AS t1
   ON t0.id = t1.id

ibis/backends/clickhouse/tests/snapshots/test_select/test_physical_table_reference_translate/out.sql

@@ -1,3 +1,3 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes
+FROM functional_alltypes

ibis/backends/clickhouse/tests/snapshots/test_select/test_self_reference_simple/out.sql

@@ -1,3 +1,3 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-awardID-any_inner_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-ANY JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+ANY JOIN awards_players AS t1
   ON t0.playerID = t1.awardID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-awardID-any_left_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-LEFT ANY JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+LEFT ANY JOIN awards_players AS t1
   ON t0.playerID = t1.awardID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-awardID-inner_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-INNER JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+INNER JOIN awards_players AS t1
   ON t0.playerID = t1.awardID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-awardID-left_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-LEFT OUTER JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+LEFT OUTER JOIN awards_players AS t1
   ON t0.playerID = t1.awardID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-playerID-any_inner_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-ANY JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+ANY JOIN awards_players AS t1
   ON t0.playerID = t1.playerID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-playerID-any_left_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-LEFT ANY JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+LEFT ANY JOIN awards_players AS t1
   ON t0.playerID = t1.playerID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-playerID-inner_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-INNER JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+INNER JOIN awards_players AS t1
   ON t0.playerID = t1.playerID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_joins/playerID-playerID-left_join/out.sql

@@ -1,5 +1,5 @@
 SELECT
   t0.*
-FROM ibis_testing.batting AS t0
-LEFT OUTER JOIN ibis_testing.awards_players AS t1
+FROM batting AS t0
+LEFT OUTER JOIN awards_players AS t1
   ON t0.playerID = t1.playerID

ibis/backends/clickhouse/tests/snapshots/test_select/test_simple_scalar_aggregates/out.sql

@@ -1,5 +1,5 @@
 SELECT
   sum(t0.float_col) AS "Sum(float_col)"
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0
 WHERE
   t0.int_col > 0

ibis/backends/clickhouse/tests/snapshots/test_select/test_table_column_unbox/out.sql

@@ -4,7 +4,7 @@ FROM (
   SELECT
     t0.string_col,
     sum(t0.float_col) AS total
-  FROM ibis_testing.functional_alltypes AS t0
+  FROM functional_alltypes AS t0
   WHERE
     t0.int_col > 0
   GROUP BY

ibis/backends/clickhouse/tests/snapshots/test_select/test_timestamp_extract_field/out.sql

@@ -5,4 +5,4 @@ SELECT
   toHour(t0.timestamp_col) AS hour,
   toMinute(t0.timestamp_col) AS minute,
   toSecond(t0.timestamp_col) AS second
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0

ibis/backends/clickhouse/tests/snapshots/test_select/test_where_simple_comparisons/out.sql

@@ -1,6 +1,6 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0
 WHERE
   t0.float_col > 0 AND t0.int_col < (
     t0.float_col * 2

ibis/backends/clickhouse/tests/snapshots/test_select/test_where_with_between/out.sql

@@ -1,5 +1,5 @@
 SELECT
   *
-FROM ibis_testing.functional_alltypes AS t0
+FROM functional_alltypes AS t0
 WHERE
   t0.int_col > 0 AND t0.float_col BETWEEN 0 AND 1

ibis/backends/clickhouse/tests/test_client.py

@@ -10,7 +10,6 @@
 import ibis.expr.datatypes as dt
 import ibis.expr.types as ir
 from ibis import config
-from ibis.common.exceptions import IbisError
 from ibis.util import gen_name
 
 cc = pytest.importorskip("clickhouse_connect")
@@ -72,7 +71,7 @@ def logger(x):
         with config.option_context("verbose_log", logger):
             con.table("functional_alltypes")
 
-    expected = "DESCRIBE ibis_testing.functional_alltypes"
+    expected = "DESCRIBE functional_alltypes"
 
     # might be other queries in there, we only check that a describe table
     # query was logged
@@ -198,20 +197,7 @@ def test_list_tables_empty_database(con, temp_db):
     assert not con.list_tables(database=temp_db)
 
 
-@pytest.mark.parametrize(
-    "temp",
-    [
-        param(
-            True,
-            marks=pytest.mark.xfail(
-                reason="Ibis is likely making incorrect assumptions about object lifetime and cursors",
-                raises=IbisError,
-            ),
-        ),
-        False,
-    ],
-    ids=["temp", "no_temp"],
-)
+@pytest.mark.parametrize("temp", [True, False], ids=["temp", "no_temp"])
 def test_create_table_no_data(con, temp, temp_table):
     schema = ibis.schema(dict(a="!int", b="string"))
     t = con.create_table(temp_table, schema=schema, temp=temp, engine="Memory")