From 88766cccfd522522bcbd2cb968e49d90c46325bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Sun, 4 Mar 2012 16:07:16 +0100
Subject: [PATCH] Do not search for deleted history records

review250003
(transplanted from 96962d9f896dbb635ce19c7c92f9b2cdf7e5eae0)
---
 trytond/model/modelsql.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index 235e3adc20..db1046d9e5 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -1267,7 +1267,19 @@ class ModelSQL(ModelStorage):
                     res.remove(data['id'])
                 res.append(data['id'])
                 ids_date[data['id']] = data['_datetime']
-            return res
+            to_delete = set()
+            for i in range(0, len(res), cursor.IN_MAX):
+                sub_ids = res[i:i + cursor.IN_MAX]
+                reduced_sql, reduced_ids = reduce_ids('id', sub_ids)
+                cursor.execute(('SELECT id, write_date '
+                        'FROM "%s__history" WHERE %s'
+                        'AND (write_date IS NOT NULL AND create_date IS NULL)'
+                        ) % (self._table, reduced_sql),
+                    reduced_ids)
+                for deleted_id, delete_date in cursor.fetchall():
+                    if ids_date[deleted_id] < delete_date:
+                        to_delete.add(deleted_id)
+            return filter(lambda x: x not in to_delete, res)
 
         return [x['id'] for x in datas]