Odoo Server (MOVED TO GITHUB)

Merge lp:~therp-nl/openobject-server/trunk-8.0-lp1277899-fix_base_sql_consistency into lp:openobject-server

  1. trunk-8.0-lp1277899-fix_base_sql_consistency
  2. Merge into trunk
Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-server/trunk-8.0-lp1277899-fix_base_sql_consistency
Merge into: lp:openobject-server
Diff against target: 101 lines (+3/-12)
4 files modified
openerp/addons/base/base.sql (+0/-7)
openerp/modules/db.py (+2/-3)
openerp/modules/module.py (+0/-1)
openerp/workflow/instance.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/openobject-server/trunk-8.0-lp1277899-fix_base_sql_consistency
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+205478@code.launchpad.net

Description of the change

- Fix consistency between base.sql and model layout
- Remove references to obsolete columns in any raw sql

Green on runbot

To post a comment you must log in.

Unmerged revisions

5055. By Stefan Rijnhart (Opener)

[FIX] Consistency between base.sql and model layout
[FIX] Remove references to obsolete fields in raw sql queries

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/base.sql'
2--- openerp/addons/base/base.sql 2013-12-02 15:08:56 +0000
3+++ openerp/addons/base/base.sql 2014-02-08 17:20:19 +0000
4@@ -14,7 +14,6 @@
5 key2 varchar(256) not null,
6 model varchar(128) not null,
7 value text,
8- meta text default NULL,
9 res_id integer default null,
10 primary key (id)
11 );
12@@ -42,7 +41,6 @@
13 field_description varchar,
14 ttype varchar,
15 state varchar default 'base',
16- relate boolean default False,
17 relation_field varchar,
18 translate boolean default False,
19 primary key(id)
20@@ -196,7 +194,6 @@
21 act_to int references wkf_activity on delete cascade,
22 condition varchar(128) default NULL,
23
24- trigger_type varchar(128) default NULL,
25 trigger_expr_id varchar(128) default NULL,
26
27 signal varchar(64) default null,
28@@ -209,7 +206,6 @@
29 (
30 id serial,
31 wkf_id int references wkf on delete restrict,
32- uid int default null,
33 res_id int not null,
34 res_type varchar(64) not null,
35 state varchar(32) not null default 'active',
36@@ -277,12 +273,10 @@
37 state character varying(16),
38 latest_version character varying(64),
39 shortdesc character varying(256),
40- complexity character varying(32),
41 category_id integer REFERENCES ir_module_category ON DELETE SET NULL,
42 description text,
43 application boolean default False,
44 demo boolean default False,
45- web boolean DEFAULT FALSE,
46 license character varying(32),
47 sequence integer DEFAULT 100,
48 auto_install boolean default False,
49@@ -297,7 +291,6 @@
50 write_date timestamp without time zone,
51 write_uid integer references res_users on delete set null,
52 name character varying(128),
53- version_pattern character varying(128) default NULL,
54 module_id integer REFERENCES ir_module_module ON DELETE cascade,
55 primary key(id)
56 );
57
58=== modified file 'openerp/modules/db.py'
59--- openerp/modules/db.py 2012-11-28 18:37:01 +0000
60+++ openerp/modules/db.py 2014-02-08 17:20:19 +0000
61@@ -74,13 +74,12 @@
62
63 cr.execute('INSERT INTO ir_module_module \
64 (author, website, name, shortdesc, description, \
65- category_id, auto_install, state, web, license, application, icon, sequence, summary) \
66- VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
67+ category_id, auto_install, state, license, application, icon, sequence, summary) \
68+ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
69 info['author'],
70 info['website'], i, info['name'],
71 info['description'], category_id,
72 info['auto_install'], state,
73- info['web'],
74 info['license'],
75 info['application'], info['icon'],
76 info['sequence'], info['summary']))
77
78=== modified file 'openerp/modules/module.py'
79--- openerp/modules/module.py 2013-06-28 15:07:55 +0000
80+++ openerp/modules/module.py 2014-02-08 17:20:19 +0000
81@@ -273,7 +273,6 @@
82 'name': False,
83 'post_load': None,
84 'version': '1.0',
85- 'web': False,
86 'website': '',
87 'sequence': 100,
88 'summary': '',
89
90=== modified file 'openerp/workflow/instance.py'
91--- openerp/workflow/instance.py 2014-01-20 13:53:33 +0000
92+++ openerp/workflow/instance.py 2014-02-08 17:20:19 +0000
93@@ -43,7 +43,7 @@
94 assert isinstance(workflow_id, (int, long))
95
96 cr = session.cr
97- cr.execute('insert into wkf_instance (res_type,res_id,uid,wkf_id) values (%s,%s,%s,%s) RETURNING id', (record.model, record.id, session.uid, workflow_id))
98+ cr.execute('insert into wkf_instance (res_type,res_id,wkf_id) values (%s,%s,%s) RETURNING id', (record.model, record.id, workflow_id))
99 instance_id = cr.fetchone()[0]
100
101 cr.execute('select * from wkf_activity where flow_start=True and wkf_id=%s', (workflow_id,))