[gnue] r9394 - trunk/gnue-common/src/datasources

[johannes]

Author: johannes
Date: 2007-02-21 13:35:10 -0600 (Wed, 21 Feb 2007)
New Revision: 9394

Modified:
   trunk/gnue-common/src/datasources/GSchema.py
Log:
Added missing argument to merge()


Modified: trunk/gnue-common/src/datasources/GSchema.py
===================================================================
--- trunk/gnue-common/src/datasources/GSchema.py        2007-02-21 15:58:15 UTC 
(rev 9393)
+++ trunk/gnue-common/src/datasources/GSchema.py        2007-02-21 19:35:10 UTC 
(rev 9394)
@@ -407,7 +407,7 @@
   # Merge a rows collection with another one
   # ---------------------------------------------------------------------------
 
-  def merge (self, other, maxIdLength = None):
+  def merge (self, other, maxIdLength = None, overwrite=False):
     """
     Merge all rows of another rows collection into this one. Since we cannot
     determine a primary key here we have no chance to detect duplicate rows.