[Checkins] SVN: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/ Tests passing with 0.4.1, moved version dependency from setup.py to buildout.cfg, added note to CHANGES.txt

[Darryl Cousins]

Log message for revision 82085:
  Tests passing with 0.4.1, moved version dependency from setup.py to buildout.cfg, added note to CHANGES.txt

Changed:
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/CHANGES.txt
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/buildout.cfg
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/setup.py
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/README.txt
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/container.py
  U   z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/tests/TRANSACTION.txt

-=-
Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/CHANGES.txt
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/CHANGES.txt	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/CHANGES.txt	2007-12-03 00:01:41 UTC (rev 82085)
@@ -20,7 +20,14 @@
     before registering an (unnamed) engine utility first. Doing so will raise
     a ValueError.
 
+[darrylcousins 3/12/07]
 
+  - In fact with 0.4.1 we do still need to call `session.save(obj)` - README
+    doctest changed to do so and pass tests.
+  - TRANSACTION doctest error raised has changed from SQLError to IntegrityError
+  - container.py `select()` method deprecated and now calling `all()` instead.
+
+
 0.1.1 - 2007-06-27
 ==================
 

Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/buildout.cfg
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/buildout.cfg	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/buildout.cfg	2007-12-03 00:01:41 UTC (rev 82085)
@@ -2,7 +2,11 @@
 parts = test
 develop = .
 find-links = http://download.zope.org/distribution
+versions = versions
 
+[versions]
+SQLAlchemy = 0.4.1
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.zalchemy [test]

Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/setup.py
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/setup.py	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/setup.py	2007-12-03 00:01:41 UTC (rev 82085)
@@ -13,7 +13,7 @@
       include_package_data = True,
       zip_safe=False,
       install_requires=['setuptools',
-                        'SQLAlchemy>=0.4dev',
+                        'SQLAlchemy',
                         'ZODB3',
                         'zope.component',
                         'zope.interface',

Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/README.txt
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/README.txt	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/README.txt	2007-12-03 00:01:41 UTC (rev 82085)
@@ -105,7 +105,12 @@
 
   >>> a = A()
   >>> a.value = 1
+  >>> from z3c.zalchemy.datamanager import getSession as session
 
+Save the object in the session.
+
+  >>> session().save(a)
+
 Committing a transaction will automatically trigger a flush and clear the
 session.
 
@@ -115,7 +120,6 @@
 Now let's try to get the object back in a new transaction (we're in a new
 transaction already because the old transaction was committed):
 
-  >>> from z3c.zalchemy.datamanager import getSession as session
   >>> a = session().get(A, 1)
   >>> a.value
   1
@@ -167,6 +171,7 @@
 
   >>> b = B()
   >>> b.value = 'b1'
+  >>> session().save(b)
 
   >>> a = A()
   >>> a.value = 321

Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/container.py
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/container.py	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/container.py	2007-12-03 00:01:41 UTC (rev 82085)
@@ -110,7 +110,7 @@
     def items(self):
         session = z3c.zalchemy.getSession()
         query = session.query(self._class)
-        for obj in query.select():
+        for obj in query.all():
             name = self._toStringIdentifier(obj)
             yield (name, contained(obj, self, name) )
 

Modified: z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/tests/TRANSACTION.txt
===================================================================
--- z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/tests/TRANSACTION.txt	2007-12-02 23:49:53 UTC (rev 82084)
+++ z3c.zalchemy/branches/darrylcousins-sqlalchemy04-experiment/src/z3c/zalchemy/tests/TRANSACTION.txt	2007-12-03 00:01:41 UTC (rev 82085)
@@ -174,7 +174,7 @@
   >>> transaction.commit()
   Traceback (most recent call last):
   ...
-  SQLError: (IntegrityError) PRIMARY KEY must be unique u'INSERT INTO table2 (id, value) VALUES (?, ?)' [2, 3]
+  IntegrityError: (IntegrityError) PRIMARY KEY must be unique u'INSERT INTO table2 (id, value) VALUES (?, ?)' [2, 3]
 
 Finally we need to abort zope's transaction.
 
@@ -190,7 +190,7 @@
   >>> transaction.commit()
   Traceback (most recent call last):
   ...
-  SQLError: (IntegrityError) PRIMARY KEY must be unique u'INSERT INTO table2 (id, value) VALUES (?, ?)' [2, 3]
+  IntegrityError: (IntegrityError) PRIMARY KEY must be unique u'INSERT INTO table2 (id, value) VALUES (?, ?)' [2, 3]
 
 We need to manually abort the transaction.