Added Python versions of stat formulae.

[zzz-pokedex.git] / pokedex / __init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 138c58b..2932504 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -27,6 +27,12 @@ def csvimport(engine_uri, dir='.'):
 
     metadata.create_all()
 
+    # Oh, mysql-chan.
+    # TODO try to insert data in preorder so we don't need this hack and won't
+    #      break similarly on other engines
+    if 'mysql' in engine_uri:
+        session.execute('SET FOREIGN_KEY_CHECKS = 0')
+
     # This is a secret attribute on a secret singleton of a secret class that
     # appears to hopefully contain all registered classes as keys.
     # There is no other way to accomplish this, as far as I can tell.
@@ -37,19 +43,30 @@ 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)
 
         session.commit()
 
+    # Shouldn't matter since this is usually the end of the program and thus
+    # the connection too, but let's change this back just in case
+    if 'mysql' in engine_uri:
+        session.execute('SET FOREIGN_KEY_CHECKS = 1')
+
 
 def csvexport(engine_uri, dir='.'):
     import csv