X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/e436aa7bfeb905899777318818ac9c51c1917593..27d9bff9efa64b28ecb3803a7ff7e49fb04f8e75:/pokedex/__init__.py?ds=inline

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 17e982d..d60224e 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -1,6 +1,8 @@
 # encoding: utf8
 import sys
 
+import sqlalchemy.types
+
 from .db import connect, metadata
 
 def main():
@@ -43,14 +45,28 @@ 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):
+                column = table.__table__.c[column_name]
+                if column.nullable and value == '':
+                    # Empty string in a nullable column really means NULL
+                    value = None
+                elif isinstance(column.type, sqlalchemy.types.Boolean):
+                    # Boolean values are stored as string values 0/1, but both
+                    # of those evaluate as true; SQLA wants True/False
+                    if value == '0':
+                        value = False
+                    else:
+                        value = True
+                else:
+                    # Otherwise, unflatten from bytes
+                    value = value.decode('utf-8')
+
+                setattr(row, column_name, value)
 
             session.add(row)