- move cte tests into their own test/sql/test_cte.py

- rework bindtemplate system of "numbered" params by applying
the numbers last, as we now need to generate these out of order
in some cases
- add positional assertion to assert_compile
- add new cte_positional collection to track bindparams generated
within cte visits; splice this onto the beginning of self.positiontup
at cte render time, [ticket:2521]

1 files changed, 4 insertions, 0 deletions

diff --git a/test/lib/testing.py b/test/lib/testing.py
index 31ea74ba3..d3bccb53c 100644
--- a/test/lib/testing.py
+++ b/test/lib/testing.py
@@ -578,6 +578,7 @@ class adict(dict):
 class AssertsCompiledSQL(object):
     def assert_compile(self, clause, result, params=None, 
                         checkparams=None, dialect=None, 
+                        checkpositional=None,
                         use_default_dialect=False,
                         allow_dialect_select=False):
         if use_default_dialect:
@@ -612,6 +613,9 @@ class AssertsCompiledSQL(object):
 
         if checkparams is not None:
             eq_(c.construct_params(params), checkparams)
+        if checkpositional is not None:
+            p = c.construct_params(params)
+            eq_(tuple([p[x] for x in c.positiontup]), checkpositional)
 
 class ComparesTables(object):
     def assert_tables_equal(self, table, reflected_table, strict_types=False):