From 4051c82af10d346e4d6042203d049051e64396f5 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Wed, 18 Jul 2012 20:16:23 +0300 Subject: [PATCH] Workaround to identify proper alchemy url Not all apps use the same setting name for the pithos backend connection --- .../pithos/backends/lib/sqlalchemy/alembic/env.py | 12 +++++++++++- snf-pithos-backend/pithos/backends/migrate.py | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/env.py b/snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/env.py index 61744d2..22e035e 100644 --- a/snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/env.py +++ b/snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/env.py @@ -2,7 +2,17 @@ from __future__ import with_statement from alembic import context from sqlalchemy import engine_from_config, pool from logging.config import fileConfig -from synnefo.settings import PITHOS_BACKEND_DB_CONNECTION + +try: + # pithos-app case + from synnefo.settings import PITHOS_BACKEND_DB_CONNECTION +except ImportError: + try: + # plankton case + from synnefo.settings import BACKEND_DB_CONNECTION as \ + PITHOS_BACKEND_DB_CONNECTION + except ImportError: + PITHOS_BACKEND_DB_CONNECTION = None # this is the Alembic Config object, which provides # access to the values within the .ini file in use. diff --git a/snf-pithos-backend/pithos/backends/migrate.py b/snf-pithos-backend/pithos/backends/migrate.py index d2eb1ad..59df1b9 100644 --- a/snf-pithos-backend/pithos/backends/migrate.py +++ b/snf-pithos-backend/pithos/backends/migrate.py @@ -52,7 +52,16 @@ from alembic import context, command from pithos.backends.lib import sqlalchemy as sqlalchemy_backend from pithos.backends.lib.sqlalchemy import node, groups, public, xfeatures -from synnefo.settings import PITHOS_BACKEND_DB_CONNECTION +try: + # pithos-app case + from synnefo.settings import PITHOS_BACKEND_DB_CONNECTION +except ImportError: + try: + # plankton case + from synnefo.settings import BACKEND_DB_CONNECTION as \ + PITHOS_BACKEND_DB_CONNECTION + except ImportError: + PITHOS_BACKEND_DB_CONNECTION = None import sqlalchemy as sa -- 1.7.10.4