mirror of
https://github.com/ipnet-mesh/meshcore-hub.git
synced 2026-07-03 16:31:23 +02:00
Louis King
caef666c02
- compose: add optional postgres service (postgres:17-alpine, profile 'postgres', healthcheck, postgres_data volume); POSTGRES_* derive from DATABASE_* (single source of truth). DATABASE_* env added to migrate/ collector/api; migrate depends_on postgres with required:false so SQLite deployments are unaffected. - alembic/env: resolve the URL via CommonSettings.effective_database_url so DATABASE_BACKEND=postgres is honoured (previously DATABASE_URL/DATA_HOME only -> would silently migrate SQLite). - migrations: normalize_public_key uses STRING_AGG + HAVING COUNT(*) on Postgres (was SQLite GROUP_CONCAT + alias); raw_packets uses sa.JSON() not the sqlite dialect type. - database: fix _to_async_url to map postgresql+psycopg2:// (what the config assembles) to asyncpg, so API async sessions work on Postgres; resolve the search_path schema from DATABASE_SCHEMA env when not passed explicitly. Validated against a live postgres:17: db upgrade builds all 13 tables in the meshcorehub schema with correct native types (is_observer boolean, decoded json) and alembic_version stamped; the upsert, JSON/timestamptz round-trip, and asyncpg async sessions all work. SQLite suite still green (1061 passed). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
124 lines
3.9 KiB
Python
124 lines
3.9 KiB
Python
"""Alembic environment configuration."""
|
|
|
|
import os
|
|
from logging.config import fileConfig
|
|
|
|
from alembic import context
|
|
from sqlalchemy import engine_from_config, pool, text
|
|
|
|
from meshcore_hub.common.models import Base
|
|
|
|
# this is the Alembic Config object
|
|
config = context.config
|
|
|
|
# Interpret the config file for Python logging.
|
|
if config.config_file_name is not None:
|
|
fileConfig(config.config_file_name)
|
|
|
|
# Model's MetaData object for 'autogenerate' support
|
|
target_metadata = Base.metadata
|
|
|
|
|
|
def get_database_url() -> str:
|
|
"""Get the database URL using the same resolution as the app.
|
|
|
|
Delegates to CommonSettings.effective_database_url so DATABASE_BACKEND=postgres
|
|
(+ DATABASE_* components) and an explicit DATABASE_URL are honoured identically to
|
|
the running services — otherwise migrations would silently target SQLite.
|
|
"""
|
|
from pathlib import Path
|
|
|
|
from meshcore_hub.common.config import CommonSettings
|
|
|
|
url = CommonSettings().effective_database_url
|
|
# Ensure the parent directory exists for SQLite file URLs.
|
|
if url.startswith("sqlite:///"):
|
|
db_path = Path(url.replace("sqlite:///", ""))
|
|
db_path.parent.mkdir(parents=True, exist_ok=True)
|
|
return url
|
|
|
|
|
|
def get_schema(url: str) -> str | None:
|
|
"""Postgres schema to migrate into, or None for SQLite.
|
|
|
|
Each Hub instance keeps its tables and alembic_version in its own schema so
|
|
multiple instances (prod, stg, ...) can share one Postgres database with
|
|
independent migration state.
|
|
"""
|
|
if url.startswith(("postgresql", "postgres")):
|
|
return os.environ.get("DATABASE_SCHEMA", "meshcorehub")
|
|
return None
|
|
|
|
|
|
def run_migrations_offline() -> None:
|
|
"""Run migrations in 'offline' mode.
|
|
|
|
This configures the context with just a URL
|
|
and not an Engine, though an Engine is acceptable
|
|
here as well. By skipping the Engine creation
|
|
we don't even need a DBAPI to be available.
|
|
|
|
Calls to context.execute() here emit the given string to the
|
|
script output.
|
|
"""
|
|
url = get_database_url()
|
|
schema = get_schema(url)
|
|
context.configure(
|
|
url=url,
|
|
target_metadata=target_metadata,
|
|
literal_binds=True,
|
|
dialect_opts={"paramstyle": "named"},
|
|
# Batch mode is a SQLite-only workaround for its limited ALTER TABLE;
|
|
# Postgres performs ALTERs directly.
|
|
render_as_batch=url.startswith("sqlite"),
|
|
version_table_schema=schema,
|
|
include_schemas=schema is not None,
|
|
)
|
|
|
|
with context.begin_transaction():
|
|
context.run_migrations()
|
|
|
|
|
|
def run_migrations_online() -> None:
|
|
"""Run migrations in 'online' mode.
|
|
|
|
In this scenario we need to create an Engine
|
|
and associate a connection with the context.
|
|
"""
|
|
configuration = config.get_section(config.config_ini_section, {})
|
|
url = get_database_url()
|
|
configuration["sqlalchemy.url"] = url
|
|
schema = get_schema(url)
|
|
|
|
connectable = engine_from_config(
|
|
configuration,
|
|
prefix="sqlalchemy.",
|
|
poolclass=pool.NullPool,
|
|
)
|
|
|
|
with connectable.connect() as connection:
|
|
# Ensure the instance's schema exists and scope this connection to it so
|
|
# tables (and alembic_version) are created there. No-op for SQLite.
|
|
if schema is not None:
|
|
connection.execute(text(f'CREATE SCHEMA IF NOT EXISTS "{schema}"'))
|
|
connection.execute(text(f'SET search_path TO "{schema}"'))
|
|
connection.commit()
|
|
|
|
context.configure(
|
|
connection=connection,
|
|
target_metadata=target_metadata,
|
|
# Batch mode is a SQLite-only workaround for its limited ALTER TABLE.
|
|
render_as_batch=url.startswith("sqlite"),
|
|
version_table_schema=schema,
|
|
include_schemas=schema is not None,
|
|
)
|
|
|
|
with context.begin_transaction():
|
|
context.run_migrations()
|
|
|
|
|
|
if context.is_offline_mode():
|
|
run_migrations_offline()
|
|
else:
|
|
run_migrations_online()
|