Merge e641557 into 333f644

jfinkels · Jun 10, 2016 · f1bf3a9 · f1bf3a9
2 parents 333f644 + e641557
commit f1bf3a9
Show file tree

Hide file tree

Showing 3 changed files with 438 additions and 1 deletion.
diff --git a/flask_restless/serialization/serializers.py b/flask_restless/serialization/serializers.py
@@ -299,7 +299,7 @@ def _dump(self, instance, only=None):
                    if not c.startswith('__') and c not in COLUMN_BLACKLIST)
         # Exclude column names that are foreign keys.
         foreign_key_columns = foreign_keys(model)
-        columns = (c for c in columns if c not in foreign_key_columns)
+        columns = (c for c in columns if c not in foreign_key_columns or c == primary_key_for(model))
 
         # Create a dictionary mapping attribute name to attribute value for
         # this particular instance.

diff --git a/tests/test_polymorphism.py b/tests/test_polymorphism.py
@@ -24,6 +24,7 @@
 from sqlalchemy import Enum
 from sqlalchemy import Unicode
 
+
 from flask_restless import DefaultSerializer
 
 from .helpers import check_sole_error