ODS 完成

etl_billiards/scripts/test_db_connection.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Quick utility for validating PostgreSQL connectivity."""
+"""Quick utility for validating PostgreSQL connectivity (ASCII-only output)."""
 from __future__ import annotations
 
 import argparse
@@ -24,8 +24,8 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--timeout",
         type=int,
-        default=5,
-        help="connect_timeout seconds passed to psycopg2 (default: 5)",
+        default=10,
+        help="connect_timeout seconds passed to psycopg2 (capped at 20, default: 10)",
     )
     return parser.parse_args()
 
@@ -34,25 +34,26 @@ def main() -> int:
     args = parse_args()
     dsn = args.dsn or os.environ.get("TEST_DB_DSN")
     if not dsn:
-        print("❌ 未提供 DSN，请通过 --dsn 或 TEST_DB_DSN 指定连接串", file=sys.stderr)
+        print("Missing DSN. Use --dsn or TEST_DB_DSN.", file=sys.stderr)
         return 2
 
-    print(f"尝试连接: {dsn}")
+    print(f"Trying connection: {dsn}")
     try:
-        conn = DatabaseConnection(dsn, connect_timeout=args.timeout)
+        timeout = max(1, min(args.timeout, 20))
+        conn = DatabaseConnection(dsn, connect_timeout=timeout)
     except Exception as exc:  # pragma: no cover - diagnostic output
-        print("❌ 连接失败:", exc, file=sys.stderr)
+        print("Connection failed:", exc, file=sys.stderr)
         return 1
 
     try:
         result = conn.query(args.query)
-        print("✅ 连接成功，查询结果:")
+        print("Connection OK, query result:")
         for row in result:
             print(row)
         conn.close()
         return 0
     except Exception as exc:  # pragma: no cover - diagnostic output
-        print("⚠️ 连接成功但执行查询失败:", exc, file=sys.stderr)
+        print("Connection succeeded but query failed:", exc, file=sys.stderr)
         try:
             conn.close()
         finally: