Add default __repr__ for Model class

flask_sqlalchemy/__init__.py

@@ -663,9 +663,8 @@ class Model(object):
     query = None
 
     def __repr__(self):
-        pks = inspect(self).identity_key[1]
-        pretty_pk = pks[0] if len(pks) == 1 else ', '.join(map(str, pks))
-        return '<{0}({1})>'.format(type(self).__name__, pretty_pk)
+        pk = ', '.join(str(value) for value in inspect(self).identity)
+        return '<{0} {1}>'.format(self.__class__.__name__, pk)
 
 
 class SQLAlchemy(object):

tests/test_model_class.py

@@ -13,15 +13,24 @@ class SomeModel(db.Model):
     assert isinstance(SomeModel(), CustomModelClass)
 
 
-def test_default_repr_works_when_no_override(app):
-    class CustomModelClass(fsa.Model):
-        pass
-
-    db = fsa.SQLAlchemy(app, model_class=CustomModelClass)
-
-    class SomeModel(db.Model):
-        id = db.Column(db.Integer, primary_key=True)
-
-    instance = SomeModel()
-
-    assert instance.__repr__, "<SomeModel({})>".format(instance.pk)
+def test_repr(db):
+    class User(db.Model):
+        name = db.Column(db.String, primary_key=True)
+
+    class Report(db.Model):
+        id = db.Column(db.Integer, primary_key=True, autoincrement=False)
+        user_name = db.Column(db.ForeignKey(User.name), primary_key=True)
+
+    db.create_all()
+
+    u = User(name='test')
+    db.session.add(u)
+    db.session.flush()
+    assert repr(u) == '<User test>'
+    assert repr(u) == str(u)
+
+    r = Report(id=2, user_name=u.name)
+    db.session.add(r)
+    db.session.flush()
+    assert repr(r) == '<Report 2, test>'
+    assert repr(u) == str(u)