fix 1.4 test suite

add some recent fixes so we can get new 1.4 fixes merged

Change-Id: I692c8adb6b22f10629b9d797c1a64334d43f13b3

diff --git a/test/dialect/postgresql/test_reflection.py b/test/dialect/postgresql/test_reflection.py
index f33b3bde45417af9c36e18e51d50d38a36a59fd4..807ea128198790833c8c00b663b477373540da87 100644 (file)
--- a/test/dialect/postgresql/test_reflection.py
+++ b/test/dialect/postgresql/test_reflection.py
@@ -303,13 +303,18 @@ class MaterializedViewReflectionTest(
 
     def test_get_view_definition(self, connection):
         insp = inspect(connection)
+
+        def normalize(definition):
+            # pg16 returns "SELECT" without qualifying tablename.
+            # older pgs include it
+            definition = re.sub(
+                r"testtable\.(\w+)", lambda m: m.group(1), definition
+            )
+            return re.sub(r"[\n\t ]+", " ", definition.strip())
+
         eq_(
-            re.sub(
-                r"[\n\t ]+",
-                " ",
-                insp.get_view_definition("test_mview").strip(),
-            ),
-            "SELECT testtable.id, testtable.data FROM testtable;",
+            normalize(insp.get_view_definition("test_mview")),
+            "SELECT id, data FROM testtable;",
         )
 
 

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 9daafb7cefb371649614fe63620d4b0657bf8e56..e2348bb8a49995a61ba7897cb96ef451ab14cbb2 100644 (file)
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -171,6 +171,7 @@ class ColExpressionsTest(fixtures.DeclarativeMappedTest):
         rows = (
             s.query(B.id.expressions[0], B.id.expressions[1], func.sum(B.data))
             .group_by(*B.id.expressions)
+            .order_by(B.id.expressions[0])
             .all()
         )
         eq_(rows, [(1, 1, 5), (2, 2, 7)])