Changes some relationships in test and example models from one-to-man…

…y to many-to-one. This fixes an issue with version 0.8.0b2 or greater of SQLAlchemy.
jfinkels · Jan 16, 2013 · 995754a · 995754a
1 parent f88d5d8
commit 995754a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/CHANGES b/CHANGES
@@ -13,6 +13,9 @@ Version 0.9.0-dev
 
 Not yet released.
 
+- Changes some dynamically loaded relationships used for testing and in
+  examples to be many-to-one instead of the incorrect one-to-many. Versions of
+  SQLAlchemy after 0.8.0b2 raise an exception when the latter is used.
 - Fixed issue #117: allow adding related instances on :http:method:`patch`
   requests for one-to-one relationships.
 - Fixed issue #114: fix bug where string representations of integers were

diff --git a/examples/quickstart.py b/examples/quickstart.py
@@ -18,16 +18,16 @@ class Person(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode, unique=True)
     birth_date = db.Column(db.Date)
-    computers = db.relationship('Computer', backref=db.backref('owner',
-                                                               lazy='dynamic'))
 
 
 class Computer(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode, unique=True)
     vendor = db.Column(db.Unicode)
-    owner_id = db.Column(db.Integer, db.ForeignKey('person.id'))
     purchase_time = db.Column(db.DateTime)
+    owner_id = db.Column(db.Integer, db.ForeignKey('person.id'))
+    owner = db.relationship('Person', backref=db.backref('computers',
+                                                         lazy='dynamic'))
 
 
 # Create the database tables.

diff --git a/examples/separate_endpoints.py b/examples/separate_endpoints.py
@@ -33,16 +33,16 @@ class Person(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode, unique=True)
     birth_date = db.Column(db.Date)
-    computers = db.relationship('Computer', backref=db.backref('owner',
-                                                               lazy='dynamic'))
 
 
 class Computer(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.Unicode, unique=True)
     vendor = db.Column(db.Unicode)
-    owner_id = db.Column(db.Integer, db.ForeignKey('person.id'))
     purchase_time = db.Column(db.DateTime)
+    owner_id = db.Column(db.Integer, db.ForeignKey('person.id'))
+    owner = db.relationship('Person', backref=db.backref('computers',
+                                                         lazy='dynamic'))
 
 
 # Create the database tables.

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -97,13 +97,13 @@ class LazyComputer(self.Base):
             id = Column(Integer, primary_key=True)
             name = Column(Unicode)
             ownerid = Column(Integer, ForeignKey('lazyperson.id'))
+            owner = relationship('LazyPerson',
+                                 backref=backref('computers', lazy='dynamic'))
 
         class LazyPerson(self.Base):
             __tablename__ = 'lazyperson'
             id = Column(Integer, primary_key=True)
             name = Column(Unicode)
-            computers = relationship('LazyComputer',
-                                     backref=backref('owner', lazy='dynamic'))
 
         class Planet(self.Base):
             __tablename__ = 'planet'

diff --git a/tests/test_manager.py b/tests/test_manager.py
@@ -436,16 +436,17 @@ class Computer(db.Model):
             vendor = db.Column(db.Unicode)
             buy_date = db.Column(db.DateTime)
             owner_id = db.Column(db.Integer, db.ForeignKey('person.id'))
+            owner = db.relationship('Person',
+                                    backref=db.backref('computers',
+                                                       lazy='dynamic'))
 
         class Person(db.Model):
             id = db.Column(db.Integer, primary_key=True)
             name = db.Column(db.Unicode, unique=True)
             age = db.Column(db.Float)
             other = db.Column(db.Float)
             birth_date = db.Column(db.Date)
-            computers = db.relationship('Computer',
-                                        backref=db.backref('owner',
-                                                           lazy='dynamic'))
+
         self.Person = Person
         self.Computer = Computer