ip

Author: rrahir

src/util/spreadsheet/data_wrappers.py

@@ -309,11 +309,11 @@ def fields_matching(self):
 
     @property
     def measures(self):
-        return [m["field"] for m in self.definition.get("measures", [])]
+        return self.definition.get("measures", []) #[m["field"] for m in self.definition.get("measures", [])]
 
     @measures.setter
     def measures(self, measures):
-        self.definition["measures"] = [{"field": m} for m in measures]
+        self.definition["measures"] = measures #[{"field": m} for m in measures]
 
     @property
     def row_group_by(self):

src/util/spreadsheet/fields.py

@@ -29,17 +29,21 @@ 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):
-    apply_in_all_spreadsheets(cr, model, (lambda data, revisions_data: remove_field(cr, model, field, data, revisions_data)))
+    apply_in_all_spreadsheets(cr, field, (lambda data, revisions_data: remove_field(cr, model, field, data, revisions_data)))
 
 def remove_field(cr, model, field, data, revisions=()):
-    spreadsheet = Spreadsheet(data)
-    _remove_field_from_filter_matching(cr, spreadsheet, model, field)
-    adapters = _remove_field_from_list(spreadsheet, model, field)
-    adapters += _remove_field_from_pivot(spreadsheet, model, field)
-    adapters += _remove_field_from_graph(spreadsheet, model, field)
-    adapters += _remove_field_from_view_link(spreadsheet, model, field)
-    spreadsheet.clean_empty_cells()
-    return spreadsheet.data, transform_revisions_data(revisions, *adapters)
+    try:
+
+        spreadsheet = Spreadsheet(data)
+        _remove_field_from_filter_matching(cr, spreadsheet, model, field)
+        adapters = _remove_field_from_list(spreadsheet, model, field)
+        adapters += _remove_field_from_pivot(spreadsheet, model, field)
+        adapters += _remove_field_from_graph(spreadsheet, model, field)
+        adapters += _remove_field_from_view_link(spreadsheet, model, field)
+        spreadsheet.clean_empty_cells()
+        return spreadsheet.data, transform_revisions_data(revisions, *adapters)
+    except:
+        import ipdb;ipdb.set_trace()
 
 def _rename_function_fields(content, data_source_ids, functions, old, new):
     def adapter(fun_call):
@@ -330,9 +334,13 @@ def adapt_re_insert(cmd):
 
 
 def _remove_field_from_pivot(spreadsheet: Spreadsheet, model, field):
+    # try:
     pivot_to_delete = [
         pivot.id for pivot in spreadsheet.pivots if pivot.model == model and field in pivot_fields(pivot)
     ]
+    # except:
+    #     import ipdb;ipdb.set_trace()
+    #     pivot_to_delete = []
     adapters = remove_pivots(
         spreadsheet,
         pivot_to_delete,
@@ -395,11 +403,16 @@ def pivot_measure_fields(pivot):
 
 def pivot_fields(pivot):
     """return all field names used in a pivot definition"""
+    # try:
     fields = set(pivot.col_group_by + pivot.row_group_by + pivot_measure_fields(pivot) + domain_fields(pivot.domain))
     measure = pivot.order_by and pivot.order_by["field"]
     if measure and measure != "__count":
         fields.add(measure)
     return fields
+    # except:
+    #     import ipdb;ipdb.set_trace()
+    #     return set()
+
 
 
 def chart_fields(chart):

src/util/spreadsheet/misc.py

@@ -54,9 +54,8 @@ def read_spreadsheet_initial_data(cr, like_pattern=""):
     # TODO there are excel files in there!
     for document_id, attachment_id, db_datas in cr.fetchall():
         if db_datas:
-            # print(db_datas)
             yield attachment_id, "documents.document", document_id, json.loads(db_datas.tobytes())
-    data_field = "spreadsheet_binary_data" if version_gte("saas~16.3") else "data"
+    data_field = _magic_spreadsheet_field(cr) #"spreadsheet_binary_data" if version_gte("saas~16.3") else "data"
     cr.execute(
         """
         SELECT id, res_model, res_id, db_datas
@@ -71,10 +70,26 @@ def read_spreadsheet_initial_data(cr, like_pattern=""):
         if db_datas:
             yield attachment_id, res_model, res_id, json.loads(db_datas.tobytes())
 
+def _magic_spreadsheet_field(cr):
+    cr.execute(
+    """
+    SELECT count(1)
+        FROM ir_model_fields
+        WHERE model='spreadsheet.mixin'
+        AND name='spreadsheet_binary_data';
+    """
+    )
+    return cr.fetchone()[0] and 'spreadsheet_binary_data' or 'data'
+
 def apply_in_all_spreadsheets(cr, like_pattern, callback):
-    _logger.info("upgrading initial data and revisions")
+    # _logger.info("upgrading initial data and revisions")
+    print("like pattern :   ", like_pattern)
+    b = False
     # 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, like_pattern):
+        print("attachment :   ", attachment_id)
+
+        b = True
         revisions_data = []
         revisions_ids = []
         ## FIXME batch the calls
@@ -92,12 +107,22 @@ def apply_in_all_spreadsheets(cr, like_pattern, callback):
                 """,
                 [json.dumps(revision), revision_id],
             )
-    _logger.info("upgrading snapshots")
+    if b:
+        _logger.info("upgrading initial data and revisions")
+
+    b = False
     # upgrade snapshots
     for attachment_id, _res_model, _res_id, db_datas in read_spreadsheet_snapshots(cr, like_pattern):
+        print("attachment :   ", attachment_id)
+
+        b=True
         data, revisions = callback(db_datas, [])
         write_attachment(cr, attachment_id, data)
 
+    if b:
+        _logger.info("upgrading snapshots")
+
+
 
 def write_attachment(cr, attachment_id, data):
     _logger.info("replacing attachment %s", attachment_id)
@@ -138,6 +163,7 @@ def get_revisions(cr, res_model, res_id, like_pattern):
 def upgrade_data(cr, upgrade_callback):
     for attachment_id, _res_model, _res_id, data in read_spreadsheet_attachments(cr):
         upgraded_data = upgrade_callback(load(data))
+        # import ipdb;ipdb.set_trace()
         cr.execute(
             """
             UPDATE ir_attachment