From bcaf90c80bc89a627ad5045ea1c24e4897c454ad Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 7 Aug 2009 15:52:08 +0200 Subject: [PATCH] [FIX] increase size of field "name" of ir.model.data bzr revid: christophe@tinyerp.com-20090807135208-hr5pokupqh14dpao --- bin/addons/base/base.sql | 2 +- bin/addons/base/ir/ir_model.py | 2 +- bin/osv/orm.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql index 91d5cc46561..58b30a89cf2 100644 --- a/bin/addons/base/base.sql +++ b/bin/addons/base/base.sql @@ -328,7 +328,7 @@ CREATE TABLE ir_model_data ( write_date timestamp without time zone, write_uid integer, noupdate boolean, - name character varying(64) NOT NULL, + name character varying(128) NOT NULL, date_init timestamp without time zone, date_update timestamp without time zone, module character varying(64) NOT NULL, diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py index 1e718144187..3d0c2942dbb 100644 --- a/bin/addons/base/ir/ir_model.py +++ b/bin/addons/base/ir/ir_model.py @@ -404,7 +404,7 @@ ir_model_access() class ir_model_data(osv.osv): _name = 'ir.model.data' _columns = { - 'name': fields.char('XML Identifier', required=True, size=64), + 'name': fields.char('XML Identifier', required=True, size=128), 'model': fields.char('Object', required=True, size=64), 'module': fields.char('Module', required=True, size=64), 'res_id': fields.integer('Resource ID'), diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 834b38e1e0c..b221a4a807b 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -382,11 +382,11 @@ class orm_template(object): )) if 'module' in context: name1 = 'field_' + self._table + '_' + k - cr.execute("select name from ir_model_data where name='%s'"%(name1)) + cr.execute("select name from ir_model_data where name=%s", (name1,)) if cr.fetchone(): name1 = name1 + "_" + str(id) cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, now(), now(), %s, %s, %s)", \ - (name1[:64], context['module'], 'ir.model.fields', id) + (name1, context['module'], 'ir.model.fields', id) ) else: for key, val in vals.items():