datus-postgresql 0.1.6__tar.gz → 0.1.7__tar.gz

{datus_postgresql-0.1.6 → datus_postgresql-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datus-postgresql
-Version: 0.1.6
+Version: 0.1.7
 Summary: PostgreSQL database adapter for Datus
 Project-URL: Homepage, https://github.com/Datus-ai/datus-db-adapters
 Project-URL: Repository, https://github.com/Datus-ai/datus-db-adapters
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
 Requires-Dist: datus-db-core>=0.1.4
-Requires-Dist: datus-sqlalchemy>=0.1.6
+Requires-Dist: datus-sqlalchemy>=0.1.7
 Requires-Dist: psycopg2-binary>=2.9.11
 Requires-Dist: pydantic>=2.0.0
 Description-Content-Type: text/markdown

{datus_postgresql-0.1.6 → datus_postgresql-0.1.7}/datus_postgresql/connector.py

@@ -337,21 +337,45 @@ class PostgreSQLConnector(SQLAlchemyConnector, MigrationTargetMixin):
         return result
 
     @override
+    @staticmethod
+    def _qualify_name(meta, arg_db, arg_schema):
+        """Prefix the table with the db/schema levels the caller left blank.
+
+        Yields ``[db.][schema.]table`` so an unscoped listing stays addressable; a level is
+        prepended only when the caller passed it empty and the row carries that coordinate.
+        """
+        parts = []
+        if not arg_db and meta.get("database_name"):
+            parts.append(meta["database_name"])
+        if not arg_schema and meta.get("schema_name"):
+            parts.append(meta["schema_name"])
+        parts.append(meta["table_name"])
+        return ".".join(parts)
+
     def get_tables(self, catalog_name: str = "", database_name: str = "", schema_name: str = "") -> List[str]:
         """Get list of table names."""
-        return [meta["table_name"] for meta in self._get_metadata("table", catalog_name, database_name, schema_name)]
+        return [
+            self._qualify_name(meta, database_name, schema_name)
+            for meta in self._get_metadata("table", catalog_name, database_name, schema_name)
+        ]
 
     @override
     def get_views(self, catalog_name: str = "", database_name: str = "", schema_name: str = "") -> List[str]:
         """Get list of view names."""
-        return [meta["table_name"] for meta in self._get_metadata("view", catalog_name, database_name, schema_name)]
+        return [
+            self._qualify_name(meta, database_name, schema_name)
+            for meta in self._get_metadata("view", catalog_name, database_name, schema_name)
+        ]
 
     @override
     def get_materialized_views(
         self, catalog_name: str = "", database_name: str = "", schema_name: str = ""
     ) -> List[str]:
         """Get list of materialized view names."""
-        return [meta["table_name"] for meta in self._get_metadata("mv", catalog_name, database_name, schema_name)]
+        return [
+            self._qualify_name(meta, database_name, schema_name)
+            for meta in self._get_metadata("mv", catalog_name, database_name, schema_name)
+        ]
 
     @override
     def get_tables_with_ddl(

{datus_postgresql-0.1.6 → datus_postgresql-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datus-postgresql"
-version = "0.1.6"
+version = "0.1.7"
 description = "PostgreSQL database adapter for Datus"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -19,7 +19,7 @@ classifiers = [
 
 dependencies = [
     "datus-db-core>=0.1.4",
-    "datus-sqlalchemy>=0.1.6",
+    "datus-sqlalchemy>=0.1.7",
     "psycopg2-binary>=2.9.11",
     "pydantic>=2.0.0",
 ]

{datus_postgresql-0.1.6 → datus_postgresql-0.1.7}/tests/integration/test_tpch.py

@@ -128,17 +128,21 @@ class TestTpchMetadata:
     """Validate metadata retrieval for TPC-H tables."""
 
     def test_get_tables_includes_tpch(self, tpch_setup):
-        """get_tables() should return TPC-H tables."""
+        """get_tables() should return TPC-H tables qualified with the database name.
+
+        Only ``schema_name`` is passed, so the listing prefixes the unscoped database
+        level, yielding ``<database>.<table>``.
+        """
         tables = tpch_setup.get_tables(schema_name="public")
-        tpch_tables = {t for t in tables if t.startswith("tpch_")}
+        db = tpch_setup.database_name
         expected = {
-            "tpch_region",
-            "tpch_nation",
-            "tpch_supplier",
-            "tpch_customer",
-            "tpch_orders",
+            f"{db}.tpch_region",
+            f"{db}.tpch_nation",
+            f"{db}.tpch_supplier",
+            f"{db}.tpch_customer",
+            f"{db}.tpch_orders",
         }
-        assert expected.issubset(tpch_tables)
+        assert expected.issubset(set(tables))
 
     def test_get_schema_columns(self, tpch_setup):
         """get_schema() should return correct columns for tpch_region."""