fixup! [ADD] pg.query_ids: query large numbers of ids memory-safely

Author: cawo-odoo

src/util/pg.py

@@ -1934,7 +1934,7 @@ def bulk_update_table(cr, table, columns, mapping, key_col="id"):
     cr.execute(query, [Json(mapping)])
 
 
-class query_ids(named_cursor):
+class query_ids(object):
     def __init__(self, cr, query, itersize=None):
         self._cr = cr
         self._tmp_tbl = "_upgrade_query_ids_{}".format(uuid.uuid4().hex)
@@ -1952,21 +1952,24 @@ def __init__(self, cr, query, itersize=None):
                 cr, "ALTER TABLE {} ADD CONSTRAINT {} PRIMARY KEY (id)", self._tmp_tbl, "pk_{}_id".format(self._tmp_tbl)
             )
         )
-        super(query_ids, self).__init__(cr, itersize)
-        self.execute(format_query(cr, "SELECT id FROM {} ORDER BY id", self._tmp_tbl))
+        self._ncr = named_cursor(cr, itersize)
+        self._ncr.execute(format_query(cr, "SELECT id FROM {} ORDER BY id", self._tmp_tbl))
 
     def __len__(self):
         return self._len
 
     def __iter__(self):
-        return (id_ for (id_,) in super(query_ids, self).__iter__())
+        return (id_ for (id_,) in self._ncr)
+
+    def __enter__(self):
+        return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self._cr.execute(format_query(self._cr, "DROP TABLE IF EXISTS {}", self._tmp_tbl))
         self._cr = None
-        return super(query_ids, self).__exit__(exc_type, exc_value, traceback)
+        return self._ncr.__exit__(exc_type, exc_value, traceback)
 
     def __del__(self):
         if self._cr:
             self._cr.execute(format_query(self._cr, "DROP TABLE IF EXISTS {}", self._tmp_tbl))
-        return super(query_ids, self).__del__()
+        return self._ncr.__del__()