Fix NOT NULL handling in base tables:
- Removed useless NOT NULL for sqlite in init.sql - Added missing NOT NULL for postgresql in init.sql - Take care of populating required fields when creating records in module tables
This commit is contained in:
1 parent
35ab3bdd6b
commit
14c5f661ea
4 files changed
+22
-20
No files matched your search
@@ -208,17 +208,18 @@ class Database(DatabaseInterface):
|
||||
cursor.execute('SELECT NEXTVAL(\'ir_module_module_id_seq\')')
|
||||
module_id = cursor.fetchone()[0]
|
||||
cursor.execute('INSERT INTO ir_module_module ' \
|
||||
'(id, author, website, name, shortdesc, ' \
|
||||
'description, state) ' \
|
||||
'VALUES (%s, %s, %s, %s, %s, %s, %s)',
|
||||
(module_id, info.get('author', ''),
|
||||
'(id, create_uid, create_date, author, website, name, ' \
|
||||
'shortdesc, description, state) ' \
|
||||
'VALUES (%s, %s, now(), %s, %s, %s, %s, %s, %s)',
|
||||
(module_id, 0, info.get('author', ''),
|
||||
info.get('website', ''), i, info.get('name', False),
|
||||
info.get('description', ''), state))
|
||||
dependencies = info.get('depends', [])
|
||||
for dependency in dependencies:
|
||||
cursor.execute('INSERT INTO ir_module_module_dependency ' \
|
||||
'(module, name) VALUES (%s, %s)',
|
||||
(module_id, dependency))
|
||||
'(create_uid, create_date, module, name) ' \
|
||||
'VALUES (%s, now(), %s, %s)',
|
||||
(0, module_id, dependency))
|
||||
|
||||
|
||||
class _Cursor(cursor):
|
||||
|
||||
@@ -183,8 +183,8 @@ create table wkf_witm_trans
|
||||
|
||||
CREATE TABLE ir_module_module (
|
||||
id serial NOT NULL,
|
||||
create_uid integer references res_user on delete set null,
|
||||
create_date timestamp without time zone,
|
||||
create_uid integer NOT NULL references res_user on delete set null,
|
||||
create_date timestamp without time zone NOT NULL,
|
||||
write_date timestamp without time zone,
|
||||
write_uid integer references res_user on delete set null,
|
||||
website varchar,
|
||||
@@ -200,8 +200,8 @@ ALTER TABLE ir_module_module add constraint name_uniq unique (name);
|
||||
|
||||
CREATE TABLE ir_module_module_dependency (
|
||||
id serial NOT NULL,
|
||||
create_uid integer references res_user on delete set null,
|
||||
create_date timestamp without time zone,
|
||||
create_uid integer NOT NULL references res_user on delete set null,
|
||||
create_date timestamp without time zone NOT NULL,
|
||||
write_date timestamp without time zone,
|
||||
write_uid integer references res_user on delete set null,
|
||||
name varchar,
|
||||
|
||||
@@ -176,10 +176,10 @@ class Database(DatabaseInterface):
|
||||
else:
|
||||
state = 'uninstalled'
|
||||
cursor.execute('INSERT INTO ir_module_module ' \
|
||||
'(author, website, name, shortdesc, ' \
|
||||
'description, state) ' \
|
||||
'VALUES (%s, %s, %s, %s, %s, %s)',
|
||||
(info.get('author', ''),
|
||||
'(create_uid, create_date, author, website, name, ' \
|
||||
'shortdesc, description, state) ' \
|
||||
'VALUES (%s, now(), %s, %s, %s, %s, %s, %s)',
|
||||
(0, info.get('author', ''),
|
||||
info.get('website', ''), i, info.get('name', False),
|
||||
info.get('description', ''), state))
|
||||
cursor.execute('SELECT last_insert_rowid()')
|
||||
@@ -187,8 +187,9 @@ class Database(DatabaseInterface):
|
||||
dependencies = info.get('depends', [])
|
||||
for dependency in dependencies:
|
||||
cursor.execute('INSERT INTO ir_module_module_dependency ' \
|
||||
'(module, name) VALUES (%s, %s)',
|
||||
(module_id, dependency))
|
||||
'(create_uid, create_date, module, name) ' \
|
||||
'VALUES (%s, now(), %s, %s) ',
|
||||
(0, module_id, dependency))
|
||||
|
||||
|
||||
class _Cursor(sqlite.Cursor):
|
||||
|
||||
@@ -91,7 +91,7 @@ insert into res_user (id,login,password,name,action,active) values (0,'root',NUL
|
||||
|
||||
CREATE TABLE res_group (
|
||||
id INTEGER PRIMARY KEY,
|
||||
name VARCHAR NOT NULL
|
||||
name VARCHAR
|
||||
);
|
||||
|
||||
CREATE TABLE "res_user-res_group" (
|
||||
@@ -143,9 +143,9 @@ create table wkf_instance
|
||||
id INTEGER PRIMARY KEY,
|
||||
workflow INTEGER,
|
||||
uid INTEGER,
|
||||
res_id INTEGER not null,
|
||||
res_type VARCHAR not null,
|
||||
state VARCHAR not null
|
||||
res_id INTEGER,
|
||||
res_type VARCHAR,
|
||||
state VARCHAR
|
||||
);
|
||||
|
||||
create table wkf_workitem
|
||||
|
||||
Reference in new issue
Block a user