summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--lib/sqlalchemy/databases/mysql.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 9f72facd3..9df40b9b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,10 @@
- auto_setinputsizes defaults to True for Oracle, fixed cases where
it improperly propigated bad types.
+- mysql:
+ - added a catchall **kwargs to MSString, to help reflection of
+ obscure types (like "varchar() binary" in MS 4.0)
+
- orm:
- the full featureset of the SelectResults extension has been merged
into a new set of methods available off of Query. These methods
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 1cb41cf76..2df16c361 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -154,7 +154,7 @@ class MSLongText(MSText):
return "LONGTEXT"
class MSString(sqltypes.String):
- def __init__(self, length=None, *extra):
+ def __init__(self, length=None, *extra, **kwargs):
sqltypes.String.__init__(self, length=length)
def get_col_spec(self):
return "VARCHAR(%(length)s)" % {'length' : self.length}