summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrbald <mrbald@users.noreply.github.com>2016-04-22 13:52:47 +0100
committermrbald <mrbald@users.noreply.github.com>2016-04-22 13:52:47 +0100
commit60744582c4cdcb1339322689e437dc4b8ca02525 (patch)
treed81a331e5bd386432b8cf926ccb2ae6778e5b2ae
parent1f3e5d9826fe989f2212745f6b3592b2ef9b5e32 (diff)
downloadsqlalchemy-pr/261.tar.gz
make check for None more restrictivepr/261
Exception on session.commit() from `ClauseElement.__bool__` when adding an object with field where `server_default` is set to `text('some sql code')`
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 06d903e9c..19832779f 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1990,7 +1990,7 @@ class Mapper(InspectionAttr):
frozenset(
col.key for col in columns
if not col.primary_key and
- not col.server_default and not col.default
+ col.server_default is None and col.default is None
and not col.type.should_evaluate_none)
)
for table, columns in self._cols_by_table.items()