wip

Author: leafty

components/renku_data_services/data_connectors/orm.py

@@ -71,8 +71,8 @@ class DataConnectorORM(BaseORM):
     )
     """Slug of the data connector."""
 
-    global_slug: Mapped[str | None] = mapped_column(String(99), index=True, nullable=True, default=None, unique=True)
-    """Slug for global data connectors."""
+    # global_slug: Mapped[str | None] = mapped_column(String(99), index=True, nullable=True, default=None, unique=True)
+    # """Slug for global data connectors."""
 
     readonly: Mapped[bool] = mapped_column("readonly", Boolean(), default=True)
     """Whether this storage should be mounted readonly or not """

components/renku_data_services/migrations/versions/47e51c42e391_add_global_namespace.py

@@ -6,10 +6,8 @@
 
 """
 
-from alembic import op
-from dataclasses import dataclass
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "47e51c42e391"
@@ -22,6 +20,10 @@ def upgrade() -> None:
     connection = op.get_bind()
     with connection.begin_nested() as tx:
         op.execute(sa.text("LOCK TABLE common.namespaces IN EXCLUSIVE MODE"))
+        op.execute(sa.text("LOCK TABLE common.entity_slugs IN EXCLUSIVE MODE"))
+        op.execute(sa.text("LOCK TABLE storage.data_connectors IN EXCLUSIVE MODE"))
+
+        # Step 1: update the namespaces table and add the _global namespace
         op.drop_constraint(
             "either_group_id_or_user_id_is_set",
             "namespaces",
@@ -34,7 +36,6 @@ def upgrade() -> None:
             "(user_id IS NOT NULL) OR (group_id IS NOT NULL) OR (slug = '_global')",
             schema="common",
         )
-
         insert_global_namespace_stmt = (
             sa.insert(
                 sa.table(
@@ -50,10 +51,9 @@ def upgrade() -> None:
         namespace_id = connection.execute(insert_global_namespace_stmt).scalar()
         if not namespace_id:
             raise RuntimeError("Failed to insert the _global namespace")
-
         print(f"namespace_id={namespace_id}")
 
-        op.execute(sa.text("LOCK TABLE storage.data_connectors IN EXCLUSIVE MODE"))
+        # Step 2: create a row in the entity_slug table for each global data connector
         select_global_data_connectors_stmt = (
             sa.select(sa.column("id", type_=sa.VARCHAR), sa.column("global_slug", type_=sa.VARCHAR))
             .select_from(sa.table("data_connectors", schema="storage"))
@@ -86,13 +86,45 @@ def upgrade() -> None:
             if not slug_id:
                 raise RuntimeError(f"Failed to insert the entity slug for data connector '{dc_id}'")
 
+        # Step 3: update the data_connectors table
+        op.drop_index("ix_storage_data_connectors_global_slug", table_name="data_connectors", schema="storage")
+        op.drop_column("data_connectors", "global_slug", schema="storage")
+        # TODO:
+
         tx.commit()
 
 
 def downgrade() -> None:
     connection = op.get_bind()
     with connection.begin_nested() as tx:
         op.execute(sa.text("LOCK TABLE common.namespaces IN EXCLUSIVE MODE"))
+        op.execute(sa.text("LOCK TABLE common.entity_slugs IN EXCLUSIVE MODE"))
+        op.execute(sa.text("LOCK TABLE storage.data_connectors IN EXCLUSIVE MODE"))
+
+        # Step 1: update the data_connectors table
+        op.add_column(
+            "data_connectors",
+            sa.Column("global_slug", sa.VARCHAR(length=99), autoincrement=False, nullable=True),
+            schema="storage",
+        )
+        op.create_index(
+            "ix_storage_data_connectors_global_slug", "data_connectors", ["global_slug"], unique=True, schema="storage"
+        )
+        # TODO:
+
+        # Step 2: create a row in the entity_slug table for each global data connector
+        # TODO:
+
+        # Step 3: update the namespaces table and add the _global namespace
+        delete_global_namespace_stmt = sa.delete(
+            sa.table(
+                "namespaces",
+                sa.column("id", type_=sa.VARCHAR),
+                sa.column("slug", type_=sa.VARCHAR),
+                schema="common",
+            )
+        ).where(sa.column("slug", type_=sa.VARCHAR) == sa.literal("_global"))
+        op.execute(delete_global_namespace_stmt)
         op.drop_constraint(
             "either_group_id_or_user_id_is_set",
             "namespaces",
@@ -106,4 +138,3 @@ def downgrade() -> None:
             schema="common",
         )
         tx.commit()
-    # CheckConstraint("(user_id IS NULL) <> (group_id IS NULL)", name="either_group_id_or_user_id_is_set"),