fix conflicts with rebase

Author: alessandro-nori

tests/catalog/test_sql.py

@@ -1138,7 +1138,8 @@ def test_namespace_exists(catalog: SqlCatalog) -> None:
 def test_list_namespaces(catalog: SqlCatalog) -> None:
     namespace_list = ["db", "db.ns1", "db.ns1.ns2", "db.ns2", "db2", "db2.ns1", "db%", "db.ns1X.ns3"]
     for namespace in namespace_list:
-        catalog.create_namespace(namespace)
+        if not catalog._namespace_exists(namespace):
+            catalog.create_namespace(namespace)
 
     ns_list = catalog.list_namespaces()
     for ns in [("db",), ("db%",), ("db2",)]: