From dadc20e9d1d4bf92e6697823b2457205d054bb56 Mon Sep 17 00:00:00 2001 From: "HDA (OpenERP)" Date: Wed, 13 Jan 2010 18:23:41 +0530 Subject: [PATCH] FIXed merging bugs bzr revid: hda@tinyerp.com-20100113125341-69djvqrd7rkn6wj9 --- bin/osv/orm.py | 7 +++---- bin/service/web_services.py | 2 +- bin/tools/config.py | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 4d8c5544f51..9beb44b0297 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2414,10 +2414,9 @@ class orm(orm_template): raise except_orm(_('AccessError'), _('You try to bypass an access rule while reading (Document type: %s).') % self._description) else: - cr.execute('SELECT %s FROM \"%s\" WHERE id = ANY (%%s) ORDER BY %s' % \ - (','.join(fields_pre2 + ['id']), self._table, - ','.join(['%s' for x in sub_ids]), - order_by), sub_ids) + cr.execute('SELECT %s FROM \"%s\" WHERE id = ANY (%%s) ORDER BY %s' % + (','.join(fields_pre2 + ['id']), self._table, + order_by), (sub_ids,)) res.extend(cr.dictfetchall()) else: res = map(lambda x: {'id': x}, ids) diff --git a/bin/service/web_services.py b/bin/service/web_services.py index 0022e15bb8d..7d443980b5d 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -96,7 +96,7 @@ class db(netsvc.ExportService): serv.actions[id]['progress'] = 0 clean = False cr = sql_db.db_connect(db_name).cursor() -# tools.init_db(cr) + tools.init_db(cr) cr.commit() cr.close() cr = None diff --git a/bin/tools/config.py b/bin/tools/config.py index 8abc3a317b4..5cc32747b08 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -166,7 +166,6 @@ class configmanager(object): group.add_option("--db_port", dest="db_port", help="specify the database port", type="int") group.add_option("--db_maxconn", dest="db_maxconn", default='64', help="specify the the maximum number of physical connections to posgresql") - group.add_option("--list_db", dest="list_db", default=False, help="This option hides Database list for security purpose:\n \'False\' value disables listing of Databases") group.add_option("-P", "--import-partial", dest="import_partial", help="Use this for big data importation, if it crashes you will be able to continue at the current state. Provide a filename to store intermediate importation states.", default=False) parser.add_option_group(group)