Merge lp:~openerp-community/openobject-server/trunk-m2m-e2e into lp:openobject-server

[Nicolas DS]

Add to ability of a many2many relation to link the same field.
It's a kind of equal2equal relation or a many2many bidirectional.

See blue print related to this branch.
https://blueprints.launchpad.net/openobject-server/+spec/many2many-equal2equal

[Nicolas DS (zyphos)]

Add to ability of a many2many relation to link the same field.
It's a kind of equal2equal relation or a many2many bidirectional.

See blue print related to this branch.
https://blueprints.launchpad.net/openobject-server/+spec/many2many-equal2equal

[lp:~openerp-community/openobject-server/trunk-m2m-e2e]

1892. By Nicolas DS on 2009-11-24

[IMP] Removing #todo comment

1893. By Nicolas DS on 2009-11-28

[MERGE] from trunk

[Mantavya Gajjar (Open ERP) (mga)]

Hello Nicolas !

I see your development. it quite impressive but at first looks, I found there are some conflicts test appears in to the code. so it not seem a clean code

can you please make it clean so that, I can check and merge in to trunk.

Thanks
mga

review: Needs Fixing (code)

[Mantavya Gajjar (Open ERP) (mga)]

Hello Nicolas !

can you please send me a code to test in your way.

thanks
mga

review: Needs Information (test module)

[lp:~openerp-community/openobject-server/trunk-m2m-e2e]

1894. By Nicolas DS on 2010-03-15

[MERGE] merge 1 with trunk

1895. By Nicolas DS on 2010-03-15

[MERGE] Merge 2 with trunk

1896. By Nicolas DS on 2010-03-15

[FIX] M2M Equal2equal, bad fix in merge

1897. By Nicolas DS on 2010-03-15

[FIX] Bad bzr auto merge ???

1898. By Nicolas DS on 2010-03-16

[FIX] E2E implementation rewrite error

[Nicolas DS (zyphos)]

Code has been fixed according to the new server trunk code.
(The multi company handling broke my old code, Revision ID: <email address hidden>)

A test module is available at:
http://zyphos.be/openobject/e2etest.zip

Regards

[lp:~openerp-community/openobject-server/trunk-m2m-e2e]

1899. By Nicolas DS on 2010-04-26

[MERGE] from trunk

1900. By Nicolas DS on 2010-05-04

[FIX] Expression.py changes were lost in branch upgrade

1901. By Nicolas DS on 2010-05-04

[MERGE] from trunk

1902. By ScottP on 2010-05-29

Fixed minor typos

1903. By Nicolas DS on 2010-06-02

[REVERT] Reverting ScottP bad commit

1904. By Nicolas DS on 2010-06-02

[FIX] Minor typos (ScottP)

1905. By Nicolas DS on 2010-06-02

[MERGE] from official trunk

1906. By Nicolas DS on 2010-06-02

[FIX] Count has been added in trunk too since last merge

1907. By Nicolas DS on 2010-07-05

[MERGE] from official trunk

1908. By Nicolas DS on 2010-07-05

[IMP] Use new type of exception raising

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

Neither the blueprint nor the code or the description of the merge proposal make very clear what you are trying to achieve. Specifically, a relationship never connects "fields" but records or objects, so it is not clear what you mean with "a many2many relation to link the same field".

Please provide a simple example of what you want to do. (what is your use case?)

As a last note, using the 'inspect' module to implement it seems like a very ugly hack, are you sure you need to do this?

review: Needs Information

[Olivier Dony (Odoo) (odo-openerp)]

On second thought, the implementation seems a bit awkward and it seems to me that it would make m2m harder to understand and use.
Perhaps it could work better as a new type of relationship (even if it shares the same widget), if the use case is valid enough?
In any case, it cannot be merged in the current state, but you could consider providing an updated proposal with more explanations on the use case, for after v6.

Thank you!

review: Disapprove

Unmerged revisions

1908. By Nicolas DS on 2010-07-05

[IMP] Use new type of exception raising

1907. By Nicolas DS on 2010-07-05

[MERGE] from official trunk

1906. By Nicolas DS on 2010-06-02

[FIX] Count has been added in trunk too since last merge

1905. By Nicolas DS on 2010-06-02

[MERGE] from official trunk

1904. By Nicolas DS on 2010-06-02

