[Zope-CVS] CVS: Products/Ape/lib/apelib/sql - structure.py:1.9

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/sql
In directory cvs.zope.org:/tmp/cvs-serv30293/lib/apelib/sql

Modified Files:
	structure.py 
Log Message:
Merged ape-fs-oid-branch.

Ape now uses arbitrary OIDs on the filesystem, rather than using paths 
as OIDs.  This solves problems with moving and replacing objects and 
further unifies SQL and filesystem databases.



=== Products/Ape/lib/apelib/sql/structure.py 1.8 => 1.9 ===
--- Products/Ape/lib/apelib/sql/structure.py:1.8	Thu Feb 19 01:44:04 2004
+++ Products/Ape/lib/apelib/sql/structure.py	Sat Feb 28 15:06:27 2004
@@ -139,6 +139,7 @@
         rows = self.execute(event, 'simple_search', 1, child_oid=event.oid)
         assert len(rows) >= 1
         name = rows[0][1]  # Accept only the first result
+        # Disable conflict checking by returning None as the hash value.
         return name, None
 
     def store(self, event, state):