refactor(udf): remove hierarchical usage of schema

ibis/backends/bigquery/tests/unit/udf/test_builtin.py

@@ -9,7 +9,7 @@
 def farm_fingerprint(value: bytes) -> int: ...
 
 
-@ibis.udf.scalar.builtin(schema="fn", database="bqutil")
+@ibis.udf.scalar.builtin(database="fn", catalog="bqutil")
 def from_hex(value: str) -> int:
     """Community function to convert from hex string to integer.
 

ibis/backends/impala/udf.py

@@ -68,7 +68,7 @@ def _create_operation_class(self):
             fn=self._make_fn(),
             name=self.name,
             signature=(self.inputs, self.output),
-            schema=self.database,
+            database=self.database,
         )
 
 
@@ -78,7 +78,7 @@ def _create_operation_class(self):
             fn=self._make_fn(),
             name=self.name,
             signature=(self.inputs, self.output),
-            schema=self.database,
+            database=self.database,
         )
 
 

ibis/backends/postgres/__init__.py

@@ -414,15 +414,15 @@
             (schema,) = cur.fetchone()
         return schema
 
-    def function(self, name: str, *, schema: str | None = None) -> Callable:
+    def function(self, name: str, *, database: str | None = None) -> Callable:
         n = ColGen(table="n")
         p = ColGen(table="p")
         f = self.compiler.f
 
         predicates = [p.proname.eq(name)]
 
-        if schema is not None:
-            predicates.append(n.nspname.rlike(sge.convert(f"^({schema})$")))
+        if database is not None:
+            predicates.append(n.nspname.rlike(sge.convert(f"^({database})$")))
 
         query = (
             sg.select(
@@ -448,7 +448,7 @@
             rows = cur.fetchall()
 
         if not rows:
-            name = f"{schema}.{name}" if schema else name
+            name = f"{database}.{name}" if database else name
             raise exc.MissingUDFError(name)
         elif len(rows) > 1:
             raise exc.AmbiguousUDFError(name)
@@ -471,7 +471,7 @@
             return_annotation=return_type,
         )
         fake_func.__annotations__ = {"return": return_type, **dict(signature)}
-        op = ops.udf.scalar.builtin(fake_func, schema=schema)
+        op = ops.udf.scalar.builtin(fake_func, database=database)
         return op
 
     def _get_udf_source(self, udf_node: ops.ScalarUDF):

ibis/backends/postgres/tests/test_udf.py

@@ -85,15 +85,15 @@ def table(con_for_udf, table_name, test_database):
 def test_existing_sql_udf(con_for_udf, test_database, table):
     """Test creating ibis UDF object based on existing UDF in the database."""
     # Create ibis UDF objects referring to UDFs already created in the database
-    custom_length_udf = con_for_udf.function("custom_len", schema=test_database)
+    custom_length_udf = con_for_udf.function("custom_len", database=test_database)
     result_obj = table[table, custom_length_udf(table["user_name"]).name("custom_len")]
     result = result_obj.execute()
     assert result["custom_len"].sum() == result["name_length"].sum()
 
 
 def test_existing_plpython_udf(con_for_udf, test_database, table):
     # Create ibis UDF objects referring to UDFs already created in the database
-    py_length_udf = con_for_udf.function("pylen", schema=test_database)
+    py_length_udf = con_for_udf.function("pylen", database=test_database)
     result_obj = table[table, py_length_udf(table["user_name"]).name("custom_len")]
     result = result_obj.execute()
     assert result["custom_len"].sum() == result["name_length"].sum()
@@ -103,7 +103,7 @@ def test_udf(test_database, table):
     """Test creating a UDF in database based on Python function and then
     creating an ibis UDF object based on that."""
 
-    @udf.scalar.python(schema=test_database)
+    @udf.scalar.python(database=test_database)
     def mult_a_b(a: int, b: int) -> int:
         return a * b
 
@@ -129,7 +129,7 @@ def test_array_type(test_database, table):
     instantiated specifying the datatype of the elements of the array.
     """
 
-    @udf.scalar.python(schema=test_database)
+    @udf.scalar.python(database=test_database)
     def pysplit(text: str, split: str) -> list[str]:
         return text.split(split)
 
@@ -142,7 +142,7 @@ def test_client_udf_api(test_database, table):
     """Test creating a UDF in database based on Python function using an ibis
     client method."""
 
-    @udf.scalar.python(schema=test_database)
+    @udf.scalar.python(database=test_database)
     def multiply(a: int, b: int) -> int:
         return a * b
 
@@ -171,7 +171,7 @@ def wrapped(*args, **kwds):
         return wrapped
 
     @decorator
-    @udf.scalar.python(schema=test_database)
+    @udf.scalar.python(database=test_database)
     def multiply(a: int, b: int) -> int:
         return a * b
 

ibis/backends/sql/__init__.py

@@ -521,7 +521,7 @@
     def _to_sqlglot_table(self, database):
         if database is None:
             return None
-        elif isinstance(database, tuple):
+        elif isinstance(database, (list, tuple)):
             if len(database) > 2:
                 raise ValueError(
                     "Only database hierarchies of two or fewer levels are supported."
@@ -558,6 +558,9 @@
             db = table.args["this"]
             database = sg.exp.Table(catalog=catalog, db=db)
         else:
-            raise ValueError("oops")
+            raise ValueError(
+                """Invalid database hierarchy format.  Please use either dotted
+                strings ('catalog.database') or tuples ('catalog', 'database')."""
+            )
 
         return database