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

Make render_statement SA 1.0 compliant

Browse Source
This commit is contained in:
Konsta Vesterinen
2015-05-05 14:19:32 +03:00
parent 1d06f07077
commit 64714c9a0c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sqlalchemy_utils/functions/render.py
View File

@@ -58,7 +58,7 @@ def render_statement(statement, bind=None):
if isinstance(statement, sa.orm.query.Query): if isinstance(statement, sa.orm.query.Query):
if bind is None: if bind is None:
bind = statement.session.get_bind(statement._mapper_zero_or_none()) bind = statement.session.get_bind(statement._mapper_zero())
statement = statement.statement statement = statement.statement

8
tests/functions/test_render.py
View File

@@ -17,7 +17,7 @@ class TestRender(TestCase):
self.User = User self.User = User
def test_render_statement_query(self): def test_render_orm_query(self):
query = self.session.query(self.User).filter_by(id=3) query = self.session.query(self.User).filter_by(id=3)
text = render_statement(query) text = render_statement(query)
@@ -33,6 +33,12 @@ class TestRender(TestCase):
assert 'FROM user' in text assert 'FROM user' in text
assert 'WHERE user.id = 3' in text assert 'WHERE user.id = 3' in text
def test_render_statement_without_mapper(self):
statement = sa.select([sa.text('1')])
text = render_statement(statement, bind=self.session.bind)
assert 'SELECT 1' in text
def test_render_ddl(self): def test_render_ddl(self):
expression = 'self.User.__table__.create(engine)' expression = 'self.User.__table__.create(engine)'
stream = render_expression(expression, self.engine) stream = render_expression(expression, self.engine)