Merge branch 'db-session-is-none' of git://github.com/timheap/wtforms-sqlalchemy

Author: mlenzen

.travis.yml

@@ -12,15 +12,19 @@ python:
 
 env:
   global:
-    - WTFORMS="<=2.2.1"
+    - WTFORMS="<3"
   matrix:
-    - SQLALCHEMY=1.2.9
-    - SQLALCHEMY=1.3.5
+    - SQLALCHEMY="==0.7.10"
+    - SQLALCHEMY="~=0.8.6"
+    - SQLALCHEMY="==0.8.6" WTFORMS="==1.0.5"
+    - SQLALCHEMY="~=0.9.6"
+    - SQLALCHEMY="==0.9.8" WTFORMS="==1.0.5"
+    - SQLALCHEMY=""
 
 
 # command to install dependencies
 install:
-  - "pip install WTForms$WTFORMS SQLAlchemy==$SQLALCHEMY"
+  - "pip install WTForms$WTFORMS SQLAlchemy$SQLALCHEMY"
   - "pip install ."
   - "pip install -r tests/requirements.txt"
 

wtforms_sqlalchemy/orm.py

@@ -67,7 +67,7 @@ def get_converter(self, column):
             if col_type.__name__ in self.converters:
                 return self.converters[col_type.__name__]
 
-        raise ModelConversionError('Could not find field converter for column %s (%r).' % (column.name, types[0]))
+        raise ModelConversionError('Could not find field converter for %s (%r).' % (column.key, types[0]))
 
     def convert(self, model, mapper, prop, field_args, db_session=None):
         if not hasattr(prop, 'columns') and not hasattr(prop, 'direction'):
@@ -120,7 +120,7 @@ def convert(self, model, mapper, prop, field_args, db_session=None):
             converter = self.get_converter(column)
         else:
             # We have a property with a direction.
-            if not db_session:
+            if db_session is None:
                 raise ModelConversionError("Cannot convert field %s, need DB session." % prop.key)
 
             foreign_model = prop.mapper.class_
@@ -195,7 +195,7 @@ def handle_decimal_types(self, column, field_args, **extra):
         field_args.setdefault('places', None)
         return wtforms_fields.DecimalField(**field_args)
 
-    @converts('dialects.mysql.types.YEAR')
+    @converts('dialects.mysql.types.YEAR', 'dialects.mysql.base.YEAR')
     def conv_MSYear(self, field_args, **extra):
         field_args['validators'].append(validators.NumberRange(min=1901, max=2155))
         return wtforms_fields.StringField(**field_args)