Merge lp:~openerp-dev/openobject-server/6.0-bug-733252-xrg into lp:openobject-server/6.0

[xrg]

[OpenERP buildbot (openerp-buildbot)]

review: Approve

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

I would have approved, but this is a wishlist, hence it should go against trunk :-)

review: Needs Resubmitting

Unmerged revisions

3363. By xrg on 2011-03-11

osv/fields: required fields shall have ondelete="restrict" by default

Required fields have the set NOT NULL attribute. This cannot work together
with ON DELETE SET NULL behaviour for their referenced records. The
safest default seems to be ON DELETE RESTRICT.
Example: account.invoice:partner_id, which has to restrict deleting a
partner when there is any invoices linked to him/her.
This merely improves the SQL messages, from:
  IntegrityError: null value in column "partner_id" violates not-null constraint
  CONTEXT: SQL statement "UPDATE ONLY "public"."account_invoice" SET "partner_id" = NULL
      WHERE $1 OPERATOR(pg_catalog.=) "partner_id""
to:
  IntegrityError: update or delete on table "res_partner" violates foreign key
     constraint "account_invoice_partner_id_fkey" on table "account_invoice"
  DETAIL: Key (id)=(7) is still referenced from table "account_invoice".

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2011-02-01 13:07:21 +0000
+++ bin/osv/fields.py	2011-03-11 13:28:16 +0000
@@ -63,7 +63,7 @@
     _symbol_set = (_symbol_c, _symbol_f)
     _symbol_get = None
 
-    def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete="set null", translate=False, select=False, **args):
+    def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, **args):
         if domain is None:
             domain = []
         if context is None:
@@ -76,7 +76,7 @@
         self.help = args.get('help', '')
         self.priority = priority
         self.change_default = change_default
-        self.ondelete = ondelete
+        self.ondelete = ondelete or (required and "restrict") or "set null"
         self.translate = translate
         self._domain = domain
         self._context = context