wip

Author: rrahir

src/util/spreadsheet/data_wrappers.py

@@ -34,9 +34,10 @@ def create_data_source_from_cmd(cmd):
 
 class Spreadsheet:
     def __init__(self, data: Union[str, dict]):
-        if type(data) == str:
+        if isinstance(data, str):
             data = json.loads(data)
         self.data = load(data)
+        self.pivotContructor = version_gte("saas~17.2") and PivotV17_2 or PivotV16
 
     def __str__(self) -> str:
         return self.to_json()
@@ -63,7 +64,7 @@ def odoo_charts(self):
 
     @property
     def pivots(self) -> List[str]:
-        return [PivotV16(d) for d in self.data.get("pivots", {}).values()]
+        return [self.pivotContructor(d) for d in self.data.get("pivots", {}).values()]
 
     @property
     def lists(self) -> List[str]:
@@ -256,7 +257,7 @@ def fields(self, fields: List[str]):
 
 class PivotV16:
     """Wrapper around a pivot data source, hiding
-    its internal structure"""
+    its internal structure for v16"""
 
     def __init__(self, definition):
         self.definition = definition
@@ -309,11 +310,11 @@ def fields_matching(self):
 
     @property
     def measures(self):
-        return self.definition.get("measures", []) #[m["field"] for m in self.definition.get("measures", [])]
+        return [m["field"] for m in self.definition.get("measures", [])]
 
     @measures.setter
     def measures(self, measures):
-        self.definition["measures"] = measures #[{"field": m} for m in measures]
+        self.definition["measures"] = [{"field": m} for m in measures]
 
     @property
     def row_group_by(self):
@@ -331,6 +332,14 @@ def col_group_by(self):
     def col_group_by(self, group_by):
         self.definition["colGroupBys"] = group_by
 
+class PivotV17_2(PivotV16):
+    @property
+    def measures(self):
+        return self.definition.get("measures", [])
+
+    @measures.setter
+    def measures(self, measures):
+        self.definition["measures"] = measures
 
 class OdooChartV16:
     def __init__(self, definition):

src/util/spreadsheet/fields.py

@@ -31,9 +31,9 @@ def rename_field(cr, model, old, new, data, revisions = ()):
 def remove_field_in_all_spreadsheets(cr, model, field):
     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=()):
     try:
-
         spreadsheet = Spreadsheet(data)
         _remove_field_from_filter_matching(cr, spreadsheet, model, field)
         adapters = _remove_field_from_list(spreadsheet, model, field)
@@ -45,6 +45,7 @@ def remove_field(cr, model, field, data, revisions=()):
     except:
         import ipdb;ipdb.set_trace()
 
+
 def _rename_function_fields(content, data_source_ids, functions, old, new):
     def adapter(fun_call):
         for arg in fun_call.args[1:]:
@@ -334,13 +335,10 @@ 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,
@@ -411,7 +409,8 @@ def pivot_fields(pivot):
     return fields
     # except:
     #     import ipdb;ipdb.set_trace()
-    #     return set()
+    #     return []
+
 
 
 

src/util/spreadsheet/misc.py

@@ -13,7 +13,7 @@
 
 from .o_spreadsheet import load
 from .revisions import CommandAdapter, Drop
-from odoo.upgrade.util.misc import version_gte
+from odoo.addons.base.maintenance.migrations import util
 
 _logger = logging.getLogger(__name__)
 
@@ -41,34 +41,37 @@ def read_spreadsheet_snapshots(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 position(%s::bytea in db_datas) > 0
-        """,
-        [like_pattern],
-    )
-    # TODO there are excel files in there!
-    for document_id, attachment_id, db_datas in cr.fetchall():
-        if db_datas:
-            yield attachment_id, "documents.document", document_id, json.loads(db_datas.tobytes())
-    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
-          FROM ir_attachment
-         WHERE res_model = 'spreadsheet.dashboard'
-           AND res_field = %s
-           AND position(%s::bytea in db_datas) > 0
-        """,
-        [data_field, like_pattern],
-    )
-    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())
+    if util.table_exists(cr, "documents_document"):
+        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 position(%s::bytea in db_datas) > 0
+            """,
+            [like_pattern],
+        )
+        # TODO there are excel files in there!
+        for document_id, attachment_id, db_datas in cr.fetchall():
+            if db_datas:
+                yield attachment_id, "documents.document", document_id, json.loads(db_datas.tobytes())
+
+    if util.table_exists(cr, "spreadsheet_dashboard"):
+        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
+            FROM ir_attachment
+            WHERE res_model = 'spreadsheet.dashboard'
+            AND res_field = %s
+            AND position(%s::bytea in db_datas) > 0
+            """,
+            [data_field, like_pattern],
+        )
+        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 _magic_spreadsheet_field(cr):
     cr.execute(
@@ -88,11 +91,11 @@ def apply_in_all_spreadsheets(cr, like_pattern, callback):
     # 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)
-
+        print("datas:   ", len(db_datas))
         b = True
         revisions_data = []
         revisions_ids = []
-        ## FIXME batch the calls
+        ## FIXME TODORAR batch the calls
         for revision_id, commands in get_revisions(cr, res_model, res_id, like_pattern):
             revisions_data.append(json.loads(commands))
             revisions_ids.append(revision_id)
@@ -137,7 +140,7 @@ def write_attachment(cr, attachment_id, data):
 
 
 def get_revisions(cr, res_model, res_id, like_pattern):
-    if version_gte("16.0"):
+    if util.version_gte("16.0"):
         cr.execute(
             """
             SELECT id, commands
@@ -163,7 +166,6 @@ 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