From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 24 Sep 2005 02:02:57 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0247ca2dc99f42f3c8762088900ad0dc5c86062;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index 53f50f6480..bdaba95ca6 100644
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -225,7 +225,6 @@ class Mapper(object):
     
     def instances(self, cursor, db):
         result = util.HistoryArraySet()
-        cursor = engine.ResultProxy(cursor, db, echo = db.echo)
         imap = {}
         while True:
             row = cursor.fetchone()
@@ -334,7 +333,7 @@ class Mapper(object):
                     clause.clauses.append(col == sql.bindparam(col.key))
                 statement = table.update(clause)
                 c = statement.execute(*update)
-                if c.rowcount != len(update):
+                if c.cursor.rowcount != len(update):
                     raise "ConcurrencyError - updated rowcount does not match number of objects updated"
             
             if len(insert):
@@ -370,7 +369,7 @@ class Mapper(object):
                     clause.clauses.append(col == sql.bindparam(col.key))
                 statement = table.delete(clause)
                 c = statement.execute(*delete)
-                if c.rowcount != len(delete):
+                if c.cursor.rowcount != len(delete):
                     raise "ConcurrencyError - updated rowcount does not match number of objects updated"
 
     def register_dependencies(self, *args, **kwargs):