[FIX] Minor typos (ScottP)

1903. By Nicolas DS on 2010-06-02

[REVERT] Reverting ScottP bad commit

1902. By ScottP on 2010-05-29

Fixed minor typos

1901. By Nicolas DS on 2010-05-04

[MERGE] from trunk

1900. By Nicolas DS on 2010-05-04

[FIX] Expression.py changes were lost in branch upgrade

1899. By Nicolas DS on 2010-04-26

[MERGE] from trunk

=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2010-06-24 15:56:02 +0000
+++ bin/osv/expression.py	2010-07-05 08:20:43 +0000
@@ -214,6 +214,11 @@
                         self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])
 
             elif field._type == 'many2many':
+                def __execute_recursive_in_m2m(cr, field, ids, operator):
+                    new_ids = self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids, operator, field._type)
+                    if field._equal2equal:
+                        new_ids.extend(self.__execute_recursive_in(cr, field._id2, field._rel, field._id1, ids, operator, field._type))
+                    return new_ids
                 #FIXME
                 if operator == 'child_of':
                     if isinstance(right, basestring):
@@ -224,7 +229,7 @@
                     def _rec_convert(ids):
                         if field_obj == table:
                             return ids
-                        return self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids, operator, field._type)
+                        return __execute_recursive_in_m2m(cr, field, ids, operator)
 
                     dom = _rec_get(ids2, field_obj)
                     ids2 = field_obj.search(cr, uid, dom, context=context)
@@ -255,12 +260,12 @@
                             if operator in  ['not like','not ilike','not in','<>','!=']:
                                 m2m_op = 'not in'
 
-                            self.__exp[i] = ('id', m2m_op, self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, res_ids, operator, field._type) or [0])
+                            self.__exp[i] = ('id', m2m_op, __execute_recursive_in_m2m(cr, field, res_ids, operator) or [0])
                     if call_null_m2m:
                         m2m_op = 'not in'
                         if operator in  ['not like','not ilike','not in','<>','!=']:
-                            m2m_op = 'in'
-                        self.__exp[i] = ('id', m2m_op, self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, [], operator,  field._type) or [0])
+                            m2m_op = 'in'                         
+                        self.__exp[i] = ('id', m2m_op, __execute_recursive_in_m2m(cr, field, [], operator) or [0])
 
             elif field._type == 'many2one':
                 if operator == 'child_of':

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2010-06-25 15:03:40 +0000
+++ bin/osv/fields.py	2010-07-05 08:20:43 +0000
@@ -492,7 +492,21 @@
     _classic_write = False
     _prefetch = False
     _type = 'many2many'
+    _equal2equal = False
     def __init__(self, obj, rel, id1, id2, string='unknown', limit=None, **args):
+        # Check if it's a equal2equal, retrieve parent object
+        parent_table = ''
+        import inspect
+        parent_frame = inspect.stack()[1][0]
+        if '_name' in parent_frame.f_locals:
+            parent_obj = parent_frame.f_locals['_name']
+        elif '_inherit' in parent_frame.f_locals:
+            parent_obj = parent_frame.f_locals['_inherit']
+        if (parent_obj == obj) and (id1 == id2):
+             self._equal2equal = True
+             id1 += '1'
+             id2 += '2'
+        
         _column.__init__(self, string=string, **args)
         self._obj = obj
         if '.' in rel:
@@ -520,26 +534,35 @@
         if d1:
             d1 = ' and ' + ' and '.join(d1)
         else: d1 = ''
