summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-02-18 17:00:35 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-02-18 17:00:35 -0500
commit6b19a63f990b75a320a773a5bcf5e7a77c7a6ef1 (patch)
tree3ab4efd7d54452c45af455b013635002325b679c
parent683ec6c974aa6ddba42ace81611e7d6577a9d2b2 (diff)
downloadsqlalchemy-6b19a63f990b75a320a773a5bcf5e7a77c7a6ef1.tar.gz
- additional test adjustments. need to review carefully the
impact of these behavioral changes
-rw-r--r--test/orm/test_utils.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py
index 168cee19c..c857d9e8d 100644
--- a/test/orm/test_utils.py
+++ b/test/orm/test_utils.py
@@ -159,8 +159,10 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL):
self._fixture(Point)
alias = aliased(Point)
- eq_(str(Point.double_x), "point.x * :x_1")
- eq_(str(alias.double_x), "point_1.x * :x_1")
+ eq_(str(Point.double_x), "Point.double_x")
+ eq_(str(alias.double_x), "AliasedClass_Point.double_x")
+ eq_(str(Point.double_x.__clause_element__()), "point.x * :x_1")
+ eq_(str(alias.double_x.__clause_element__()), "point_1.x * :x_1")
sess = Session()
@@ -183,10 +185,14 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL):
self._fixture(Point)
alias = aliased(Point)
- eq_(str(Point.x_alone), "Point.x")
- eq_(str(alias.x_alone), "AliasedClass_Point.x")
+ eq_(str(Point.x_alone), "Point.x_alone")
+ eq_(str(alias.x_alone), "AliasedClass_Point.x_alone")
- assert Point.x_alone is Point.x
+ eq_(str(Point.x_alone.__clause_element__()), "point.x")
+ eq_(str(alias.x_alone + 1), "point_1.x + :x_1")
+
+ assert Point.x_alone.__clause_element__() is \
+ Point.x.__clause_element__()
eq_(str(alias.x_alone == alias.x), "point_1.x = point_1.x")