Merge lp:~vauxoo/openobject-server/trunk_field_property_searcheable-dev-hbto into lp:openobject-server

[hbto [Vauxoo] http://www.vauxoo.com]

Fixes the issue: ORM Search Method is not working properly on model with property fields

Allowing to search each one of the property fields declared with openerp,

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

We need this. For lack of this feature, workarounds have been implemented in many modules, usually doing the search in a python loop over browse records, which is a technical nonsense.

I will not comment on the MP itself because it's a bit complex and I'd need time I can't afford to spend now; I'll just abstain.
But we do need this feature, so please let us know soon if it can be implemented in v8, or if we need to move this proposed implementation to a community module.

review: Abstain (no code review - feature is needed.)

Unmerged revisions

5051. By hbto [Vauxoo] http://www.vauxoo.com on 2014-01-31

[FIX] Allows property fields be searchable

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2014-01-23 09:46:46 +0000
+++ openerp/osv/fields.py	2014-01-31 22:15:14 +0000
@@ -1470,6 +1470,142 @@
             domain = [('res_id', 'in', vids)] + domain
         return prop.search(cr, uid, domain, context=context)
 
+    def _fnct_search(self, tobj, cr, uid, obj, prop_name, args, context=None):
+        context = context or {}
+        prop = obj.pool.get('ir.property')
+        # get the default values (for res_id = False) for the property fields
+        default_val = self._get_default(obj, cr, uid, prop_name, context)
+
+        res = []
+
+        property_field = obj._all_columns.get(prop_name).column
+        def_id = self._field_get(cr, uid, obj._name, prop_name)
+        company = obj.pool.get('res.company')
+        cid = company._company_default_get(cr, uid, obj._name, def_id,
+                                           context=context)
+        propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id,
+                                                         context=context)
+        from_clause = 'ir_property'
+        where = " WHERE " + \
+                "name = '%s' AND "% propdef.name + \
+                "res_id like '%s,%%' AND "% obj._name + \
+                "company_id = %s AND "% cid + \
+                "fields_id = %s AND "% def_id + \
+                "type = '%s'"% self._type
+
+        model_ids = []
+
+        type2field = {
+            'char': 'value_text',               #
+            'float': 'value_float',             #
+            'boolean' : 'value_integer',        #
+            'integer': 'value_integer',         #
+            'text': 'value_text',               #
+            'binary': 'value_binary',
+            'many2one': 'value_reference',      #
+            'date' : 'value_datetime',          #
+            'datetime' : 'value_datetime',      #
+        }
+        ghost = False
+        where_str = ''
+
+        if property_field._type == 'many2one':
+            model_obj = obj.pool.get(property_field._obj)
+            left, operator, right = args[0]
+            args1 = []
+            if operator == '!=' and right == False:
+                args1= [(1,'=',1)]
+            elif operator == '=' and right == False and not default_val:
+                ghost = True
+            elif operator in ('ilike','not ilike','=','!='):
+                args1= [(model_obj._rec_name,operator,right)]
+            elif operator == 'in':
+                args1= [('id',operator,right)]
+            #/!\ By doing this I am forgetting the possible ghosts that could match
+            model_ids = args1 and model_obj.search(cr,uid,args1,context=context) or []
+            if model_ids:
+                ghost = True if default_val and default_val.id in model_ids else False
+                #/!\ This awful query has to be got rid, a better query should arise
+                model_ids = map(lambda x:"'%s,%s'"%(model_obj._name,x),model_ids)
+                model_ids = ",".join(model_ids)
+                where_str += ' AND value_reference IN (%s)'%model_ids
+            else:
+                #/!\ Do not return anything in case that no arguments are passed 
+                #return [('id', '=', 0)]                                                 
+                pass
+
+        elif property_field._type in ('date','datetime'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s = '%s'"%type_right%operator
+            elif operator in ('=like' '=ilike', 'like', 'not like', 'ilike', 'not ilike'):
+                #TODO: NotImplementedYet
+                pass
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+
+        elif property_field._type in ('float', 'boolean', 'integer'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s %%s %d"%type_right%operator
+            elif operator in ('=like' '=ilike', 'like', 'not like', 'ilike', 'not ilike'):
+                #TODO: NotImplementedYet
+                pass
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+        elif property_field._type in ('char', 'text'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s = '%s'"%type_right%operator
+            elif operator == '=like':
+                where_str += " AND %s =like '%s%%'"%type_right
+            elif operator == '=ilike':
+                where_str += " AND %s =ilike '%s%%'"%type_right
+            elif operator == 'like':
+                where_str += " AND %s like '%s'"%type_right
+            elif operator == 'not like':
+                where_str += " AND %s not like '%s'"%type_right
+            elif operator == 'ilike':
+                where_str += " AND %s ilike '%s'"%type_right
+            elif operator == 'not ilike':
+                where_str += " AND %s not ilike '%s'"%type_right
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+        ghost_ids = []
+        if ghost:
+            # These are all the records from obj which actually have prop_name
+            # set as a real property_field, the other records of obj just have
+            # a 'ghost'
+            query = "SELECT res_id FROM %s"%from_clause + where 
+            cr.execute(query)
+            res = cr.fetchall()
+            res = set(res)
+            res = map(lambda x: int(x[1]), [x[0].split(',') for x in res])
+
+            #This ones are the ghosts
+            ghost_ids = obj.search(cr,uid,[('id','not in',res)],context=context) 
+
+        res = []
+        if where_str:
+            query = "SELECT res_id FROM %s"%from_clause + where + where_str 
+            cr.execute(query)
+            res = cr.fetchall()
+            res = set(res)
+            res = map(lambda x: int(x[1]), [x[0].split(',') for x in res])
+
+        res += ghost_ids
+        if not res:                                                                 
+            return [('id', '=', 0)]                                                 
+        return [('id', 'in', res)]
     # TODO: to rewrite more clean
     def _fnct_write(self, obj, cr, uid, id, prop_name, id_val, obj_dest, context=None):
         if context is None:
@@ -1563,7 +1699,7 @@
         if 'view_load' in args:
             _logger.warning("view_load attribute is deprecated on ir.fields. Args: %r", args)
         obj = 'relation' in args and args['relation'] or ''
-        function.__init__(self, self._fnct_read, False, self._fnct_write, obj=obj, multi='properties', **args)
+        function.__init__(self, self._fnct_read, False, self._fnct_write, obj=obj, multi='properties', fnct_search=self._fnct_search, **args)
 
     def restart(self):
         self.field_id = {}