Merge "Fix sqlalchemy 0.8 issues"

This commit is contained in:
Jenkins
2013-12-18 08:23:41 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -27,7 +27,7 @@ import logging
import time import time
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import exceptions as sa_exc from sqlalchemy import exc as sa_exc
from sqlalchemy import orm as sa_orm from sqlalchemy import orm as sa_orm
from sqlalchemy import pool as sa_pool from sqlalchemy import pool as sa_pool

View File

@@ -39,7 +39,7 @@ class TimestampMixin(object):
updated_at = Column(DateTime, onupdate=timeutils.utcnow) updated_at = Column(DateTime, onupdate=timeutils.utcnow)
class Json(types.TypeDecorator, types.MutableType): class Json(types.TypeDecorator):
impl = types.Text impl = types.Text
def process_bind_param(self, value, dialect): def process_bind_param(self, value, dialect):
@@ -49,7 +49,7 @@ class Json(types.TypeDecorator, types.MutableType):
return jsonutils.loads(value) return jsonutils.loads(value)
class Failure(types.TypeDecorator, types.MutableType): class Failure(types.TypeDecorator):
"""Put misc.Failure object into database column. """Put misc.Failure object into database column.
We convert Failure object to dict, serialize that dict into We convert Failure object to dict, serialize that dict into