dbos 0.11.0a1__tar.gz → 0.11.0a2__tar.gz

{dbos-0.11.0a1 → dbos-0.11.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 0.11.0a1
+Version: 0.11.0a2
 Summary: Ultra-lightweight durable execution in Python
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-0.11.0a1 → dbos-0.11.0a2}/dbos/system_database.py

@@ -1,5 +1,6 @@
 import datetime
 import os
+import re
 import threading
 import time
 from enum import Enum
@@ -203,9 +204,13 @@ class SystemDatabase:
         )
         alembic_cfg = Config()
         alembic_cfg.set_main_option("script_location", migration_dir)
-        alembic_cfg.set_main_option(
-            "sqlalchemy.url", self.engine.url.render_as_string(hide_password=False)
+        # Alembic requires the % in URL-escaped parameters to itself be escaped to %%.
+        escaped_conn_string = re.sub(
+            r"%(?=[0-9A-Fa-f]{2})",
+            "%%",
+            self.engine.url.render_as_string(hide_password=False),
         )
+        alembic_cfg.set_main_option("sqlalchemy.url", escaped_conn_string)
         command.upgrade(alembic_cfg, "head")
 
         self.notification_conn: Optional[psycopg.connection.Connection] = None

{dbos-0.11.0a1 → dbos-0.11.0a2}/dbos/templates/hello/migrations/env.py.dbos

@@ -1,3 +1,4 @@
+import re
 from logging.config import fileConfig
 
 from alembic import context
@@ -15,7 +16,13 @@ if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
 # programmatically set the sqlalchemy.url field from DBOS Config
-config.set_main_option("sqlalchemy.url", get_dbos_database_url())
+# Alembic requires the % in URL-escaped parameters to itself be escaped to %%.
+escaped_conn_string = re.sub(
+    r"%(?=[0-9A-Fa-f]{2})",
+    "%%",
+    get_dbos_database_url(),
+)
+config.set_main_option("sqlalchemy.url", escaped_conn_string)
 
 # add your model's MetaData object here
 # for 'autogenerate' support

{dbos-0.11.0a1 → dbos-0.11.0a2}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.11.0a1"
+version = "0.11.0a2"
 
 [project.license]
 text = "MIT"

{dbos-0.11.0a1 → dbos-0.11.0a2}/tests/test_schema_migration.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 import pytest
 import sqlalchemy as sa
@@ -94,5 +95,10 @@ def rollback_system_db(sysdb_url: str) -> None:
     )
     alembic_cfg = Config()
     alembic_cfg.set_main_option("script_location", migration_dir)
-    alembic_cfg.set_main_option("sqlalchemy.url", sysdb_url)
+    escaped_conn_string = re.sub(
+        r"%(?=[0-9A-Fa-f]{2})",
+        "%%",
+        sysdb_url,
+    )
+    alembic_cfg.set_main_option("sqlalchemy.url", escaped_conn_string)
     command.downgrade(alembic_cfg, "base")  # Rollback all migrations