From 87c50f2aac313545d6d8c318c9e1f1fe41a344b3 Mon Sep 17 00:00:00 2001 From: Brad Allen Date: Wed, 17 Mar 2010 16:27:39 -0600 Subject: [PATCH] Because of changes to SQLAlchemy bind parameter placement, removed all mxodbc test disabling statements having this pattern: @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: --- test/dialect/test_mssql.py | 3 --- test/sql/test_query.py | 29 ----------------------------- test/sql/test_quote.py | 3 --- test/sql/test_types.py | 6 ------ 4 files changed, 41 deletions(-) diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py index 7b3e3e10f0..07d195a435 100644 --- a/test/dialect/test_mssql.py +++ b/test/dialect/test_mssql.py @@ -307,7 +307,6 @@ class IdentityInsertTest(TestBase, AssertsCompiledSQL): class ReflectionTest(TestBase, ComparesTables): __only_on__ = 'mssql' - @testing.crashes('mssql+mxodbc', 'Invalid bind parameter placement') def test_basic_reflection(self): meta = MetaData(testing.db) @@ -349,7 +348,6 @@ class ReflectionTest(TestBase, ComparesTables): finally: meta.drop_all() - @testing.crashes('mssql+mxodbc', 'Invalid bind parameter placement') def test_identity(self): meta = MetaData(testing.db) table = Table( @@ -1149,7 +1147,6 @@ class TypesTest(TestBase, AssertsExecutionResults, ComparesTables): self.assert_(repr(t.c.t)) t.create(checkfirst=True) - @testing.crashes('mssql+mxodbc', 'Invalid bind parameter placement') def test_autoincrement(self): Table('ai_1', metadata, Column('int_y', Integer, primary_key=True), diff --git a/test/sql/test_query.py b/test/sql/test_query.py index 96d0567a38..309b532bad 100644 --- a/test/sql/test_query.py +++ b/test/sql/test_query.py @@ -230,10 +230,6 @@ class QueryTest(TestBase): assert row['anon_1'] == 8 assert row['anon_2'] == 10 - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - 'SELECT ? + query_users.user_name AS thedata \nFROM query_users - ORDER BY ? + query_users.user_name' ('test: ', 'test:') - """) @testing.fails_on('firebird', "kinterbasdb doesn't send full type information") def test_order_by_label(self): """test that a label within an ORDER BY works on each backend. @@ -776,10 +772,6 @@ class QueryTest(TestBase): # Null values are not outside any set assert len(r) == 0 - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - 'SELECT query_users.user_id, query_users.user_name \nFROM query_users - WHERE ? = ?' ('john', 'john') - """) @testing.emits_warning('.*empty sequence.*') @testing.fails_on('firebird', "uses sql-92 rules") @testing.fails_on('sybase', "uses sql-92 rules") @@ -1064,15 +1056,6 @@ class CompoundTest(TestBase): def _fetchall_sorted(self, executed): return sorted([tuple(row) for row in executed.fetchall()]) - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - InterfaceError: (InterfaceError) ('07009', 0, '[Microsoft][SQL Server - Native Client 10.0]Invalid parameter number', 7513) - 'SELECT bar.col3, bar.col4 \nFROM (SELECT t1.col3 AS col3, - t1.col4 AS col4 \nFROM t1 \nWHERE t1.col2 IN (?, ?) - UNION SELECT t2.col3 AS col3, t2.col4 AS col4 \nFROM t2 - WHERE t2.col2 IN (?, ?)) AS bar' ('t1col2r1', 't1col2r2', - 't2col2r2','t2col2r3') - """) @testing.requires.subqueries def test_union(self): (s1, s2) = ( @@ -1105,15 +1088,6 @@ class CompoundTest(TestBase): ('ccc', 'aaa')] eq_(u.execute().fetchall(), wanted) - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - InterfaceError: (InterfaceError) ('07009', 0, '[Microsoft][SQL Server - Native Client 10.0]Invalid parameter number', 7513) - 'SELECT bar.col3, bar.col4 \nFROM (SELECT t1.col3 AS col3, - t1.col4 AS col4 \nFROM t1 \nWHERE t1.col2 IN (?, ?) - UNION SELECT t2.col3 AS col3, t2.col4 AS col4 - FROM t2 \nWHERE t2.col2 IN (?, ?)) AS bar' - ('t1col2r1', 't1col2r2', 't2col2r2', 't2col2r3') - """) @testing.fails_on('firebird', "doesn't like ORDER BY with UNIONs") @testing.fails_on('maxdb', 'FIXME: unknown') @testing.requires.subqueries @@ -1616,9 +1590,6 @@ class OperatorTest(TestBase): # 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,) - """) def test_modulo(self): eq_( select([flds.c.intcol % 3], diff --git a/test/sql/test_quote.py b/test/sql/test_quote.py index 1b14bbd675..81a68ec74d 100644 --- a/test/sql/test_quote.py +++ b/test/sql/test_quote.py @@ -57,9 +57,6 @@ class QuoteTest(TestBase, AssertsCompiledSQL): ')' ) - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - 'select ident_seed(?), ident_incr(?)' ('dbo.WorstCase2', 'dbo.WorstCase2') - """) def testreflect(self): meta2 = MetaData(testing.db) t2 = Table('WorstCase2', meta2, autoload=True, quote=True) diff --git a/test/sql/test_types.py b/test/sql/test_types.py index 8c8ecd8f22..32bf0d688e 100644 --- a/test/sql/test_types.py +++ b/test/sql/test_types.py @@ -813,9 +813,6 @@ class ExpressionTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL): eq_(expr.right.type.__class__, CHAR) - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - 'SELECT test.bvalue + ? AS foo \nFROM test' ('BIND_INhi',) - """) @testing.fails_on('firebird', 'Data type unknown on the parameter') def test_operator_adapt(self): """test type-based overloading of operators""" @@ -855,9 +852,6 @@ class ExpressionTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL): "BIND_INfooBIND_INhiBIND_OUT" ) - @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement: - 'SELECT test.bvalue + ? AS foo \nFROM test' ('BIND_IN6',) - """) def test_typedec_righthand_coercion(self): class MyTypeDec(types.TypeDecorator): impl = String -- 2.47.3