dbos 1.11.0a2__tar.gz → 1.11.0a4__tar.gz

{dbos-1.11.0a2 → dbos-1.11.0a4}/PKG-INFO

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

{dbos-1.11.0a2 → dbos-1.11.0a4}/dbos/cli/migration.py

@@ -46,40 +46,44 @@ def grant_dbos_schema_permissions(database_url: str, role_name: str) -> None:
     )
     engine = None
     try:
-        engine = sa.create_engine(database_url)
+        engine = sa.create_engine(
+            sa.make_url(database_url).set(drivername="postgresql+psycopg")
+        )
         with engine.connect() as connection:
             connection.execution_options(isolation_level="AUTOCOMMIT")
 
             # Grant usage on the dbos schema
-            sql = f"GRANT USAGE ON SCHEMA dbos TO {role_name}"
+            sql = f'GRANT USAGE ON SCHEMA dbos TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
             # Grant all privileges on all existing tables in dbos schema (includes views)
-            sql = f"GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA dbos TO {role_name}"
+            sql = f'GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA dbos TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
             # Grant all privileges on all sequences in dbos schema
-            sql = f"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA dbos TO {role_name}"
+            sql = (
+                f'GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA dbos TO "{role_name}"'
+            )
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
             # Grant execute on all functions and procedures in dbos schema
-            sql = f"GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA dbos TO {role_name}"
+            sql = f'GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA dbos TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
             # Grant default privileges for future objects in dbos schema
-            sql = f"ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON TABLES TO {role_name}"
+            sql = f'ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON TABLES TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
-            sql = f"ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON SEQUENCES TO {role_name}"
+            sql = f'ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON SEQUENCES TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 
-            sql = f"ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT EXECUTE ON FUNCTIONS TO {role_name}"
+            sql = f'ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT EXECUTE ON FUNCTIONS TO "{role_name}"'
             typer.echo(sql)
             connection.execute(sa.text(sql))
 

{dbos-1.11.0a2 → dbos-1.11.0a4}/pyproject.toml

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

{dbos-1.11.0a2 → dbos-1.11.0a4}/tests/test_migrate.py

@@ -8,12 +8,14 @@ from dbos import DBOS, DBOSConfig
 def test_migrate(postgres_db_engine: sa.Engine) -> None:
     """Test that you can migrate with a privileged role and run DBOS with a less-privileged role"""
     database_name = "migrate_test"
-    role_name = "migrate_test_role"
+    role_name = "migrate-test-role"
     role_password = "migrate_test_password"
 
-    db_url = postgres_db_engine.url.set(database=database_name).render_as_string(
-        hide_password=False
+    # Verify migration is agnostic to driver name (under the hood it uses postgresql+psycopg)
+    db_url = postgres_db_engine.url.set(database=database_name).set(
+        drivername="postgresql"
     )
+    db_url_string = db_url.render_as_string(hide_password=False)
 
     # Drop the DBOS database if it exists. Create a test role with no permissions.
     with postgres_db_engine.connect() as connection:
@@ -21,15 +23,17 @@ def test_migrate(postgres_db_engine: sa.Engine) -> None:
         connection.execute(
             sa.text(f"DROP DATABASE IF EXISTS {database_name} WITH (FORCE)")
         )
-        connection.execute(sa.text(f"DROP ROLE IF EXISTS {role_name}"))
+        connection.execute(sa.text(f'DROP ROLE IF EXISTS "{role_name}"'))
         connection.execute(
-            sa.text(f"CREATE ROLE {role_name} WITH LOGIN PASSWORD '{role_password}'")
+            sa.text(
+                f"CREATE ROLE \"{role_name}\" WITH LOGIN PASSWORD '{role_password}'"
+            )
         )
 
     # Using the admin role, create the DBOS database and verify it exists.
     # Set permissions for the test role.
     subprocess.check_call(
-        ["dbos", "migrate", "-D", db_url, "-s", db_url, "-r", role_name]
+        ["dbos", "migrate", "-D", db_url_string, "-s", db_url_string, "-r", role_name]
     )
     with postgres_db_engine.connect() as c:
         c.execution_options(isolation_level="AUTOCOMMIT")
@@ -42,9 +46,7 @@ def test_migrate(postgres_db_engine: sa.Engine) -> None:
 
     # Initialize DBOS with the test role. Verify various operations work.
     test_db_url = (
-        postgres_db_engine.url.set(database=database_name)
-        .set(username=role_name)
-        .set(password=role_password)
+        db_url.set(username=role_name).set(password=role_password)
     ).render_as_string(hide_password=False)
     DBOS.destroy(destroy_registry=True)
     config: DBOSConfig = {