- Ok. Fixed a failing test (StubDatabase) and checked in a doctest i forgot to add.

branches/pycon-multidb/src/ZODB/tests/testConnection.py

@@ -647,6 +647,8 @@ class StubDatabase:
         self._storage = StubStorage()
 
     classFactory = None
+    database_name = 'stubdatabase'
+    databases = {'stubdatabase': database_name}
 
     def invalidate(self, transaction, dict_with_oid_keys, connection):
         pass

branches/pycon-multidb/src/ZODB/tests/testmultidb.py

+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+r"""
+Multi-database tests
+====================
+
+Multi-database support adds the ability to tie multiple database into a
+collection.
+
+Creating a multi-database starts with creating a named DB:
+
+>>> from ZODB.tests.test_storage import MinimalMemoryStorage
+>>> from ZODB import DB
+>>> db = DB(MinimalMemoryStorage(), database_name='root')
+
+The database name is accessible afterwards and in a newly created collection:
+
+>>> db.database_name
+'root'
+>>> db.databases        # doctest: +ELLIPSIS
+{'root': <ZODB.DB.DB object at ...>}
+
+Adding a new database works like this:
+
+>>> db2 = DB(MinimalMemoryStorage(), 
+...     database_name='notroot', 
+...     databases=db.databases)
+
+The new db2 now shares the 'databases' dictionary with db and has two entries:
+
+>>> db2.databases is db.databases
+True
+>>> len(db2.databases)
+2
+
+Trying to insert a database with a name that is already in use will not work:
+
+>>> db3 = DB(MinimalMemoryStorage(), 
+...     database_name='root', 
+...     databases=db.databases)
+Traceback (most recent call last):
+    ... fancy traceback here ...
+ValueError: database_name 'root' already in databases
+
+You can (still) get a connection to a database this way:
+
+>>> cn = db.open()
+>>> cn                  # doctest: +ELLIPSIS
+<Connection at ...>
+
+This is the only connection in this collection right now:
+
+>>> cn.connections      # doctest: +ELLIPSIS
+{'root': <Connection at ...>}
+
+Getting a connection to a different database from an existing connection in the
+same database collection (this enables 'connection binding' within a given
+thread/transaction/context ...):
+
+>>> cn2 = cn.get_connection('notroot')
+>>> cn2                  # doctest: +ELLIPSIS
+<Connection at ...>
+
+Now there are two connections in that collection:
+
+>>> cn2.connections is cn.connections
+True
+>>> len(cn2.connections)
+2
+
+"""
+
+from zope.testing import doctest
+
+def test_suite():
+    return doctest.DocTestSuite()