From: Brad Allen <bradallen137@gmail.com>
Date: Wed, 17 Mar 2010 22:11:45 +0000 (-0600)
Subject: merged from main tip
X-Git-Tag: rel_0_6beta2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75e7b1081c2c8412dda822465ca3b395eca57f6f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merged from main tip
---

75e7b1081c2c8412dda822465ca3b395eca57f6f
diff --cc test/sql/test_query.py
index 7685d09850,3c9d5f0a75..96d0567a38
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@@ -1624,11 -1587,9 +1613,12 @@@ class OperatorTest(TestBase)
      @classmethod
      def teardown_class(cls):
          metadata.drop_all()
+     
 +
+     # TODO: seems like more tests warranted for this setup.
 -    
 +    @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement:
 +         'SELECT flds.intcol % ? AS anon_1 \nFROM flds ORDER BY flds.idcol' (3,)
 +       """)
-     @testing.fails_on('maxdb', 'FIXME: unknown')
      def test_modulo(self):
          eq_(
              select([flds.c.intcol % 3],