lance/edbob
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix

Browse source
This commit is contained in:
Lance Edgar 2012-04-10 13:40:48 -05:00
parent b1e6b12b71
commit 2829c326ef
2 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
edbob/db/extensions/__init__.py
View file

@ -33,7 +33,7 @@ import sqlalchemy.exc
from sqlalchemy import MetaData
# from sqlalchemy.orm import clear_mappers
import migrate.versioning.api
# import migrate.versioning.api
# from migrate.versioning.schema import ControlledSchema
# import rattail
@ -50,11 +50,11 @@ from edbob.db import exceptions
from edbob.db import Session
# from edbob.db.classes import ActiveExtension
from edbob.db.model import Base, ActiveExtension
from edbob.db.util import (
get_database_version,
get_repository_path,
get_repository_version,
)
# from edbob.db.util import (
# get_database_version,
# get_repository_path,
# get_repository_version,
# )
from edbob.modules import import_module_path
from edbob.util import entry_point_map, requires_impl

50
edbob/db/util.py
View file

@ -29,8 +29,8 @@
import os.path
import sqlalchemy.exc
import migrate.versioning.api
import migrate.exceptions
# import migrate.versioning.api
# import migrate.exceptions
# import rattail
# from rattail.db import exc as exceptions
@ -62,29 +62,29 @@ from edbob.db.model import Base
# return True
def get_database_version(engine=None, extension=None):
"""
Returns a SQLAlchemy-Migrate version number found in the database
represented by ``engine``.
# def get_database_version(engine=None, extension=None):
# """
# Returns a SQLAlchemy-Migrate version number found in the database
# represented by ``engine``.
If no engine is provided, :attr:`edbob.db.engine` is assumed.
# If no engine is provided, :attr:`edbob.db.engine` is assumed.
If ``extension`` is provided, the version for its schema is returned;
otherwise the core schema is assumed.
"""
# If ``extension`` is provided, the version for its schema is returned;
# otherwise the core schema is assumed.
# """
if engine is None:
engine = edbob.db.engine
# if engine is None:
# engine = edbob.db.engine
try:
version = migrate.versioning.api.db_version(
str(engine.url), get_repository_path(extension))
# try:
# version = migrate.versioning.api.db_version(
# str(engine.url), get_repository_path(extension))
except (sqlalchemy.exc.NoSuchTableError,
migrate.exceptions.DatabaseNotControlledError):
raise exceptions.CoreSchemaNotInstalled(engine)
# except (sqlalchemy.exc.NoSuchTableError,
# migrate.exceptions.DatabaseNotControlledError):
# raise exceptions.CoreSchemaNotInstalled(engine)
return version
# return version
def get_repository_path(extension=None):
@ -102,14 +102,14 @@ def get_repository_path(extension=None):
return os.path.dirname(extension.schema.__file__)
def get_repository_version(extension=None):
"""
Returns the version of the SQLAlchemy-Migrate repository for ``extension``.
# def get_repository_version(extension=None):
# """
# Returns the version of the SQLAlchemy-Migrate repository for ``extension``.
If no extension is provided, ``edbob``'s core repository is assumed.
"""
# If no extension is provided, ``edbob``'s core repository is assumed.
# """
return migrate.versioning.api.version(get_repository_path(extension))
# return migrate.versioning.api.version(get_repository_path(extension))
def install_core_schema(engine=None):