From: Mike Bayer Date: Thu, 31 Jul 2008 15:29:12 +0000 (+0000) Subject: - bump to 0.4.8 X-Git-Tag: rel_0_4_8~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b23213bc36986234749f80f606e47e3ef73c00aa;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - bump to 0.4.8 - removed unnecessary mini-py2.3 test suite --- diff --git a/VERSION b/VERSION index 82ddaf8b11..cb498ab2c8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.7p1 +0.4.8 diff --git a/test/py23/__init__.py b/test/py23/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/py23/alltests.py b/test/py23/alltests.py deleted file mode 100644 index 733b590b02..0000000000 --- a/test/py23/alltests.py +++ /dev/null @@ -1,19 +0,0 @@ -import unittest - - -def suite(): - modules_to_test = ( - 'py23.test_sql', - 'py23.test_orm', - ) - alltests = unittest.TestSuite() - for name in modules_to_test: - mod = __import__(name) - for token in name.split('.')[1:]: - mod = getattr(mod, token) - alltests.addTest(unittest.findTestCases(mod, suiteClass=None)) - return alltests - -if __name__ == '__main__': - runner = unittest.TextTestRunner() - runner.run(suite()) diff --git a/test/py23/test_orm.py b/test/py23/test_orm.py deleted file mode 100644 index cc5dbecc84..0000000000 --- a/test/py23/test_orm.py +++ /dev/null @@ -1,59 +0,0 @@ -import unittest -from sqlalchemy import * -from sqlalchemy.orm import * - -class ORMTest(unittest.TestCase): - def setUp(self): - global engine, users, addresses - engine = create_engine('sqlite://') - meta = MetaData(engine) - users = Table('users', meta, - Column('id', Integer, primary_key=True), - Column('name', String(255)) - ) - addresses = Table('addresses', meta, - Column('id', Integer, primary_key=True), - Column('email', String(255)), - Column('user_id', Integer, ForeignKey('users.id')) - ) - - meta.create_all() - - - def tearDown(self): - engine.dispose() - - def test_orm_roundtrip(self): - class User(object): - def __init__(self, name): - self.name = name - class Address(object): - def __init__(self, email): - self.email = email - - mapper(User, users, properties={ - 'addresses':relation(Address, backref='user', cascade="all, delete-orphan") - }) - mapper(Address, addresses) - - sess = sessionmaker()() - u1 = User('ed') - u2 = User('wendy') - u1.addresses.append(Address('ed@ed.com')) - u2.addresses.append(Address('wendy@wendy.com')) - sess.add_all([u1, u2]) - sess.commit() - - self.assertEquals(sess.query(User).order_by(User.name).all(), [u1, u2]) - - sess.clear() - u1 = sess.query(User).get(1) - self.assertEquals(u1.name, 'ed') - self.assertEquals(u1.addresses[0].email, 'ed@ed.com') - sess.delete(u1) - sess.commit() - self.assertEquals(sess.query(User).count(), 1) - - -if __name__ == '__main__': - unittest.main() diff --git a/test/py23/test_sql.py b/test/py23/test_sql.py deleted file mode 100644 index dbf72fe03f..0000000000 --- a/test/py23/test_sql.py +++ /dev/null @@ -1,36 +0,0 @@ -import unittest -from sqlalchemy import * - -class SQLTest(unittest.TestCase): - def setUp(self): - global engine - engine = create_engine('sqlite://') - - def tearDown(self): - engine.dispose() - - def test_select_roundtrip(self): - meta = MetaData(engine) - users = Table('users', meta, - Column('id', Integer, primary_key=True), - Column('name', String(255)) - ) - addresses = Table('addresses', meta, - Column('id', Integer, primary_key=True), - Column('email', String(255)), - Column('user_id', Integer, ForeignKey('users.id')) - ) - - meta.create_all() - users.insert().execute(id=1, name='ed') - users.insert().execute(id=2, name='wendy') - addresses.insert().execute(id=1, user_id=1, email='ed@foo.com') - addresses.insert().execute(id=2, user_id=2, email='wendy@foo.com') - self.assertEquals(users.join(addresses).select().execute().fetchall(), - [(1, 'ed', 1, 'ed@foo.com', 1), (2, 'wendy', 2, 'wendy@foo.com', 2)] - ) - - - -if __name__ == '__main__': - unittest.main()