diff options
| author | Olivier Dony <odo@openerp.com> | 2010-03-29 10:56:00 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-03-29 10:56:00 +0200 |
| commit | 45e715d7139afc680970dce8d55002a9380a2111 (patch) | |
| tree | 7bfdd1af7c27d488ea511c191517bd8f389b8268 /bin/addons/base/base.sql | |
| parent | 9a7120d5c3ad8d59dc0456f835b195b7257e3311 (diff) | |
[FIX] Database creation fixed by breaking the circular dependencies with multi-company init.
Still need to fix the init to re-establish the FK reference on res_users' company_id field.
bzr revid: odo@openerp.com-20100329085600-r0pjh7rjyq2rw44n
Diffstat (limited to 'bin/addons/base/base.sql')
| -rw-r--r-- | bin/addons/base/base.sql | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql index 1f7955eff10..19d401b75ba 100644 --- a/bin/addons/base/base.sql +++ b/bin/addons/base/base.sql @@ -147,7 +147,10 @@ CREATE TABLE res_users ( signature text, -- action_id int references ir_act_window on delete set null, context_lang varchar(64) default '', + -- No FK references below, will be added later by ORM + -- (when the destination rows exist) action_id int, + company_id int, primary key(id) ); alter table res_users add constraint res_users_login_uniq unique (login); @@ -342,7 +345,7 @@ CREATE TABLE ir_model_data ( -- Users --------------------------------- -insert into res_users (id,login,password,name,action_id,active) values (1,'admin',NULL,'Administrator',NULL,True); +insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin',NULL,'Administrator',NULL,True,1); insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1); -- Compatibility purpose, to remove V6.0 |