Rockd schema management

cli/macrostrat/cli/database/mariadb/postgresql_migration/db_changes.py

@@ -2,9 +2,7 @@
 Script to output dataframes for comparing data between two databases and tables.
 """
 
-import pandas as pd
-from psycopg2.sql import Identifier
-from sqlalchemy import create_engine, inspect, text
+from sqlalchemy import inspect, text
 from sqlalchemy.engine import Engine
 
 from macrostrat.core import app

cli/macrostrat/cli/entrypoint.py

@@ -7,8 +7,6 @@
 from typer import Argument, Typer
 
 from macrostrat.app_frame import CommandBase
-from macrostrat.cli.database.rockd.cli import cli as rockd_cli
-from macrostrat.cli.database.rockd.db_subsystem import rockd_subsystem
 from macrostrat.core import app
 from macrostrat.core.exc import MacrostratError
 from macrostrat.core.main import env_text, set_app_state
@@ -21,6 +19,7 @@
     SubsystemLoadError,
     build_paleogeography_subsystem,
 )
+from .subsystems.rockd import cli as rockd_cli
 from .utils import run_user_command_if_provided
 from .v1_entrypoint import v1_cli
 
@@ -43,7 +42,7 @@ def initialize(app):
     environ["ROCKD_DATABASE"] = rockd_url
 
 app.subsystems.add(db_subsystem)
-app.subsystems.add(rockd_subsystem)
+# app.subsystems.add(rockd_subsystem)
 
 help_text = f"""[bold]Macrostrat[/] control interface
 

cli/macrostrat/cli/database/rockd/cli.py → cli/macrostrat/cli/subsystems/rockd/__init__.py

@@ -1,13 +1,23 @@
 import importlib
+from os import environ
 
 import typer
 from sqlalchemy import text
-from typer import Option
 
-import macrostrat.cli.database.rockd.db_subsystem
 from macrostrat.core.migrations import _run_migrations
+from macrostrat.database import Database
+
+
+def get_rockd_db() -> Database:
+    """
+    Return a Database instance that talks to the Rockd cluster.
+    The URL can live in .env / docker-compose.yml as ROCKD_DATABASE.
+    """
+    url = environ.get("ROCKD_DATABASE")
+    if url is None:
+        raise RuntimeError("Set ROCKD_DATABASE in your environment")
+    return Database(url)
 
-from .database import get_rockd_db
 
 cli = typer.Typer(help="Rockd database tools")
 
@@ -22,7 +32,7 @@ def migrations(
     """
     List or apply Rockd migrations.
     """
-    importlib.import_module("macrostrat.cli.database.rockd.migrations")
+    importlib.import_module(".migrations", __package__)
     db = get_rockd_db()
 
     with db.engine.connect() as conn:
@@ -51,5 +61,5 @@ def migrations(
         name=name,
         force=force,
         data_changes=data_changes,
-        subsystem="rockd_database",
+        subsystem="rockd",
     )

cli/macrostrat/cli/subsystems/rockd/migrations/0010-rockd-tms-defs.sql

@@ -0,0 +1 @@
+../../../../../../submodules/postgis-tile-utils/sql/01-tms-defs.sql

cli/macrostrat/cli/subsystems/rockd/migrations/0011-rockd-tile-utils.sql

@@ -0,0 +1 @@
+../../../../../../submodules/postgis-tile-utils/sql/02-tile-utils.sql

cli/macrostrat/cli/database/rockd/migrations/0011_rockd_user_privileges.sql → cli/macrostrat/cli/subsystems/rockd/migrations/0012-user-privileges.sql

@@ -4,6 +4,19 @@
 --/opt/homebrew/bin/pg_restore --dbname=rockd --clean --username=rockd --host=db.development.svc.macrostrat.org --port=5432 /Users/afromandi/Macrostrat/Pgdump/2025-08-11T00:00:10.rockd.pg_dump
 
 
+DO
+$$
+BEGIN
+    IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'rockd') THEN
+        CREATE ROLE rockd NOLOGIN ;
+    END IF;
+
+    IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'rockd-reader') THEN
+        CREATE ROLE "rockd-reader" NOLOGIN ;
+    END IF;
+END
+$$;
+
 ALTER DATABASE rockd OWNER TO rockd;
 ALTER SCHEMA public OWNER TO rockd;
 ALTER SCHEMA modules OWNER TO rockd;

cli/macrostrat/cli/database/rockd/migrations/0020_integration_tokens.sql → cli/macrostrat/cli/subsystems/rockd/migrations/0020-integration-tokens.sql

@@ -60,4 +60,5 @@ VALUES (
     NOW(),                                                       -- last_notification_check
     NULL,                                                        -- last_data_dump
     NOW() + INTERVAL '1 year'                                    -- token_exp
-);
+)
+ON CONFLICT (email) DO NOTHING;