replace LIKE in bytea field

Author: LucasLefevre

src/util/spreadsheet/__init__.py

@@ -11,6 +11,7 @@
 
 from .fields import *
 from .models import *
+from .misc import *
 # try:
 #     from .fields import *
 #     from .models import *

src/util/spreadsheet/fields.py

@@ -29,8 +29,6 @@ def rename_field(cr, model, old, new, data, revisions = ()):
     return spreadsheet.data, transform_revisions_data(revisions, *adapters)
 
 def remove_field_in_all_spreadsheets(cr, model, field):
-    if field == "__last_update":
-        return # concurrent updates
     apply_in_all_spreadsheets(cr, model, (lambda data, revisions_data: remove_field(cr, model, field, data, revisions_data)))
 
 def remove_field(cr, model, field, data, revisions=()):

src/util/spreadsheet/misc.py

@@ -18,36 +18,36 @@
 _logger = logging.getLogger(__name__)
 
 
-def read_spreadsheet_attachments(cr, like_pattern="%"):
+def read_spreadsheet_attachments(cr, like_pattern=""):
     yield from read_spreadsheet_initial_data(cr, like_pattern)
     yield from read_spreadsheet_snapshots(cr, like_pattern)
 
 
-def read_spreadsheet_snapshots(cr, like_pattern="%"):
+def read_spreadsheet_snapshots(cr, like_pattern=""):
     cr.execute(
         """
         SELECT id, res_model, res_id, db_datas
           FROM ir_attachment
          WHERE res_model IN ('spreadsheet.dashboard', 'documents.document')
            AND res_field = 'spreadsheet_snapshot'
-           AND db_datas LIKE %s
+           AND position(%s::bytea in db_datas) > 0
         """,
         [like_pattern],
     )
-    # TODO LIKE probably doesn't work because the field is of type bytea
+    # TODO rename 'like_pattern', it's not LIKE because LIKE doesn't work because the field is of type bytea
     for attachment_id, res_model, res_id, db_datas in cr.fetchall():
         if db_datas:
             yield attachment_id, res_model, res_id, json.loads(db_datas.tobytes())
 
 
-def read_spreadsheet_initial_data(cr, like_pattern="%"):
+def read_spreadsheet_initial_data(cr, like_pattern=""):
     cr.execute(
         """
         SELECT doc.id AS document_id, a.id AS attachment_id, a.db_datas
           FROM documents_document doc
      LEFT JOIN ir_attachment a ON a.id = doc.attachment_id
          WHERE doc.handler='spreadsheet'
-           AND a.db_datas LIKE %s
+           AND position(%s::bytea in db_datas) > 0
         """,
         [like_pattern],
     )
@@ -63,7 +63,7 @@ def read_spreadsheet_initial_data(cr, like_pattern="%"):
           FROM ir_attachment
          WHERE res_model = 'spreadsheet.dashboard'
            AND res_field = %s
-           AND db_datas LIKE %s
+           AND position(%s::bytea in db_datas) > 0
         """,
         [data_field, like_pattern],
     )
@@ -74,7 +74,7 @@ def read_spreadsheet_initial_data(cr, like_pattern="%"):
 def apply_in_all_spreadsheets(cr, like_pattern, callback):
     _logger.info("upgrading initial data and revisions")
     # upgrade the initial data and all revisions based on it
-    for attachment_id, res_model, res_id, db_datas in read_spreadsheet_initial_data(cr):
+    for attachment_id, res_model, res_id, db_datas in read_spreadsheet_initial_data(cr, like_pattern):
         revisions_data = []
         revisions_ids = []
         for revision_id, commands in get_revisions(cr, res_model, res_id, like_pattern):
@@ -93,7 +93,7 @@ def apply_in_all_spreadsheets(cr, like_pattern, callback):
             )
     _logger.info("upgrading snapshots")
     # upgrade snapshots
-    for attachment_id, _res_model, _res_id, db_datas in read_spreadsheet_snapshots(cr):
+    for attachment_id, _res_model, _res_id, db_datas in read_spreadsheet_snapshots(cr, like_pattern):
         data, revisions = callback(db_datas, [])
         write_attachment(cr, attachment_id, data)