pgmini-migrate 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

pgmini_migrate/cli.py

@@ -29,6 +29,7 @@ def load_env_file(env_path=".env"):
             # do not overwrite existing env set by host
             if k not in os.environ:
                 os.environ[k] = v
+                print(f"Loaded env {k} from {env_path}: {v}")
 
 
 def build_conninfo_from_args(args):
@@ -154,9 +155,7 @@ def get_next_version_str(migrations_root):
 def create_migration(migrations_root, description):
     desc = description.strip()
     # sanitize description
-    desc_clean = "_".join(
-        c for c in desc.lower().replace(" ", "_") if (c.isalnum() or c == "_")
-    )
+    desc_clean=desc.lower().replace(" ", "_").replace("-", "_")
     version = get_next_version_str(migrations_root)
     upgrade_name = f"{version}.{desc_clean}.upgrade.sql"
     downgrade_name = f"{version}.{desc_clean}.downgrade.sql"
@@ -269,11 +268,15 @@ def cmd_downgrade(args):
 
 def build_arg_parser():
     p = argparse.ArgumentParser(prog="pgmigrate", description="Simple PostgreSQL migration tool")
+
+    # NOTE: lấy default từ os.getenv() *tại thời điểm gọi*, không từ hằng module-level
+    migrations_default = os.getenv("MIGRATIONS_DIR", "migrations")
+
     p.add_argument("--env-file", default=".env", help="Path to .env file (default: .env)")
     p.add_argument(
         "--migrations",
-        default=DEFAULT_MIGRATIONS_DIR,
-        help=f"Root migrations dir (default: {DEFAULT_MIGRATIONS_DIR})",
+        default=migrations_default,
+        help=f"Root migrations dir (default: {migrations_default})",
     )
 
     # DB connection options (mutually override database_url)
@@ -303,16 +306,24 @@ def build_arg_parser():
 
 def main(argv=None):
     argv = argv if argv is not None else sys.argv[1:]
+
+    # -------------------------
+    # 1) pre-parse only --env-file
+    # -------------------------
+    pre_parser = argparse.ArgumentParser(add_help=False)
+    pre_parser.add_argument("--env-file", default=".env")
+    pre_args, _unknown = pre_parser.parse_known_args(argv)
+
+    # 2) load env file BEFORE building main parser so os.getenv picks values
+    if pre_args.env_file:
+        load_env_file(pre_args.env_file)
+
+    # 3) build the full parser (now os.getenv reflects .env content)
     parser = build_arg_parser()
-    args = parser.parse_args(argv)
 
-    # Load env file first (do not overwrite existing env vars)
-    if args.env_file:
-        load_env_file(args.env_file)
+    # 4) parse full args (using original argv)
+    args = parser.parse_args(argv)
 
-    # prefer CLI args, else env
-    # Re-populate db fields from env if not provided explicitly
-    # (build_conninfo handles database_url precedence)
     # Dispatch commands:
     if args.cmd == "create":
         desc = " ".join(args.description)
@@ -320,8 +331,6 @@ def main(argv=None):
         return
 
     # For commands that touch DB, ensure connection info exists
-    # Build conninfo now (will use args or environment)
-    # If neither database_url nor db_name provided, abort
     conninfo = build_conninfo_from_args(args)
     if not conninfo:
         print("No database connection info provided. Provide --database-url or host/name/user/password or set env vars.")

{pgmini_migrate-0.1.2.dist-info → pgmini_migrate-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgmini-migrate
-Version: 0.1.2
+Version: 0.1.3
 Summary: A minimal PostgreSQL migration tool for Python
 Author-email: Nguyen Vu Duy Luan <nvdluan@gmail.com>
 License: Copyright (c) 2025 Nguyen Vu Duy Luan

pgmini_migrate-0.1.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+pgmini_migrate/__init__.py,sha256=Pru0BlFBASFCFo7McHdohtKkUtgMPDwbGfyUZlE2_Vw,21
+pgmini_migrate/__main__.py,sha256=0g3iknXOS9gZUcpL_trgAcuCJnZZKjdsT_xt61WOVb4,60
+pgmini_migrate/cli.py,sha256=7i-kwA5rlG6rpQw4NyMzaxs_OEZXvuA2ZGK2bfYyKBg,12179
+pgmini_migrate/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pgmini_migrate-0.1.3.dist-info/licenses/LICENSE,sha256=n8ph1nmbOC4LqVLKRE-5SrUxzlv71A4saf-2_iNWR2Y,37
+pgmini_migrate-0.1.3.dist-info/METADATA,sha256=JEI-i9nzM3D_E1UR8JxsHAFGVHJOQsy8-IH6RMXXRKw,1197
+pgmini_migrate-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pgmini_migrate-0.1.3.dist-info/entry_points.txt,sha256=Zy6EN7sJuzTPbMhyoFjri1OdQ2iX1HuPw4UcSi4G6OY,54
+pgmini_migrate-0.1.3.dist-info/top_level.txt,sha256=ok556JVjy6jjrWTHi9d_lE4TteBXjQIoLOoJFD7_yhg,15
+pgmini_migrate-0.1.3.dist-info/RECORD,,

pgmini_migrate-0.1.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-pgmini_migrate/__init__.py,sha256=Pru0BlFBASFCFo7McHdohtKkUtgMPDwbGfyUZlE2_Vw,21
-pgmini_migrate/__main__.py,sha256=0g3iknXOS9gZUcpL_trgAcuCJnZZKjdsT_xt61WOVb4,60
-pgmini_migrate/cli.py,sha256=tnvAMvHf1l8hYTIjlWGB9MKfvopjk9Aksy4EMtMY-sg,11850
-pgmini_migrate/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pgmini_migrate-0.1.2.dist-info/licenses/LICENSE,sha256=n8ph1nmbOC4LqVLKRE-5SrUxzlv71A4saf-2_iNWR2Y,37
-pgmini_migrate-0.1.2.dist-info/METADATA,sha256=yBYekKAZI7qj2rq1M1PAJ0hithyoOhqEu-Ae63uAu9k,1197
-pgmini_migrate-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pgmini_migrate-0.1.2.dist-info/entry_points.txt,sha256=Zy6EN7sJuzTPbMhyoFjri1OdQ2iX1HuPw4UcSi4G6OY,54
-pgmini_migrate-0.1.2.dist-info/top_level.txt,sha256=ok556JVjy6jjrWTHi9d_lE4TteBXjQIoLOoJFD7_yhg,15
-pgmini_migrate-0.1.2.dist-info/RECORD,,