From: Petr Viktorin Date: Sun, 3 Apr 2011 16:42:46 +0000 (+0300) Subject: Enable nullable MarkdownColumns X-Git-Tag: veekun-promotions/2011041101~8^2~5 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/93be19674c4072725be9aa4eac890931c8b0e294 Enable nullable MarkdownColumns --- diff --git a/pokedex/db/markdown.py b/pokedex/db/markdown.py index 616830a..257c8de 100644 --- a/pokedex/db/markdown.py +++ b/pokedex/db/markdown.py @@ -106,6 +106,9 @@ class MarkdownColumn(sqlalchemy.types.TypeDecorator): impl = sqlalchemy.types.Unicode def process_bind_param(self, value, dialect): + if value is None: + return None + if not isinstance(value, basestring): # Can't assign, e.g., MarkdownString objects yet raise NotImplementedError @@ -113,4 +116,7 @@ class MarkdownColumn(sqlalchemy.types.TypeDecorator): return unicode(value) def process_result_value(self, value, dialect): + if value is None: + return None + return MarkdownString(value)