openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Unicode to String

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-05-14 17:47:07 +03:00
parent 42650d9f32
commit 35d577f271
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sqlalchemy_utils/functions/foreign_keys.py
View File

@@ -12,14 +12,16 @@ from ..query_chain import QueryChain
def get_foreign_key_values(fk, obj): def get_foreign_key_values(fk, obj):
return { return dict(
fk.constraint.columns[index].key: (
getattr(obj, element.column.key) fk.constraint.columns[index].key,
getattr(obj, element.column.key)
)
for for
index, element index, element
in in
enumerate(fk.constraint.elements) enumerate(fk.constraint.elements)
} )
def group_foreign_keys(foreign_keys): def group_foreign_keys(foreign_keys):
@@ -104,7 +106,7 @@ def merge_references(from_, to, foreign_keys=None):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'
id = sa.Column(sa.Integer, primary_key=True) id = sa.Column(sa.Integer, primary_key=True)
name = sa.Column(sa.Unicode(255)) name = sa.Column(sa.String(255))
def __repr__(self): def __repr__(self):
return 'User(name=%r)' % self.name return 'User(name=%r)' % self.name
@@ -112,7 +114,7 @@ def merge_references(from_, to, foreign_keys=None):
class BlogPost(self.Base): class BlogPost(self.Base):
__tablename__ = 'blog_post' __tablename__ = 'blog_post'
id = sa.Column(sa.Integer, primary_key=True) id = sa.Column(sa.Integer, primary_key=True)
title = sa.Column(sa.Unicode(255)) title = sa.Column(sa.String(255))
author_id = sa.Column(sa.Integer, sa.ForeignKey('user.id')) author_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'))
author = sa.orm.relationship(User) author = sa.orm.relationship(User)
@@ -120,10 +122,10 @@ def merge_references(from_, to, foreign_keys=None):
Now lets add some data:: Now lets add some data::
john = self.User(name=u'John') john = self.User(name='John')
jack = self.User(name=u'Jack') jack = self.User(name='Jack')
post = self.BlogPost(title=u'Some title', author=john) post = self.BlogPost(title='Some title', author=john)
post2 = self.BlogPost(title=u'Other title', author=jack) post2 = self.BlogPost(title='Other title', author=jack)
self.session.add_all([ self.session.add_all([
john, john,
jack, jack,
@@ -177,7 +179,6 @@ def merge_references(from_, to, foreign_keys=None):
) )
session.execute(query) session.execute(query)
else: else:
print old_values, new_values
( (
session.query(mapper.class_) session.query(mapper.class_)
.filter_by(**old_values) .filter_by(**old_values)