- 0.6.6 Upstream release

.gitignore

@@ -2,3 +2,4 @@ SQLAlchemy-0.6.1.tar.gz
 /SQLAlchemy-0.6.3.tar.gz
 /SQLAlchemy-0.6.4.tar.gz
 /SQLAlchemy-0.6.5.tar.gz
+/SQLAlchemy-0.6.6.tar.gz

python-sqlalchemy-unittest-order.patch

@@ -1,67 +0,0 @@
-Index: SQLAlchemy-0.6.5/test/orm/test_eager_relations.py
-===================================================================
---- SQLAlchemy-0.6.5.orig/test/orm/test_eager_relations.py
-+++ SQLAlchemy-0.6.5/test/orm/test_eager_relations.py
-@@ -610,7 +610,7 @@ class EagerTest(_fixtures.FixtureTest, t
-         sel = sa.select([users, addresses.c.email_address],
-                         users.c.id==addresses.c.user_id).alias('useralias')
-         mapper(User, sel, properties={
--            'orders':relationship(Order, primaryjoin=sel.c.id==orders.c.user_id, lazy='joined')
-+            'orders':relationship(Order, primaryjoin=sel.c.id==orders.c.user_id, lazy='joined', order_by=orders.c.id)
-         })
-         mapper(Order, orders)
- 
-Index: SQLAlchemy-0.6.5/test/orm/test_expire.py
-===================================================================
---- SQLAlchemy-0.6.5.orig/test/orm/test_expire.py
-+++ SQLAlchemy-0.6.5/test/orm/test_expire.py
-@@ -732,7 +732,7 @@ class ExpireTest(_fixtures.FixtureTest):
-     @testing.resolve_artifact_names
-     def test_expire_all(self):
-         mapper(User, users, properties={
--            'addresses':relationship(Address, backref='user', lazy='joined'),
-+            'addresses':relationship(Address, backref='user', lazy='joined', order_by=addresses.c.id),
-             })
-         mapper(Address, addresses)
- 
-Index: SQLAlchemy-0.6.5/test/orm/test_mapper.py
-===================================================================
---- SQLAlchemy-0.6.5.orig/test/orm/test_mapper.py
-+++ SQLAlchemy-0.6.5/test/orm/test_mapper.py
-@@ -1319,7 +1319,7 @@ class OptionsTest(_fixtures.FixtureTest)
-     def test_eager_degrade(self):
-         """An eager relationship automatically degrades to a lazy relationship if eager columns are not available"""
-         mapper(User, users, properties=dict(
--            addresses = relationship(mapper(Address, addresses), lazy='joined')))
-+            addresses = relationship(mapper(Address, addresses), lazy='joined', order_by=addresses.c.id)))
- 
-         sess = create_session()
-         # first test straight eager load, 1 statement
-Index: SQLAlchemy-0.6.5/test/orm/test_query.py
-===================================================================
---- SQLAlchemy-0.6.5.orig/test/orm/test_query.py
-+++ SQLAlchemy-0.6.5/test/orm/test_query.py
-@@ -2739,12 +2739,12 @@ class InstancesTest(QueryTest, AssertsCo
-         sess = create_session()
- 
-         # test that contains_eager suppresses the normal outer join rendering
--        q = sess.query(User).outerjoin(User.addresses).options(contains_eager(User.addresses)).order_by(User.id)
-+        q = sess.query(User).outerjoin(User.addresses).options(contains_eager(User.addresses)).order_by(User.id, addresses.c.id)
-         self.assert_compile(q.with_labels().statement, 
-             "SELECT addresses.id AS addresses_id, addresses.user_id AS addresses_user_id, "\
-             "addresses.email_address AS addresses_email_address, users.id AS users_id, "\
-             "users.name AS users_name FROM users LEFT OUTER JOIN addresses "\
--            "ON users.id = addresses.user_id ORDER BY users.id"
-+            "ON users.id = addresses.user_id ORDER BY users.id, addresses.id"
-             , dialect=default.DefaultDialect())
-                 
-         def go():
-@@ -2753,7 +2753,7 @@ class InstancesTest(QueryTest, AssertsCo
-         sess.expunge_all()
- 
-         adalias = addresses.alias()
--        q = sess.query(User).select_from(users.outerjoin(adalias)).options(contains_eager(User.addresses, alias=adalias))
-+        q = sess.query(User).select_from(users.outerjoin(adalias)).options(contains_eager(User.addresses, alias=adalias)).order_by(User.id, adalias.c.id)
-         def go():
-             eq_(self.static.user_address_result, q.order_by(User.id).all())
-         self.assert_sql_count(testing.db, go, 1)

python-sqlalchemy.spec

@@ -10,7 +10,7 @@
 %global srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.6.5
+Version:        0.6.6
 Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
@@ -19,7 +19,6 @@ License:        MIT
 URL:            http://www.sqlalchemy.org/
 Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 # Submitted upstream: http://www.sqlalchemy.org/trac/ticket/1888
-Patch0:         python-sqlalchemy-unittest-order.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel
@@ -74,7 +73,6 @@ This package includes the python 3 version of the module.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .order
 
 sed -i 's/\r//' examples/dynamic_dict/dynamic_dict.py
 
@@ -142,6 +140,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Mon Jan 17 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.6-1
+- 0.6.6 Upstream release
+
 * Fri Dec 3 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-1
 - 0.6.5 Upstream release
 

sources

@@ -1 +1 @@
-a64f3d3115285d50ec52349e5e8e0214  SQLAlchemy-0.6.5.tar.gz
+359f02242c52e92aa881c36c8e3720d8  SQLAlchemy-0.6.6.tar.gz