From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 18 Aug 2006 00:49:57 +0000 (+0000)
Subject: more fixes for [ticket:269], added MSMediumBlob type
X-Git-Tag: rel_0_2_8~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd04cffad83848e3edc5cb51c51ca6232270477a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

more fixes for [ticket:269], added MSMediumBlob type
---

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 14e26438f2..be704ef2a8 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -34,7 +34,7 @@ class MSDecimal(MSNumeric):
     def get_col_spec(self):
         if self.precision is not None and self.length is not None:
             return kw_colspec(self, "DECIMAL(%(precision)s, %(length)s)" % {'precision': self.precision, 'length' : self.length})
-class MSDouble(sqltypes.Numeric):
+class MSDouble(MSNumeric):
     def __init__(self, precision=10, length=2, **kw):
         if (precision is None and length is not None) or (precision is not None and length is None):
             raise exceptions.ArgumentError("You must specify both precision and length or omit both altogether.")
@@ -60,28 +60,28 @@ class MSFloat(sqltypes.Float):
             return kw_colspec(self, "FLOAT(%(precision)s)" % {'precision': self.precision})
         else:
             return kw_colspec(self, "FLOAT")
-class MSBigInteger(sqltypes.Integer):
+class MSInteger(sqltypes.Integer):
     def __init__(self, length=None, **kw):
         self.length = length
         self.unsigned = 'unsigned' in kw
         self.zerofill = 'zerofill' in kw
-        super(MSBigInteger, self).__init__()
+        super(MSInteger, self).__init__()
     def get_col_spec(self):
         if self.length is not None:
-            return kw_colspec(self, "BIGINT(%(length)s)" % {'length': self.length})
+            return kw_colspec(self, "INTEGER(%(length)s)" % {'length': self.length})
         else:
-            return kw_colspec(self, "BIGINT")
-class MSInteger(sqltypes.Integer):
+            return kw_colspec(self, "INTEGER")
+class MSBigInteger(MSInteger):
     def __init__(self, length=None, **kw):
         self.length = length
         self.unsigned = 'unsigned' in kw
         self.zerofill = 'zerofill' in kw
-        super(MSInteger, self).__init__()
+        super(MSBigInteger, self).__init__()
     def get_col_spec(self):
         if self.length is not None:
-            return kw_colspec(self, "INTEGER(%(length)s)" % {'length': self.length})
+            return kw_colspec(self, "BIGINT(%(length)s)" % {'length': self.length})
         else:
-            return kw_colspec(self, "INTEGER")
+            return kw_colspec(self, "BIGINT")
 class MSSmallInteger(sqltypes.Smallinteger):
     def __init__(self, length=None, **kw):
         self.length = length
@@ -153,7 +153,12 @@ class MSBinary(sqltypes.Binary):
             return None
         else:
             return buffer(value)
-class MSEnum(sqltypes.String):
+
+class MSMediumBlob(MSBinary):
+    def get_col_spec(self):
+        return "MEDIUMBLOB"
+            
+class MSEnum(MSString):
     def __init__(self, *enums):
         self.__enums_hidden = enums
         length = 0
diff --git a/test/engine/reflection.py b/test/engine/reflection.py
index da6943d5d4..dd8a52a9a2 100644
--- a/test/engine/reflection.py
+++ b/test/engine/reflection.py
@@ -103,7 +103,12 @@ class ReflectionTest(PersistTest):
             Column('id', Integer, primary_key=True),
             Column('num1', mysql.MSInteger(unsigned=True)),
             Column('text1', mysql.MSLongText),
-            Column('text2', mysql.MSLongText())
+            Column('text2', mysql.MSLongText()),
+             Column('num2', mysql.MSBigInteger),
+             Column('num3', mysql.MSBigInteger()),
+             Column('num4', mysql.MSDouble),
+             Column('num5', mysql.MSDouble()),
+             Column('enum1', mysql.MSEnum('"black"', '"white"')),
             )
         try:
             table.create(checkfirst=True)
@@ -113,6 +118,11 @@ class ReflectionTest(PersistTest):
             assert t2.c.num1.type.unsigned
             assert isinstance(t2.c.text1.type, mysql.MSLongText)
             assert isinstance(t2.c.text2.type, mysql.MSLongText)
+            assert isinstance(t2.c.num2.type, mysql.MSBigInteger)
+            assert isinstance(t2.c.num3.type, mysql.MSBigInteger)
+            assert isinstance(t2.c.num4.type, mysql.MSDouble)
+            assert isinstance(t2.c.num5.type, mysql.MSDouble)
+            assert isinstance(t2.c.enum1.type, mysql.MSEnum)
             t2.drop()
             t2.create()
         finally: