datus-postgresql 0.1.1__tar.gz → 0.1.4__tar.gz

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datus-postgresql
-Version: 0.1.1
+Version: 0.1.4
 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
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
-Requires-Dist: datus-agent>0.2.5
+Requires-Dist: datus-db-core>=0.1.0
 Requires-Dist: datus-sqlalchemy>=0.1.2
 Requires-Dist: psycopg2-binary>=2.9.11
 Requires-Dist: pydantic>=2.0.0

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/datus_postgresql/__init__.py

@@ -11,7 +11,7 @@ __all__ = ["PostgreSQLConnector", "PostgreSQLConfig", "register"]
 
 def register():
     """Register PostgreSQL connector with Datus registry."""
-    from datus.tools.db_tools import connector_registry
+    from datus_db_core import connector_registry
 
     from .handlers import build_postgresql_uri, resolve_postgresql_context
 

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/datus_postgresql/config.py

@@ -15,10 +15,15 @@ class PostgreSQLConfig(BaseModel):
     host: str = Field(default="127.0.0.1", description="PostgreSQL server host")
     port: int = Field(default=5432, description="PostgreSQL server port")
     username: str = Field(..., description="PostgreSQL username")
-    password: str = Field(default="", description="PostgreSQL password", json_schema_extra={"input_type": "password"})
+    password: str = Field(
+        default="",
+        description="PostgreSQL password",
+        json_schema_extra={"input_type": "password"},
+    )
     database: Optional[str] = Field(default=None, description="Default database name")
     schema_name: Optional[str] = Field(default="public", alias="schema", description="Default schema name")
     sslmode: str = Field(
-        default="prefer", description="SSL mode (disable, allow, prefer, require, verify-ca, verify-full)"
+        default="prefer",
+        description="SSL mode (disable, allow, prefer, require, verify-ca, verify-full)",
     )
     timeout_seconds: int = Field(default=30, description="Connection timeout in seconds")

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/datus_postgresql/connector.py

@@ -5,12 +5,18 @@
 from typing import Any, Dict, List, Optional, Set, Union, override
 from urllib.parse import quote_plus
 
-from datus.schemas.base import TABLE_TYPE
-from datus.tools.db_tools.base import list_to_in_str
-from datus.utils.exceptions import DatusException, ErrorCode
-from datus.utils.loggings import get_logger
-from datus_sqlalchemy import SQLAlchemyConnector
+from pandas import DataFrame
 from pydantic import BaseModel, Field
+from sqlalchemy import create_engine, text
+
+from datus_db_core import (
+    TABLE_TYPE,
+    DatusDbException,
+    ErrorCode,
+    get_logger,
+    list_to_in_str,
+)
+from datus_sqlalchemy import SQLAlchemyConnector
 
 from .config import PostgreSQLConfig
 
@@ -42,7 +48,7 @@ METADATA_DICT: Dict[TABLE_TYPE, TableMetadataNames] = {
 def _get_metadata_config(table_type: TABLE_TYPE) -> TableMetadataNames:
     """Get metadata configuration for given table type."""
     if table_type not in METADATA_DICT:
-        raise DatusException(ErrorCode.COMMON_FIELD_INVALID, f"Invalid table type '{table_type}'")
+        raise DatusDbException(ErrorCode.COMMON_FIELD_INVALID, f"Invalid table type '{table_type}'")
     return METADATA_DICT[table_type]
 
 
@@ -79,7 +85,11 @@ class PostgreSQLConnector(SQLAlchemyConnector):
             f"{database}?sslmode={config.sslmode}"
         )
 
-        super().__init__(connection_string, dialect="postgresql", timeout_seconds=config.timeout_seconds)
+        super().__init__(
+            connection_string,
+            dialect="postgresql",
+            timeout_seconds=config.timeout_seconds,
+        )
         self.database_name = database
         self.schema_name = config.schema_name or "public"
 
@@ -93,7 +103,13 @@ class PostgreSQLConnector(SQLAlchemyConnector):
     @override
     def _sys_schemas(self) -> Set[str]:
         """System schemas to filter out."""
-        return {"pg_catalog", "information_schema", "pg_toast", "pg_temp_1", "pg_toast_temp_1"}
+        return {
+            "pg_catalog",
+            "information_schema",
+            "pg_toast",
+            "pg_temp_1",
+            "pg_toast_temp_1",
+        }
 
     # ==================== Utility Methods ====================
 
@@ -103,6 +119,33 @@ class PostgreSQLConnector(SQLAlchemyConnector):
         escaped = identifier.replace('"', '""')
         return f'"{escaped}"'
 
