Merge lp:~camptocamp/openobject-server/trunk-no-sql-constraint-abstract-model-1151703 into lp:openobject-server

Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Merged at revision: 4889
Proposed branch: lp:~camptocamp/openobject-server/trunk-no-sql-constraint-abstract-model-1151703
Merge into: lp:openobject-server
Diff against target: 13 lines (+2/-1)
1 file modified
openerp/osv/orm.py (+2/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/trunk-no-sql-constraint-abstract-model-1151703
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+152127@code.launchpad.net

Commit message

[FIX] add SQL constraints only for models stored in database (not on AbstractModel)

Description of the change

Fix for lp:1151703 (sql_constraints should not be created for AbstractModel)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/orm.py'
2--- openerp/osv/orm.py 2013-02-25 15:58:28 +0000
3+++ openerp/osv/orm.py 2013-03-07 09:07:09 +0000
4@@ -3204,7 +3204,8 @@
5
6 cr.commit() # start a new transaction
7
8- self._add_sql_constraints(cr)
9+ if getattr(self, '_auto', True):
10+ self._add_sql_constraints(cr)
11
12 if create:
13 self._execute_sql(cr)