- types.Binary is renamed to types.LargeBinary, it only

produces BLOB, BYTEA, or a similar "long binary" type.
New base BINARY and VARBINARY
types have been added to access these MySQL/MS-SQL specific
types in an agnostic way [ticket:1664].

5 files changed, 16 insertions, 17 deletions

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index 4a4197725..09213cf95 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -817,11 +817,10 @@ class ReflectionTest(TestBase, AssertsExecutionResults):
                  ( mysql.MSSmallInteger(4), mysql.MSSmallInteger(4), ),
                  ( mysql.MSMediumInteger(), mysql.MSMediumInteger(), ),
                  ( mysql.MSMediumInteger(8), mysql.MSMediumInteger(8), ),
-                 ( Binary(3), mysql.TINYBLOB(), ),
-                 ( Binary(), mysql.BLOB() ),
+                 ( LargeBinary(3), mysql.TINYBLOB(), ),
+                 ( LargeBinary(), mysql.BLOB() ),
                  ( mysql.MSBinary(3), mysql.MSBinary(3), ),
                  ( mysql.MSVarBinary(3),),
-                 ( mysql.MSVarBinary(), mysql.MSBlob()),
                  ( mysql.MSTinyBlob(),),
                  ( mysql.MSBlob(),),
                  ( mysql.MSBlob(1234), mysql.MSBlob()),
@@ -1081,7 +1080,7 @@ class SQLTest(TestBase, AssertsCompiledSQL):
             (m.MSNChar, "CAST(t.col AS CHAR)"),
             (m.MSNVarChar, "CAST(t.col AS CHAR)"),
 
-            (Binary, "CAST(t.col AS BINARY)"),
+            (LargeBinary, "CAST(t.col AS BINARY)"),
             (BLOB, "CAST(t.col AS BINARY)"),
             (m.MSBlob, "CAST(t.col AS BINARY)"),
             (m.MSBlob(32), "CAST(t.col AS BINARY)"),
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index bc2c896ab..95f985db3 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -32,9 +32,9 @@ class ReflectionTest(TestBase, ComparesTables):
                    sa.ForeignKey('engine_users.user_id')),
             Column('test6', sa.Date, nullable=False),
             Column('test7', sa.Text),
-            Column('test8', sa.Binary),
+            Column('test8', sa.LargeBinary),
             Column('test_passivedefault2', sa.Integer, server_default='5'),
-            Column('test9', sa.Binary(100)),
+            Column('test9', sa.LargeBinary(100)),
             Column('test10', sa.Numeric(10, 2)),
             test_needs_fk=True,
         )
@@ -951,9 +951,9 @@ def createTables(meta, schema=None):
         parent_user_id,
         Column('test6', sa.Date, nullable=False),
         Column('test7', sa.Text),
-        Column('test8', sa.Binary),
+        Column('test8', sa.LargeBinary),
         Column('test_passivedefault2', sa.Integer, server_default='5'),
-        Column('test9', sa.Binary(100)),
+        Column('test9', sa.LargeBinary(100)),
         Column('test10', sa.Numeric(10, 2)),
         schema=schema,
         test_needs_fk=True,
@@ -1083,7 +1083,7 @@ class ComponentReflectionTest(TestBase):
                             ).intersection(ctype_def.__mro__)
                             .intersection([sql_types.Integer, sql_types.Numeric, 
                                             sql_types.DateTime, sql_types.Date, sql_types.Time, 
-                                            sql_types.String, sql_types.Binary])
+                                            sql_types.String, sql_types._Binary])
                             ) > 0
                     ,("%s(%s), %s(%s)" % (col.name, col.type, cols[i]['name'],
                                           ctype)))
diff --git a/test/orm/inheritance/test_productspec.py b/test/orm/inheritance/test_productspec.py
index 4c593e2a3..deb7564a8 100644
--- a/test/orm/inheritance/test_productspec.py
+++ b/test/orm/inheritance/test_productspec.py
@@ -37,7 +37,7 @@ class InheritTest(_base.MappedTest):
             Column('last_updated', DateTime, default=lambda:datetime.now(),
                 onupdate=lambda:datetime.now()),
             Column('name', String(128)),
-            Column('data', Binary),
+            Column('data', LargeBinary),
             Column('size', Integer, default=0),
             )
 
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 85a0eae82..265ce3fc0 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -337,7 +337,7 @@ class BinaryHistTest(_base.MappedTest, testing.AssertsExecutionResults):
     def define_tables(cls, metadata):
         Table('t1', metadata,
             Column('id', sa.Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('data', sa.Binary),
+            Column('data', sa.LargeBinary),
         )
 
     @classmethod
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index b31015d85..4b7cba73c 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -63,9 +63,9 @@ class TypeAffinityTest(TestBase):
             (Integer(), Integer(), True),
             (Text(), String(), True),
             (Text(), Unicode(), True),
-            (Binary(), Integer(), False),
-            (Binary(), PickleType(), True),
-            (PickleType(), Binary(), True),
+            (LargeBinary(), Integer(), False),
+            (LargeBinary(), PickleType(), True),
+            (PickleType(), LargeBinary(), True),
             (PickleType(), PickleType(), True),
         ]:
             eq_(t1._compare_type_affinity(t2), comp, "%s %s" % (t1, t2))
@@ -466,8 +466,8 @@ class BinaryTest(TestBase, AssertsExecutionResults):
 
         binary_table = Table('binary_table', MetaData(testing.db),
             Column('primary_id', Integer, Sequence('binary_id_seq', optional=True), primary_key=True),
-            Column('data', Binary),
-            Column('data_slice', Binary(100)),
+            Column('data', LargeBinary),
+            Column('data_slice', LargeBinary(100)),
             Column('misc', String(30)),
             # construct PickleType with non-native pickle module, since cPickle uses relative module
             # loading and confuses this test's parent package 'sql' with the 'sqlalchemy.sql' package relative
@@ -516,7 +516,7 @@ class BinaryTest(TestBase, AssertsExecutionResults):
             binary_table.select(order_by=binary_table.c.primary_id),
             text(
                 "select * from binary_table order by binary_table.primary_id", 
-                typemap={'pickled':PickleType, 'mypickle':MyPickleType, 'data':Binary, 'data_slice':Binary}, 
+                typemap={'pickled':PickleType, 'mypickle':MyPickleType, 'data':LargeBinary, 'data_slice':LargeBinary}, 
                 bind=testing.db)
         ):
             l = stmt.execute().fetchall()