X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/e436aa7bfeb905899777318818ac9c51c1917593..b6f30bf22db8ef0cfc13ed4fbbd1d88c4ec67e17:/pokedex/__init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 17e982d..2932504 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -43,14 +43,20 @@ def csvimport(engine_uri, dir='.'):
         print table_name
 
         reader = csv.reader(open("%s/%s.csv" % (dir, table_name), 'rb'), lineterminator='\n')
-        columns = [unicode(column) for column in reader.next()]
+        column_names = [unicode(column) for column in reader.next()]
 
         for csvs in reader:
             row = table()
 
-            for column, value in zip(columns, csvs):
-                value = value.decode('utf-8')
-                setattr(row, column, value)
+            for column_name, value in zip(column_names, csvs):
+                if table.__table__.c[column_name].nullable and value == '':
+                    # Empty string in a nullable column really means NULL
+                    value = None
+                else:
+                    # Otherwise, unflatten from bytes
+                    value = value.decode('utf-8')
+
+                setattr(row, column_name, value)
 
             session.add(row)