From 14626e806e12fd08fb9ed12f5261ef565d99bd68 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 17 Sep 2023 12:14:45 -0400 Subject: [PATCH] chore: reuse `_create_temp_view`; down to a single test failure locally (!) --- ibis/backends/duckdb/__init__.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ibis/backends/duckdb/__init__.py b/ibis/backends/duckdb/__init__.py index 3b5d59ad046df..e14bd1960e16a 100644 --- a/ibis/backends/duckdb/__init__.py +++ b/ibis/backends/duckdb/__init__.py @@ -654,14 +654,13 @@ def read_json( options = [f"{key}={val}" for key, val in kwargs.items()] - sg_view_expr = self._compile_temp_view( + self._create_temp_view( table_name, sg.select("*").from_( sg.func("read_json_auto", normalize_filenames(source_list), *options) ), ) - self.raw_sql(sg_view_expr) return self.table(table_name) def read_csv( @@ -712,12 +711,11 @@ def read_csv( for key, val in kwargs.items() ] - sg_view_expr = self._compile_temp_view( + self._create_temp_view( table_name, sg.select("*").from_(sg.func("read_csv", source_list, *options)), ) - self.raw_sql(sg_view_expr) return self.table(table_name) def read_parquet( @@ -774,13 +772,11 @@ def _read_parquet_duckdb_native( else: pq_func = sg.func("read_parquet", source_list) - sg_view_expr = self._compile_temp_view( + self._create_temp_view( table_name, sg.select("*").from_(pq_func), ) - self.raw_sql(sg_view_expr) - def _read_parquet_pyarrow_dataset( self, source_list: str | Iterable[str], table_name: str, **kwargs: Any ) -> None: @@ -895,13 +891,12 @@ def read_postgres( ) self._load_extensions(["postgres_scanner"]) - sg_view_expr = self._compile_temp_view( + self._create_temp_view( table_name, sg.select("*").from_( sg.func("postgres_scan_pushdown", uri, schema, table_name) ), ) - self.raw_sql(sg_view_expr) return self.table(table_name) @@ -947,7 +942,7 @@ def read_sqlite(self, path: str | Path, table_name: str | None = None) -> ir.Tab raise ValueError("`table_name` is required when registering a sqlite table") self._load_extensions(["sqlite"]) - sg_view_expr = self._compile_temp_view( + self._create_temp_view( table_name, sg.select("*").from_( sg.func( @@ -955,7 +950,6 @@ def read_sqlite(self, path: str | Path, table_name: str | None = None) -> ir.Tab ) ), ) - self.raw_sql(sg_view_expr) return self.table(table_name)