From: Eevee Date: Thu, 26 Mar 2009 00:43:09 +0000 (-0400) Subject: Fixed CSV import's handling of Boolean columns. X-Git-Tag: veekun-promotions/2010050901~275 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a32cc0828fd9e5ea1529dbd66e0a9e76f72dddcc?hp=1c7cf9144f77ec3d4a30f9de880b96217cab46d2 Fixed CSV import's handling of Boolean columns. --- diff --git a/pokedex/__init__.py b/pokedex/__init__.py index 2932504..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(): @@ -49,9 +51,17 @@ def csvimport(engine_uri, dir='.'): row = table() for column_name, value in zip(column_names, csvs): - if table.__table__.c[column_name].nullable and value == '': + 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')