From 2c0bd07e588548adc2c7b0c8840c61171cf76b72 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Mon, 13 Apr 2015 14:08:04 -0700 Subject: [PATCH] Updated oslo_db. Updated oslo.db to most recent version, which includes a patch by @greghaynes that fixes pymysql error handling. Also updated all uses of the deprecated oslo.db namespace to use oslo_db. Change-Id: I7de41aef6db0f45a638eb2aa22cfae45f99c8195 --- requirements-py3.txt | 2 +- requirements.txt | 2 +- storyboard/db/api/base.py | 14 +++++++------- storyboard/db/migration/cli.py | 2 +- storyboard/db/models.py | 4 ++-- storyboard/tests/db/migration/test_migrations.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/requirements-py3.txt b/requirements-py3.txt index 314c73ca..3d8c736e 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -9,7 +9,7 @@ oslo.config>=1.2.1 oslo.context>=0.1.0 oslo.utils>=1.2.0 pecan>=0.4.5 -oslo.db>=0.2.0 +oslo.db>=1.8.0 oslo.log>=0.1.0 pika>=0.9.14 python-openid diff --git a/requirements.txt b/requirements.txt index 6927e238..50a62989 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ oslo.config>=1.2.1 oslo.context>=0.1.0 oslo.utils>=1.2.0 pecan>=0.4.5 -oslo.db>=0.2.0 +oslo.db>=1.8.0 oslo.log>=0.1.0 pika>=0.9.14 python-openid diff --git a/storyboard/db/api/base.py b/storyboard/db/api/base.py index d5ce6ce2..f9ccf2bd 100644 --- a/storyboard/db/api/base.py +++ b/storyboard/db/api/base.py @@ -16,10 +16,10 @@ import copy from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import session as db_session -from oslo.db.sqlalchemy.utils import InvalidSortKey -from oslo.db.sqlalchemy.utils import paginate_query as utils_paginate_query +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import session as db_session +from oslo_db.sqlalchemy.utils import InvalidSortKey +from oslo_db.sqlalchemy.utils import paginate_query as utils_paginate_query from oslo_log import log from pecan import request import six @@ -284,7 +284,7 @@ def entity_create(kls, values, session=None): raise exc.DBDeadLock() except db_exc.DBInvalidUnicodeParameter: raise exc.DBInvalidUnicodeParameter - # XXX(greghaynes) Due to a bug in oslo.db + PyMySQL reference errors + # XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors # are not properly raised. except db_exc.DBError: raise exc.DBReferenceError(object_name=kls.__name__, @@ -321,7 +321,7 @@ def entity_update(kls, entity_id, values, session=None): raise exc.DBDeadLock() except db_exc.DBInvalidUnicodeParameter: raise exc.DBInvalidUnicodeParameter - # XXX(greghaynes) Due to a bug in oslo.db + PyMySQL reference errors + # XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors # are not properly raised. except db_exc.DBError: raise exc.DBReferenceError(object_name=kls.__name__, @@ -354,7 +354,7 @@ def entity_hard_delete(kls, entity_id): raise exc.DBDeadLock() except db_exc.DBInvalidUnicodeParameter: raise exc.DBInvalidUnicodeParameter() - # XXX(greghaynes) Due to a bug in oslo.db + PyMySQL reference errors + # XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors # are not properly raised. except db_exc.DBError: raise exc.DBReferenceError(object_name=kls.__name__, diff --git a/storyboard/db/migration/cli.py b/storyboard/db/migration/cli.py index 1cc58a5d..2d67e7ac 100644 --- a/storyboard/db/migration/cli.py +++ b/storyboard/db/migration/cli.py @@ -22,7 +22,7 @@ from alembic import command as alembic_command from alembic import config as alembic_config from alembic import util as alembic_util from oslo.config import cfg -from oslo.db import options +from oslo_db import options import six from storyboard.db import projects_loader diff --git a/storyboard/db/models.py b/storyboard/db/models.py index 51077141..b5b028bf 100644 --- a/storyboard/db/models.py +++ b/storyboard/db/models.py @@ -23,7 +23,7 @@ import six import six.moves.urllib.parse as urlparse from oslo.config import cfg -from oslo.db.sqlalchemy import models +from oslo_db.sqlalchemy import models from sqlalchemy import Boolean from sqlalchemy import Column from sqlalchemy.dialects.mysql import MEDIUMTEXT @@ -77,7 +77,7 @@ class IdMixin(object): class UTCTimestampMixin(object): """A Database model mixin that automatically manages our creation and - updating timestamps. This mixin was copied from oslo.db, and adapted to + updating timestamps. This mixin was copied from oslo_db, and adapted to use our own internal UTCDateTime type decorator. """ created_at = Column(UTCDateTime, diff --git a/storyboard/tests/db/migration/test_migrations.py b/storyboard/tests/db/migration/test_migrations.py index e96bc01d..e65ac0af 100644 --- a/storyboard/tests/db/migration/test_migrations.py +++ b/storyboard/tests/db/migration/test_migrations.py @@ -38,7 +38,7 @@ postgres=# create database openstack_citest with owner openstack_citest; """ from oslo.config import cfg -from oslo.db.sqlalchemy import utils as db_utils +from oslo_db.sqlalchemy import utils as db_utils from storyboard.tests.db.migration import test_migrations_base as base