Refactor configuration paths and enhance environment variable expansion in YAML loading

Author: luisggc

sqlcompare/db/constants.py

@@ -4,11 +4,11 @@
 from pathlib import Path
 
 lib_name = "sqlcompare"
-lib_config_folder = Path.home() / f".{lib_name}"
+lib_config_folder = Path.home() / ".config" / f"{lib_name}"
 
 LIBRARY_CONNECTIONS = [
     os.getenv(
-        "SQLCOMPARE_CONNECTIONS_FILE", str(lib_config_folder / "connections.yml")
+        "SQLCOMPARE_CONNECTIONS_FILE", str(lib_config_folder / "connections.yaml")
     ),
     os.getenv("DTK_CONNECTIONS_FILE", str(Path.home() / ".dtk" / "connections.yml")),
 ]

sqlcompare/db/resolver.py

@@ -23,10 +23,27 @@ def normalize_connection_name(name: str) -> str:
     return s
 
 
+def _expand_env_vars(value: Any) -> Any:
+    """
+    Recursively expand environment variables in strings, dicts, and lists.
+
+    Expands ${VAR_NAME} and $VAR_NAME patterns in strings.
+    """
+    if isinstance(value, str):
+        return os.path.expandvars(value)
+    elif isinstance(value, dict):
+        return {k: _expand_env_vars(v) for k, v in value.items()}
+    elif isinstance(value, list):
+        return [_expand_env_vars(item) for item in value]
+    else:
+        return value
+
+
 def _load_connections_from_yaml(yaml_path: str) -> dict[str, dict[str, Any]]:
     """
     Load connection definitions from YAML file.
     Returns a dict mapping conn_id -> URL.create() parameters.
+    Expands environment variables in all string values.
     """
     expanded_path = Path(yaml_path).expanduser()
     if not expanded_path.exists():
@@ -35,7 +52,10 @@ def _load_connections_from_yaml(yaml_path: str) -> dict[str, dict[str, Any]]:
     try:
         with open(expanded_path, "r") as f:
             data = yaml.safe_load(f)
-            return data if isinstance(data, dict) else {}
+            if isinstance(data, dict):
+                # Expand environment variables in all values
+                return _expand_env_vars(data)
+            return {}
     except Exception:
         return {}
 

sqlcompare/query.py

@@ -37,7 +37,7 @@ def query(q: str, connection: str | None, output: str) -> None:
         if rows:
             from tabulate import tabulate
 
-            print(tabulate(rows, headers=columns))
+            print(tabulate(rows, headers=columns, tablefmt="pretty"))
             print(f"\nTotal rows: {len(rows)}")
         else:
             print("Query executed successfully. No rows returned.")

sqlcompare/utils/format.py

@@ -33,7 +33,7 @@ def format_table(
     """
     n_cols = len(columns)
     if n_cols == 0:
-        return tabulate([], headers=[], tablefmt=tablefmt, **tabulate_kwargs)
+        return tabulate([], headers=[], tablefmt="pretty", **tabulate_kwargs)
 
     # ---- column trimming ----
     use_col_ellipsis = n_cols > max_cols and max_cols >= 2

sqlcompare/utils/test_types/stats.py

@@ -6,7 +6,7 @@
 
 
 def _quote_ident(name: str) -> str:
-    return f'"{name.replace('"', '""')}"'
+    return '"' + name.replace('"', '""') + '"'
 
 
 def _collect_table_stats(