From ac325b620d21f50b58d66cc1c69e2d81140e7472 Mon Sep 17 00:00:00 2001 From: Eevee Date: Sun, 8 Mar 2009 21:34:48 -0400 Subject: [PATCH] CSV import now respects NULLability of columns. Empty strings loaded into NULL columns are changed to NULL instead. --- pokedex/__init__.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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)