-        query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
-                   FROM %(rel)s, %(tbl)s \
-                  WHERE %(rel)s.%(id1)s in %%s \
-                    AND %(rel)s.%(id2)s = %(tbl)s.id \
-                 %(d1)s  \
-                 %(limit)s \
-                  ORDER BY %(tbl)s.%(order)s \
-                 OFFSET %(offset)d' \
-            % {'rel': self._rel,
-               'tbl': obj._table,
-               'id1': self._id1,
-               'id2': self._id2,
-               'd1': d1,
-               'limit': limit_str,
-               'order': obj._order,
-               'offset': offset,
-              }
-        cr.execute(query, [tuple(ids)] + d2)
-        for r in cr.fetchall():
-            res[r[1]].append(r[0])
+        
+        def _get_res(column1, column2):
+            query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
+                       FROM %(rel)s, %(tbl)s \
+                      WHERE %(rel)s.%(id1)s in %%s \
+                        AND %(rel)s.%(id2)s = %(tbl)s.id \
+                     %(d1)s  \
+                     %(limit)s \
+                      ORDER BY %(tbl)s.%(order)s \
+                     OFFSET %(offset)d' \
+                % {'rel': self._rel,
+                   'tbl': obj._table,
+                   'id1': column1,
+                   'id2': column2,
+                   'd1': d1,
+                   'limit': limit_str,
+                   'order': obj._order,
+                   'offset': offset,
+                  }
+            cr.execute(query, [tuple(ids)] + d2)
+            for r in cr.fetchall():
+                if r[1] in ids:
+                    res[r[1]].append(r[0])
+                if self._equal2equal:
+                    if r[0] in ids:
+                        res[r[0]].append(r[1])    
+        _get_res(self._id1, self._id2)
+        if self._equal2equal:
+            _get_res(self._id2, self._id1)
         return res
 
     def set(self, cr, obj, id, name, values, user=None, context=None):
@@ -559,11 +582,20 @@
             elif act[0] == 2:
                 obj.unlink(cr, user, [act[1]], context=context)
             elif act[0] == 3:
-                cr.execute('delete from '+self._rel+' where ' + self._id1 + '=%s and '+ self._id2 + '=%s', (id, act[1]))
+                sql = 'delete from '+self._rel+' where (' + self._id1 + '=%s and '+ self._id2 + '=%s)'
+                if self._equal2equal:
+                    sql += 'OR (' + self._id2 + '=%s and '+ self._id1 + '=%s)'
+                    cr.execute(sql, (id, act[1], id, act[1]))
+                else:
+                    cr.execute(sql, (id, act[1]))
             elif act[0] == 4:
+                if self._equal2equal and id == act[1]:
+                    raise Exception(_('Could not link a record to itself.')) # Avoid recursion
                 cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s,%s)', (id, act[1]))
             elif act[0] == 5:
                 cr.execute('update '+self._rel+' set '+self._id2+'=null where '+self._id2+'=%s', (id,))
+                if self._equal2equal:
+                    cr.execute('update '+self._rel+' set '+self._id1+'=null where '+self._id1+'=%s', (id,))
             elif act[0] == 6:
 
                 d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
@@ -571,10 +603,18 @@
                     d1 = ' and ' + ' and '.join(d1)
                 else:
                     d1 = ''
-                cr.execute('delete from '+self._rel+' where '+self._id1+'=%s AND '+self._id2+' IN (SELECT '+self._rel+'.'+self._id2+' FROM '+self._rel+', '+','.join(tables)+' WHERE '+self._rel+'.'+self._id1+'=%s AND '+self._rel+'.'+self._id2+' = '+obj._table+'.id '+ d1 +')', [id, id]+d2)
+                    
+                def _del_rel(column1, column2):
+                    cr.execute('delete from '+self._rel+' where '+column1+'=%s AND '+column2+' IN (SELECT '+self._rel+'.'+column2+' FROM '+self._rel+', '+','.join(tables)+' WHERE '+self._rel+'.'+column1+'=%s AND '+self._rel+'.'+column2+' = '+obj._table+'.id '+ d1 +')', [id, id]+d2)
+                    
+                _del_rel(self._id1, self._id2)    
+                if self._equal2equal:
+                    _del_rel(self._id2, self._id1)
 
                 for act_nbr in act[2]:
-                    cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s, %s)', (id, act_nbr))
+                    if not self._equal2equal or id != act_nbr:
+                        # Equal2equal can't be linked to himself 
+                        cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s, %s)', (id, act_nbr))
 
     #
     # TODO: use a name_search

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2010-07-04 12:57:27 +0000
+++ bin/osv/orm.py	2010-07-05 08:20:43 +0000
@@ -27,8 +27,8 @@
 #    . Optimised processing by complex query (multiple actions at once)
 #    . Default fields value
 #    . Permissions optimisation
-#    . Persistant object: DB postgresql
-#    . Datas conversions
+#    . Persistent object: DB postgresql
+#    . Data conversions
 #    . Multi-level caching system
 #    . 2 different inheritancies
 #    . Fields: