Merged from main tip, and resolved conflicts in mxodbc dialect and connector.

diff --cc lib/sqlalchemy/connectors/mxodbc.py
index 0e7bc14c48949bfbaeed46c682666a0c8b9701aa,68b88019c248ab221acc8b3d314d96387fcafbaf..66ebfb4b0eae1ca1ba45672821a26de281440ff3
--- 1/lib/sqlalchemy/connectors/mxodbc.py
--- 2/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@@ -49,12 -31,28 +49,29 @@@ class MxODBCConnector(Connector)
          def connect(conn):
              conn.stringformat = self.dbapi.MIXED_STRINGFORMAT
              conn.datetimeformat = self.dbapi.PYDATETIME_DATETIMEFORMAT
-             conn.errorhandler = error_handler
 +            conn.decimalformat = self.dbapi.DECIMAL_DECIMALFORMAT
+             conn.errorhandler = self._error_handler()
              # Alternatives to experiment with:
              #conn.bindmethod = self.dbapi.BIND_USING_PYTHONTYPE
 -            #conn.bindmethod = self.dbapi.BIND_USING_SQLTYPE
 +            conn.bindmethod = self.dbapi.BIND_USING_SQLTYPE
          return connect
 -        """Return a handler that adjusts mxODBC's raised Warnings to emit Python standard warnings.
+     
+     def _error_handler(self):
 -                #import pdb; pdb.set_trace()
++        """Return a handler that adjusts mxODBC's raised Warnings to
++        emit Python standard warnings.
+         """
+ 
+         from mx.ODBC.Error import Warning as MxOdbcWarning
+         def error_handler(connection, cursor, errorclass, errorvalue):
+ 
+             if issubclass(errorclass, MxOdbcWarning):
+                 errorclass.__bases__ = (Warning,)
+                 warnings.warn(message=str(errorvalue),
+                           category=errorclass,
+                           stacklevel=2)
+             else:
+                 raise errorclass, errorvalue
+         return error_handler
  
      def create_connect_args(self, url):
          """ Return a tuple of *args,**kwargs for creating a connection.
@@@ -96,63 -95,5 +114,48 @@@
              except ValueError:
                  version.append(n)
          return tuple(version)
 -    
  
- 
-             
- def error_handler(connection, cursor, errorclass, errorvalue):
-     """
-     Adjust mxODBC's raised Warnings to emit Python standard warnings.
-     """
-     if issubclass(errorclass, MxOdbcWarning):
-         errorclass.__bases__ = (Warning,)
-         warnings.warn(message=str(errorvalue),
-                   category=errorclass,
-                   stacklevel=2)
-     else:
-         raise errorclass, errorvalue
- 
- 
 +
 +class MxNumeric(sqltypes.Numeric):
 +    """
 +    Handle Numeric types between SQLAlchemy and mxODBC.
 +    """
 +    def bind_processor(self, dialect):
 +        """
 +        SQLAlchemy can accept a Python Decimal for bind
 +        variables, so no special bind_processor is needed.
 +        """
 +        return None
 +
 +    def result_processor(self, dialect, coltype):
 +        """
 +        For cases when a 
 +        """
 +        if self.asdecimal:
 +            return None
 +        else:
 +            return processors.to_float
 +
 +
 +class MxFloat(sqltypes.Float):
 +    """
 +    Handle Numeric types between SQLAlchemy and mxODBC.
 +    """
 +    def bind_processor(self, dialect):
 +        """
 +        SQLAlchemy can accept a Python Decimal for bind
 +        variables, so no special bind_processor is needed.
 +        """
 +        return None
 +
 +    def result_processor(self, dialect, coltype):
 +        """
 +        mxODBC returns Python float values for REAL, FLOAT, and
 +        DOUBLE column types.
 +        """
 +        if self.asdecimal:
 +            return processors.to_decimal_processor_factory(Decimal)
 +        else:
 +            return None
 +
 +        

diff --cc lib/sqlalchemy/dialects/mssql/mxodbc.py
index 00a684a2aab442d29957b37a19876f31537bf923,59cf65d63e06a43694fdefcded5ca494819b918e..2ff2f39f744b759966ac88481f749aa4e57eeeb1
--- 1/lib/sqlalchemy/dialects/mssql/mxodbc.py
--- 2/lib/sqlalchemy/dialects/mssql/mxodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/mxodbc.py
@@@ -2,12 -2,12 +2,13 @@@ import r
  import sys
  
  from sqlalchemy import types as sqltypes
 -from sqlalchemy.connectors.mxodbc import MxODBCConnector
 +from sqlalchemy import util
 +from sqlalchemy.connectors.mxodbc import MxODBCConnector, MxNumeric, MxFloat
  from sqlalchemy.dialects.mssql.pyodbc import MSExecutionContext_pyodbc
- from sqlalchemy.dialects.mssql.base import MSExecutionContext, MSDialect
- 
+ from sqlalchemy.dialects.mssql.base import MSExecutionContext, MSDialect, \
+                                             MSSQLCompiler, MSSQLStrictCompiler
  
+         
  class MSExecutionContext_mxodbc(MSExecutionContext_pyodbc):
      """
      The pyodbc execution context is useful for enabling
@@@ -19,17 -19,13 +20,22 @@@
      #       won't work.
  
  class MSDialect_mxodbc(MxODBCConnector, MSDialect):
 -
 -    execution_ctx_cls = MSExecutionContext_mxodbc
+     
+     # TODO: may want to use this only if FreeTDS is not in use,
+     # since FreeTDS doesn't seem to use native binds.
+     statement_compiler = MSSQLStrictCompiler
 +
 +    execution_ctx_cls = MSExecutionContext_mxodbc
 +    colspecs = util.update_copy(
 +        MSDialect.colspecs,
 +        {
 +        sqltypes.Numeric : MxNumeric,
 +        sqltypes.Float : MxFloat
 +        },
 +    )
 +
+     
 +
      def __init__(self, description_encoding='latin-1', **params):
          super(MSDialect_mxodbc, self).__init__(**params)
          self.description_encoding = description_encoding

diff --cc test/dialect/test_mssql.py
Simple merge

diff --cc test/sql/test_query.py
index aacc99435f76ba44a9a6c5478f456ba11398625c,8664ba6dcbe93e345be46159cc699c6c3de7de7f..7685d098507af2bf43b9366a62a6d040b4d18e32
--- 1/test/sql/test_query.py
--- 2/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@@ -771,16 -772,19 +776,23 @@@ 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', "kinterbasdb doesn't send full type information")
+     @testing.fails_on('firebird', "uses sql-92 rules")
+     @testing.fails_on('sybase', "uses sql-92 rules")
      @testing.fails_if(lambda: 
                           testing.against('mssql+pyodbc') and not testing.db.dialect.freetds,
-                          "not supported by Windows ODBC driver")
+                          "uses sql-92 rules")
      def test_bind_in(self):
+         """test calling IN against a bind parameter.
+         
+         this isn't allowed on several platforms since we
+         generate ? = ?.
+         
+         """
          users.insert().execute(user_id = 7, user_name = 'jack')
          users.insert().execute(user_id = 8, user_name = 'fred')
          users.insert().execute(user_id = 9, user_name = None)