Skip to content

fix(databricks): improve typing of databricks backend #11963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickCrews wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −8
Open

fix(databricks): improve typing of databricks backend #11963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ibis/backends/databricks/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ def create_table(

return self.table(name, database=(catalog, database))

def table(self, name: str, /, *, database: str | None = None) -> ir.Table:
def table(
self, name: str, /, *, database: str | tuple[str, str] | None = None
) -> ir.Table:
table_loc = self._to_sqlglot_table(database)

# TODO: set these to better defaults
Expand Down Expand Up @@ -500,15 +502,17 @@ def finalizer(path: str = path, con=self.con) -> None:
def create_database(
self, name: str, /, *, catalog: str | None = None, force: bool = False
) -> None:
name = sg.table(name, catalog=catalog, quoted=self.compiler.quoted)
with self._safe_raw_sql(sge.Create(this=name, kind="SCHEMA", replace=force)):
full_name = sg.table(name, catalog=catalog, quoted=self.compiler.quoted)
with self._safe_raw_sql(
sge.Create(this=full_name, kind="SCHEMA", replace=force)
):
pass

def drop_database(
self, name: str, /, *, catalog: str | None = None, force: bool = False
) -> None:
name = sg.table(name, catalog=catalog, quoted=self.compiler.quoted)
with self._safe_raw_sql(sge.Drop(this=name, kind="SCHEMA", replace=force)):
full_name = sg.table(name, catalog=catalog, quoted=self.compiler.quoted)
with self._safe_raw_sql(sge.Drop(this=full_name, kind="SCHEMA", replace=force)):
pass

def list_tables(
Expand All @@ -531,7 +535,7 @@ def to_pyarrow_batches(
/,
*,
params: Mapping[ir.Scalar, Any] | None = None,
limit: int | str | None = None,
limit: int | None = None,
chunk_size: int = 1_000_000,
**_: Any,
) -> pa.ipc.RecordBatchReader:
Expand Down Expand Up @@ -573,7 +577,7 @@ def to_pyarrow(
/,
*,
params: Mapping[ir.Scalar, Any] | None = None,
limit: int | str | None = None,
limit: int | None = None,
**kwargs: Any,
) -> pa.Table:
self._run_pre_execute_hooks(expr)
Expand All @@ -592,7 +596,7 @@ def _fetch_from_cursor(self, cursor, schema: sch.Schema) -> pd.DataFrame:
if (table := cursor.fetchall_arrow()) is None:
table = schema.to_pyarrow().empty_table()
df = table.to_pandas(timestamp_as_object=True)
df.columns = list(schema.names)
df.columns = list(schema)
return df

def _get_schema_using_query(self, query: str) -> sch.Schema:
Expand Down