+    def _build_connection_string(self, database_name: str) -> str:
+        """Build a PostgreSQL connection string for a given database."""
+        encoded_username = quote_plus(self.username) if self.username else ""
+        encoded_password = quote_plus(self.password) if self.password else ""
+        return (
+            f"postgresql+psycopg2://{encoded_username}:{encoded_password}"
+            f"@{self.host}:{self.port}/{database_name}?sslmode={self.config.sslmode}"
+        )
+
+    def _execute_on_database(self, sql: str, database_name: str) -> DataFrame:
+        """Execute a query on a specific database using a temporary connection.
+
+        Thread-safe: creates an isolated connection without mutating self.
+        """
+        if database_name == self.database_name:
+            return self._execute_pandas(sql)
+
+        conn_str = self._build_connection_string(database_name)
+        engine = create_engine(conn_str)
+        try:
+            with engine.connect() as conn:
+                result = conn.execute(text(sql))
+                rows = [row._asdict() for row in result.fetchall()]
+                return DataFrame(rows)
+        finally:
+            engine.dispose()
+
     # ==================== Metadata Retrieval ====================
 
     def _get_metadata(
@@ -125,13 +168,15 @@ class PostgreSQLConnector(SQLAlchemyConnector):
             List of metadata dictionaries
         """
         self.connect()
+        database_name = database_name or self.database_name
         schema_name = schema_name or self.schema_name
 
         # Get metadata configuration
         metadata_config = _get_metadata_config(table_type)
 
         if table_type == "mv":
-            # Materialized views use pg_matviews
+            # pg_matviews is scoped to the current database connection.
+            # Use a temporary connection if a different database is requested (thread-safe).
             if schema_name:
                 where = f"schemaname = '{schema_name}'"
             else:
@@ -142,8 +187,9 @@ class PostgreSQLConnector(SQLAlchemyConnector):
                 FROM pg_matviews
                 WHERE {where}
             """
+            query_result = self._execute_on_database(query, database_name)
         else:
-            # Tables and views use information_schema
+            # Tables and views use information_schema (supports table_catalog filter)
             if schema_name:
                 where = f"table_schema = '{schema_name}'"
             else:
@@ -157,10 +203,9 @@ class PostgreSQLConnector(SQLAlchemyConnector):
             query = f"""
                 SELECT table_schema, table_name
                 FROM information_schema.{metadata_config.info_table}
-                WHERE {where} {type_filter}
+                WHERE table_catalog = '{database_name}' AND {where} {type_filter}
             """
-
-        query_result = self._execute_pandas(query)
+            query_result = self._execute_pandas(query)
 
         # Format results
         result = []
@@ -171,7 +216,7 @@ class PostgreSQLConnector(SQLAlchemyConnector):
                 {
                     "identifier": self.identifier(schema_name=schema, table_name=tb_name),
                     "catalog_name": "",
-                    "database_name": self.database_name,
+                    "database_name": database_name,
                     "schema_name": schema,
                     "table_name": tb_name,
                     "table_type": table_type,
@@ -310,7 +355,11 @@ class PostgreSQLConnector(SQLAlchemyConnector):
 
     @override
     def get_tables_with_ddl(
-        self, catalog_name: str = "", database_name: str = "", schema_name: str = "", tables: Optional[List[str]] = None
+        self,
+        catalog_name: str = "",
+        database_name: str = "",
+        schema_name: str = "",
+        tables: Optional[List[str]] = None,
     ) -> List[Dict[str, str]]:
         """Get tables with DDL statements."""
         return self._get_objects_with_ddl("table", tables, catalog_name, database_name, schema_name)
@@ -324,7 +373,11 @@ class PostgreSQLConnector(SQLAlchemyConnector):
 
     @override
     def get_schema(
-        self, catalog_name: str = "", database_name: str = "", schema_name: str = "", table_name: str = ""
+        self,
+        catalog_name: str = "",
+        database_name: str = "",
+        schema_name: str = "",
+        table_name: str = "",
     ) -> List[Dict[str, Any]]:
         """
         Get table schema using INFORMATION_SCHEMA.
@@ -341,6 +394,7 @@ class PostgreSQLConnector(SQLAlchemyConnector):
         if not table_name:
             return []
 
+        database_name = database_name or self.database_name
         schema_name = schema_name or self.schema_name
 
         # Use INFORMATION_SCHEMA to get schema with comments
@@ -367,7 +421,8 @@ class PostgreSQLConnector(SQLAlchemyConnector):
                 ON st.schemaname = c.table_schema AND st.relname = c.table_name
             LEFT JOIN pg_catalog.pg_description pgd
                 ON pgd.objoid = st.relid AND pgd.objsubid = c.ordinal_position
-            WHERE c.table_schema = '{schema_name}'
+            WHERE c.table_catalog = '{database_name}'
+              AND c.table_schema = '{schema_name}'
               AND c.table_name = '{table_name}'
             ORDER BY c.ordinal_position
         """
@@ -406,7 +461,8 @@ class PostgreSQLConnector(SQLAlchemyConnector):
     @override
     def get_schemas(self, catalog_name: str = "", database_name: str = "", include_sys: bool = False) -> List[str]:
         """Get list of schemas in the current database."""
-        sql = "SELECT schema_name FROM information_schema.schemata"
+        database_name = database_name or self.database_name
+        sql = f"SELECT schema_name FROM information_schema.schemata WHERE catalog_name = '{database_name}'"
         result = self._execute_pandas(sql)
         schemas = result["schema_name"].tolist()
 
@@ -425,11 +481,17 @@ class PostgreSQLConnector(SQLAlchemyConnector):
 
     @override
     def do_switch_context(self, catalog_name: str = "", database_name: str = "", schema_name: str = ""):
-        """Switch schema context by updating self.schema_name.
+        """Switch database/schema context.
 
-        Note: All queries use explicit schema qualification via full_name(),
-        so we only need to update self.schema_name here.
+        PostgreSQL requires reconnection to switch databases.
+        Schema switching only updates self.schema_name since all queries
+        use explicit schema qualification via full_name().
         """
+        if database_name and database_name != self.database_name:
+            self.connection_string = self._build_connection_string(database_name)
+            self.close()
+            self.connect()
+            self.database_name = database_name
         if schema_name:
             self.schema_name = schema_name
 
@@ -480,7 +542,7 @@ class PostgreSQLConnector(SQLAlchemyConnector):
             return result
 
         # Otherwise get metadata and query all tables
-        metadata = self._get_metadata(table_type, "", "", schema_name)
+        metadata = self._get_metadata(table_type, "", database_name, schema_name)
         for meta in metadata:
             full_name = self.full_name(schema_name=meta["schema_name"], table_name=meta["table_name"])
             sql = f"SELECT * FROM {full_name} LIMIT {top_n}"
@@ -502,28 +564,46 @@ class PostgreSQLConnector(SQLAlchemyConnector):
 
     @override
     def identifier(
-        self, catalog_name: str = "", database_name: str = "", schema_name: str = "", table_name: str = ""
+        self,
+        catalog_name: str = "",
+        database_name: str = "",
+        schema_name: str = "",
+        table_name: str = "",
     ) -> str:
         """Generate a unique identifier for a table."""
+        database_name = database_name or self.database_name
         schema_name = schema_name or self.schema_name
+        if database_name and schema_name:
+            return f"{database_name}.{schema_name}.{table_name}"
         if schema_name:
             return f"{schema_name}.{table_name}"
         return table_name
 
     @override
     def full_name(
-        self, catalog_name: str = "", database_name: str = "", schema_name: str = "", table_name: str = ""
+        self,
+        catalog_name: str = "",
+        database_name: str = "",
+        schema_name: str = "",
+        table_name: str = "",
     ) -> str:
         """Build fully-qualified table name."""
+        database_name = database_name or self.database_name
         schema_name = schema_name or self.schema_name
+        if database_name and schema_name:
+            return f"{self._quote_identifier(database_name)}.{self._quote_identifier(schema_name)}.{self._quote_identifier(table_name)}"
         if schema_name:
             return f"{self._quote_identifier(schema_name)}.{self._quote_identifier(table_name)}"
         return self._quote_identifier(table_name)
 
     @override
     def _reset_filter_tables(
-        self, tables: Optional[List[str]] = None, catalog_name: str = "", database_name: str = "", schema_name: str = ""
+        self,
+        tables: Optional[List[str]] = None,
+        catalog_name: str = "",
+        database_name: str = "",
+        schema_name: str = "",
     ) -> List[str]:
         """Reset filter tables with full names."""
         schema_name = schema_name or self.schema_name
-        return super()._reset_filter_tables(tables, "", "", schema_name)
+        return super()._reset_filter_tables(tables, "", database_name, schema_name)

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datus-postgresql"
-version = "0.1.1"
+version = "0.1.4"
 description = "PostgreSQL database adapter for Datus"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -18,7 +18,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "datus-agent>0.2.5",
+    "datus-db-core>=0.1.0",
     "datus-sqlalchemy>=0.1.2",
     "psycopg2-binary>=2.9.11",
     "pydantic>=2.0.0",
@@ -33,6 +33,7 @@ Issues = "https://github.com/Datus-ai/datus-db-adapters/issues"
 postgresql = "datus_postgresql:register"
 
 [tool.uv.sources]
+datus-db-core = { workspace = true }
 datus-sqlalchemy = { workspace = true }
 
 [build-system]

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/scripts/init_tpch_data.py

@@ -104,7 +104,12 @@ TPCH_DATA = {
     ],
     "tpch_nation": [
         (0, "ALGERIA", 0, " haggle. carefully final deposits detect slyly agai"),
-        (1, "ARGENTINA", 1, "al foxes promise slyly according to the regular accounts."),
+        (
+            1,
+            "ARGENTINA",
+            1,
+            "al foxes promise slyly according to the regular accounts.",
+        ),
         (2, "BRAZIL", 1, "y alongside of the pending deposits."),
         (3, "CANADA", 1, "eas hang ironic, silent packages."),
         (4, "EGYPT", 4, "y above the carefully unusual theodolites."),
@@ -118,7 +123,12 @@ TPCH_DATA = {
         (12, "JAPAN", 2, "ously. final, express gifts cajole a"),
         (13, "JORDAN", 4, "ic deposits are blithely about the carefully regular pa"),
         (14, "KENYA", 0, " pending excuses haggle furiously deposits."),
-        (15, "MOROCCO", 0, "rns. blithely bold courts among the closely regular packages"),
+        (
+            15,
+            "MOROCCO",
+            0,
+            "rns. blithely bold courts among the closely regular packages",
+        ),
         (16, "MOZAMBIQUE", 0, "s. ironic, unusual asymptotes wake blithely r"),
         (17, "PERU", 1, "platelets. blithely pending dependencies use fluffily"),
         (18, "CHINA", 2, "c dependencies. furiously express notornis sleep slyly"),
@@ -139,7 +149,15 @@ TPCH_DATA = {
             5755.94,
             "each slyly above the careful",
         ),
-        (2, "Supplier#000000002", "89eJ5ksX3ImxJQBvxObC,", 5, "15-679-861-2259", 4032.68, " slyly bold instructions."),
+        (
+            2,
+            "Supplier#000000002",
+            "89eJ5ksX3ImxJQBvxObC,",
+            5,
+            "15-679-861-2259",
+            4032.68,
+            " slyly bold instructions.",
+        ),
         (
             3,
             "Supplier#000000003",
@@ -158,7 +176,15 @@ TPCH_DATA = {
             4641.08,
             "riously even requests above the exp",
         ),
-        (5, "Supplier#000000005", "Gcdm2rJRzl5qlTVzc", 11, "21-151-690-3663", -531.44, ". slyly regular pinto beans t"),
+        (
+            5,
+            "Supplier#000000005",
+            "Gcdm2rJRzl5qlTVzc",
+            11,
+            "21-151-690-3663",
+            -531.44,
+            ". slyly regular pinto beans t",
+        ),
     ],
     "tpch_customer": [
         (
@@ -263,7 +289,17 @@ TPCH_DATA = {
         ),
     ],
     "tpch_orders": [
-        (1, 1, "O", 173665.47, "1996-01-02", "5-LOW", "Clerk#000000951", 0, "nstructions sleep furiously among"),
+        (
+            1,
+            1,
+            "O",
+            173665.47,
+            "1996-01-02",
+            "5-LOW",
+            "Clerk#000000951",
+            0,
+            "nstructions sleep furiously among",
+        ),
         (
             2,
             2,
@@ -275,9 +311,39 @@ TPCH_DATA = {
             0,
             " foxes. pending accounts at the pending",
         ),
-        (3, 3, "F", 193846.25, "1993-10-14", "5-LOW", "Clerk#000000955", 0, "sly final accounts boost."),
-        (4, 4, "O", 32151.78, "1995-10-11", "5-LOW", "Clerk#000000124", 0, "sits. slyly regular warthogs cajole."),
-        (5, 5, "F", 144659.20, "1994-07-30", "5-LOW", "Clerk#000000925", 0, "quickly. bold deposits sleep slyly."),
+        (
+            3,
+            3,
+            "F",
+            193846.25,
+            "1993-10-14",
+            "5-LOW",
+            "Clerk#000000955",
+            0,
+            "sly final accounts boost.",
+        ),
+        (
+            4,
+            4,
+            "O",
+            32151.78,
+            "1995-10-11",
+            "5-LOW",
+            "Clerk#000000124",
+            0,
+            "sits. slyly regular warthogs cajole.",
+        ),
+        (
+            5,
+            5,
+            "F",
+            144659.20,
+            "1994-07-30",
+            "5-LOW",
+            "Clerk#000000925",
+            0,
+            "quickly. bold deposits sleep slyly.",
+        ),
         (
             6,
             6,
@@ -289,9 +355,39 @@ TPCH_DATA = {
             0,
             "ggle. special, final requests are against the furiously",
         ),
-        (7, 7, "O", 252004.18, "1996-01-10", "2-HIGH", "Clerk#000000470", 0, "ly special requests"),
-        (32, 8, "O", 208660.75, "1995-07-16", "2-HIGH", "Clerk#000000616", 0, "ise blithely bold, regular requests."),
-        (33, 9, "F", 163243.98, "1993-10-27", "3-MEDIUM", "Clerk#000000409", 0, "uriously. furiously final request"),
+        (
+            7,
+            7,
+            "O",
+            252004.18,
+            "1996-01-10",
+            "2-HIGH",
+            "Clerk#000000470",
+            0,
+            "ly special requests",
+        ),
+        (
+            32,
+            8,
+            "O",
+            208660.75,
+            "1995-07-16",
+            "2-HIGH",
+            "Clerk#000000616",
+            0,
+            "ise blithely bold, regular requests.",
+        ),
+        (
+            33,
+            9,
+            "F",
+            163243.98,
+            "1993-10-27",
+            "3-MEDIUM",
+            "Clerk#000000409",
+            0,
+            "uriously. furiously final request",
+        ),
         (
             34,
             10,
@@ -314,10 +410,50 @@ TPCH_DATA = {
             0,
             "zzle. carefully enticing deposits nag furio",
         ),
-        (36, 2, "O", 38988.98, "1995-11-03", "1-URGENT", "Clerk#000000358", 0, " quick packages are blithely."),
-        (37, 3, "F", 131896.48, "1992-06-03", "3-MEDIUM", "Clerk#000000456", 0, "kly regular pinto beans."),
-        (38, 4, "O", 46366.56, "1996-08-21", "4-NOT SPECIFIED", "Clerk#000000604", 0, "haggle blithely."),
-        (39, 5, "O", 219707.84, "1996-09-20", "3-MEDIUM", "Clerk#000000659", 0, "ole express, ironic requests:"),
+        (
+            36,
+            2,
+            "O",
+            38988.98,
+            "1995-11-03",
+            "1-URGENT",
+            "Clerk#000000358",
+            0,
+            " quick packages are blithely.",
+        ),
+        (
+            37,
+            3,
+            "F",
+            131896.48,
+            "1992-06-03",
+            "3-MEDIUM",
+            "Clerk#000000456",
+            0,
+            "kly regular pinto beans.",
+        ),
+        (
+            38,
+            4,
+            "O",
+            46366.56,
+            "1996-08-21",
+            "4-NOT SPECIFIED",
+            "Clerk#000000604",
+            0,
+            "haggle blithely.",
+        ),
+        (
+            39,
+            5,
+            "O",
+            219707.84,
+            "1996-09-20",
+            "3-MEDIUM",
+            "Clerk#000000659",
+            0,
+            "ole express, ironic requests:",
+        ),
     ],
 }
 

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/conftest.py

@@ -6,5 +6,6 @@
 def pytest_configure(config):
     """Configure custom markers."""
     config.addinivalue_line(
-        "markers", "integration: marks tests as integration tests (deselect with '-m \"not integration\"')"
+        "markers",
+        "integration: marks tests as integration tests (deselect with '-m \"not integration\"')",
     )

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/integration/conftest.py

@@ -6,6 +6,7 @@ import os
 from typing import Generator
 
 import pytest
+
 from datus_postgresql import PostgreSQLConfig, PostgreSQLConnector
 
 # ---------------------------------------------------------------------------
@@ -83,7 +84,12 @@ TPCH_DATA = {
     ],
     "tpch_nation": [
         (0, "ALGERIA", 0, " haggle. carefully final deposits detect slyly agai"),
-        (1, "ARGENTINA", 1, "al foxes promise slyly according to the regular accounts."),
+        (
+            1,
+            "ARGENTINA",
+            1,
+            "al foxes promise slyly according to the regular accounts.",
+        ),
         (2, "BRAZIL", 1, "y alongside of the pending deposits."),
         (3, "CANADA", 1, "eas hang ironic, silent packages."),
         (4, "EGYPT", 4, "y above the carefully unusual theodolites."),
@@ -97,7 +103,12 @@ TPCH_DATA = {
         (12, "JAPAN", 2, "ously. final, express gifts cajole a"),
         (13, "JORDAN", 4, "ic deposits are blithely about the carefully regular pa"),
         (14, "KENYA", 0, " pending excuses haggle furiously deposits."),
-        (15, "MOROCCO", 0, "rns. blithely bold courts among the closely regular packages"),
+        (
+            15,
+            "MOROCCO",
+            0,
+            "rns. blithely bold courts among the closely regular packages",
+        ),
         (16, "MOZAMBIQUE", 0, "s. ironic, unusual asymptotes wake blithely r"),
         (17, "PERU", 1, "platelets. blithely pending dependencies use fluffily"),
         (18, "CHINA", 2, "c dependencies. furiously express notornis sleep slyly"),
@@ -118,7 +129,15 @@ TPCH_DATA = {
             5755.94,
             "each slyly above the careful",
         ),
-        (2, "Supplier#000000002", "89eJ5ksX3ImxJQBvxObC,", 5, "15-679-861-2259", 4032.68, " slyly bold instructions."),
+        (
+            2,
+            "Supplier#000000002",
+            "89eJ5ksX3ImxJQBvxObC,",
+            5,
+            "15-679-861-2259",
+            4032.68,
+            " slyly bold instructions.",
+        ),
         (
             3,
             "Supplier#000000003",
@@ -137,7 +156,15 @@ TPCH_DATA = {
             4641.08,
             "riously even requests above the exp",
         ),
-        (5, "Supplier#000000005", "Gcdm2rJRzl5qlTVzc", 11, "21-151-690-3663", -531.44, ". slyly regular pinto beans t"),
+        (
+            5,
+            "Supplier#000000005",
+            "Gcdm2rJRzl5qlTVzc",
+            11,
+            "21-151-690-3663",
+            -531.44,
+            ". slyly regular pinto beans t",
+        ),
     ],
     "tpch_customer": [
         (
@@ -242,7 +269,17 @@ TPCH_DATA = {
         ),
     ],
     "tpch_orders": [
-        (1, 1, "O", 173665.47, "1996-01-02", "5-LOW", "Clerk#000000951", 0, "nstructions sleep furiously among"),
+        (
+            1,
+            1,
+            "O",
+            173665.47,
+            "1996-01-02",
+            "5-LOW",
+            "Clerk#000000951",
+            0,
+            "nstructions sleep furiously among",
+        ),
         (
             2,
             2,
@@ -254,9 +291,39 @@ TPCH_DATA = {
             0,
             " foxes. pending accounts at the pending",
         ),
-        (3, 3, "F", 193846.25, "1993-10-14", "5-LOW", "Clerk#000000955", 0, "sly final accounts boost."),
-        (4, 4, "O", 32151.78, "1995-10-11", "5-LOW", "Clerk#000000124", 0, "sits. slyly regular warthogs cajole."),
-        (5, 5, "F", 144659.20, "1994-07-30", "5-LOW", "Clerk#000000925", 0, "quickly. bold deposits sleep slyly."),
+        (
+            3,
+            3,
+            "F",
+            193846.25,
+            "1993-10-14",
+            "5-LOW",
+            "Clerk#000000955",
+            0,
+            "sly final accounts boost.",
+        ),
+        (
+            4,
+            4,
+            "O",
+            32151.78,
+            "1995-10-11",
+            "5-LOW",
+            "Clerk#000000124",
+            0,
+            "sits. slyly regular warthogs cajole.",
+        ),
+        (
+            5,
+            5,
+            "F",
+            144659.20,
+            "1994-07-30",
+            "5-LOW",
+            "Clerk#000000925",
+            0,
+            "quickly. bold deposits sleep slyly.",
+        ),
         (
             6,
             6,
@@ -268,9 +335,39 @@ TPCH_DATA = {
             0,
             "ggle. special, final requests are against the furiously",
         ),
-        (7, 7, "O", 252004.18, "1996-01-10", "2-HIGH", "Clerk#000000470", 0, "ly special requests"),
-        (32, 8, "O", 208660.75, "1995-07-16", "2-HIGH", "Clerk#000000616", 0, "ise blithely bold, regular requests."),
-        (33, 9, "F", 163243.98, "1993-10-27", "3-MEDIUM", "Clerk#000000409", 0, "uriously. furiously final request"),
+        (
+            7,
+            7,
+            "O",
+            252004.18,
+            "1996-01-10",
+            "2-HIGH",
+            "Clerk#000000470",
+            0,
+            "ly special requests",
+        ),
+        (
+            32,
+            8,
+            "O",
+            208660.75,
+            "1995-07-16",
+            "2-HIGH",
+            "Clerk#000000616",
+            0,
+            "ise blithely bold, regular requests.",
+        ),
+        (
+            33,
+            9,
+            "F",
+            163243.98,
+            "1993-10-27",
+            "3-MEDIUM",
+            "Clerk#000000409",
+            0,
+            "uriously. furiously final request",
+        ),
         (
             34,
             10,
@@ -293,10 +390,50 @@ TPCH_DATA = {
             0,
             "zzle. carefully enticing deposits nag furio",
         ),
-        (36, 2, "O", 38988.98, "1995-11-03", "1-URGENT", "Clerk#000000358", 0, " quick packages are blithely."),
-        (37, 3, "F", 131896.48, "1992-06-03", "3-MEDIUM", "Clerk#000000456", 0, "kly regular pinto beans."),
-        (38, 4, "O", 46366.56, "1996-08-21", "4-NOT SPECIFIED", "Clerk#000000604", 0, "haggle blithely."),
-        (39, 5, "O", 219707.84, "1996-09-20", "3-MEDIUM", "Clerk#000000659", 0, "ole express, ironic requests:"),
+        (
+            36,
+            2,
+            "O",
+            38988.98,
+            "1995-11-03",
+            "1-URGENT",
+            "Clerk#000000358",
+            0,
+            " quick packages are blithely.",
+        ),
+        (
+            37,
+            3,
+            "F",
+            131896.48,
+            "1992-06-03",
+            "3-MEDIUM",
+            "Clerk#000000456",
+            0,
+            "kly regular pinto beans.",
+        ),
+        (
+            38,
+            4,
+            "O",
+            46366.56,
+            "1996-08-21",
+            "4-NOT SPECIFIED",
+            "Clerk#000000604",
+            0,
+            "haggle blithely.",
+        ),
+        (
+            39,
+            5,
+            "O",
+            219707.84,
+            "1996-09-20",
+            "3-MEDIUM",
+            "Clerk#000000659",
+            0,
+            "ole express, ironic requests:",
+        ),
     ],
 }
 

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/integration/test_integration.py

@@ -6,6 +6,7 @@ import os
 import uuid
 
 import pytest
+
 from datus_postgresql import PostgreSQLConfig, PostgreSQLConnector
 
 # ==================== Connection Tests ====================
@@ -307,7 +308,8 @@ def test_execute_insert(connector: PostgreSQLConnector, config: PostgreSQLConfig
 
         # Verify
         query_result = connector.execute(
-            {"sql_query": f"SELECT id, name FROM {table_name} ORDER BY id"}, result_format="list"
+            {"sql_query": f"SELECT id, name FROM {table_name} ORDER BY id"},
+            result_format="list",
         )
         assert len(query_result.sql_return) == 2
         assert query_result.sql_return[0]["name"] == "Alice"
@@ -342,7 +344,8 @@ def test_execute_update(connector: PostgreSQLConnector, config: PostgreSQLConfig
 
         # Verify
         query_result = connector.execute(
-            {"sql_query": f"SELECT name FROM {table_name} WHERE id = 1"}, result_format="list"
+            {"sql_query": f"SELECT name FROM {table_name} WHERE id = 1"},
+            result_format="list",
         )
         assert query_result.sql_return == [{"name": "Alice Updated"}]
     finally:
@@ -404,8 +407,9 @@ def test_exception_on_nonexistent_table(connector: PostgreSQLConnector):
 @pytest.mark.integration
 def test_full_name_with_schema(connector: PostgreSQLConnector):
     """Test full_name with schema."""
+    db = connector.database_name
     full_name = connector.full_name(schema_name="myschema", table_name="mytable")
-    assert full_name == '"myschema"."mytable"'
+    assert full_name == f'"{db}"."myschema"."mytable"'
 
 
 @pytest.mark.integration
@@ -419,5 +423,6 @@ def test_full_name_with_default_schema(connector: PostgreSQLConnector):
 @pytest.mark.integration
 def test_identifier(connector: PostgreSQLConnector):
     """Test identifier generation."""
+    db = connector.database_name
     identifier = connector.identifier(schema_name="myschema", table_name="mytable")
-    assert identifier == "myschema.mytable"
+    assert identifier == f"{db}.myschema.mytable"

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/integration/test_tpch.py

@@ -131,7 +131,13 @@ class TestTpchMetadata:
         """get_tables() should return TPC-H tables."""
         tables = tpch_setup.get_tables(schema_name="public")
         tpch_tables = {t for t in tables if t.startswith("tpch_")}
-        expected = {"tpch_region", "tpch_nation", "tpch_supplier", "tpch_customer", "tpch_orders"}
+        expected = {
+            "tpch_region",
+            "tpch_nation",
+            "tpch_supplier",
+            "tpch_customer",
+            "tpch_orders",
+        }
         assert expected.issubset(tpch_tables)
 
     def test_get_schema_columns(self, tpch_setup):

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/unit/test_config.py

@@ -3,9 +3,10 @@
 # See http://www.apache.org/licenses/LICENSE-2.0 for details.
 
 import pytest
-from datus_postgresql import PostgreSQLConfig
 from pydantic import ValidationError
 
+from datus_postgresql import PostgreSQLConfig
+
 
 @pytest.mark.acceptance
 def test_config_with_all_required_fields():

{datus_postgresql-0.1.1 → datus_postgresql-0.1.4}/tests/unit/test_connector_unit.py

@@ -5,7 +5,8 @@
 from unittest.mock import patch
 
 import pytest
-from datus.utils.exceptions import DatusException
+
+from datus_db_core import DatusDbException
 from datus_postgresql import PostgreSQLConfig, PostgreSQLConnector
 
 
@@ -223,10 +224,11 @@ def test_full_name_with_schema():
 
     with patch("datus_sqlalchemy.SQLAlchemyConnector.__init__", return_value=None):
         connector = PostgreSQLConnector(config)
+        connector.database_name = "postgres"
         connector.schema_name = "public"
         full_name = connector.full_name(schema_name="myschema", table_name="mytable")
 
-        assert full_name == '"myschema"."mytable"'
+        assert full_name == '"postgres"."myschema"."mytable"'
 
 
 def test_full_name_with_default_schema():
@@ -235,10 +237,11 @@ def test_full_name_with_default_schema():
 
     with patch("datus_sqlalchemy.SQLAlchemyConnector.__init__", return_value=None):
         connector = PostgreSQLConnector(config)
+        connector.database_name = "postgres"
         connector.schema_name = "public"
         full_name = connector.full_name(table_name="mytable")
 
-        assert full_name == '"public"."mytable"'
+        assert full_name == '"postgres"."public"."mytable"'
 
 
 def test_full_name_with_special_characters():
@@ -247,10 +250,11 @@ def test_full_name_with_special_characters():
 
     with patch("datus_sqlalchemy.SQLAlchemyConnector.__init__", return_value=None):
         connector = PostgreSQLConnector(config)
+        connector.database_name = "postgres"
         connector.schema_name = "public"
         full_name = connector.full_name(schema_name='my"schema', table_name='my"table')
 
-        assert full_name == '"my""schema"."my""table"'
+        assert full_name == '"postgres"."my""schema"."my""table"'
 
 
 def test_identifier_with_schema():
@@ -259,10 +263,11 @@ def test_identifier_with_schema():
 
     with patch("datus_sqlalchemy.SQLAlchemyConnector.__init__", return_value=None):
         connector = PostgreSQLConnector(config)
+        connector.database_name = "postgres"
         connector.schema_name = "public"
         identifier = connector.identifier(schema_name="myschema", table_name="mytable")
 
-        assert identifier == "myschema.mytable"
+        assert identifier == "postgres.myschema.mytable"
 
 
 def test_identifier_with_default_schema():
@@ -271,10 +276,11 @@ def test_identifier_with_default_schema():
 
     with patch("datus_sqlalchemy.SQLAlchemyConnector.__init__", return_value=None):
         connector = PostgreSQLConnector(config)
+        connector.database_name = "postgres"
         connector.schema_name = "public"
         identifier = connector.identifier(table_name="mytable")
 
-        assert identifier == "public.mytable"
+        assert identifier == "postgres.public.mytable"
 
 
 @pytest.mark.acceptance
@@ -308,7 +314,7 @@ def test_get_metadata_config_invalid_type():
     """Test _get_metadata_config with invalid table type."""
     from datus_postgresql.connector import _get_metadata_config
 
-    with pytest.raises(DatusException, match="Invalid table type"):
+    with pytest.raises(DatusDbException, match="Invalid table type"):
         _get_metadata_config("invalid_type")
 
 

datus_postgresql-0.1.1/.gitignore

@@ -1,140 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-Pipfile.lock
-
-# uv
-uv.lock
-
-# PEP 582
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# IDEs
-.vscode/
-.idea/
-*.swp
-*.swo
-*~
-
-# OS
-.DS_Store
-Thumbs.db
-
-
-.omc