Author: phd
Date: 2006-01-23 08:33:18 -0700 (Mon, 23 Jan 2006)
New Revision: 1533
Added:
home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py
Removed:
home/phd/SQLObject/paramstyles/sqlobject/tests/test_selectBy_foreignKey.py
Log:
Merged patches from the revisions 1531:1532 from the trunk
Copied: home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py (from rev 1532, SQLObject/trunk/sqlobject/tests/test_foreignKey.py)
Deleted: home/phd/SQLObject/paramstyles/sqlobject/tests/test_selectBy_foreignKey.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_selectBy_foreignKey.py 2006-01-23 15:32:28 UTC (rev 1532)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_selectBy_foreignKey.py 2006-01-23 15:33:18 UTC (rev 1533)
@@ -1,33 +0,0 @@
-from sqlobject import *
-from sqlobject.tests.dbtest import *
-
-class TestComposerKey(SQLObject):
- name = StringCol()
-
-class TestWorkKey(SQLObject):
- class sqlmeta:
- idName = "work_id"
-
- composer = ForeignKey('TestComposerKey')
- title = StringCol()
-
-def test1():
- setupClass([TestComposerKey,
- TestWorkKey])
-
- c = TestComposerKey(name='Mahler, Gustav')
- w1 = TestWorkKey(composer=c, title='Symphony No. 9')
- w2 = TestWorkKey(composer=None, title=None)
-
- # Select by usual way
- s = TestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
- assert s[0]==w1
- # selectBy object
- s = TestWorkKey.selectBy(composer=c, title='Symphony No. 9')
- assert s[0]==w1
- # selectBy id
- s = TestWorkKey.selectBy(id=w1.id)
- assert s[0]==w1
- # is None handled correctly?
- s = TestWorkKey.selectBy(composer=None, title=None)
- assert s[0]==w2
|
