From 3b9bcb17cc878d4660306f08d4616b57deeec6d7 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Thu, 18 Dec 2008 23:17:55 +0100 Subject: [PATCH 1/2] [IMP] * order the database list in login connexion bzr revid: christophe.chauvet@syleam.fr-20081218221755-q0cwv6ph8w4xzk98 --- bin/service/web_services.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/service/web_services.py b/bin/service/web_services.py index 07fdd7412f9..81d8b7ce28c 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -246,9 +246,9 @@ class db(netsvc.Service): res = cr.fetchone() db_user = res and res[0] if db_user: - cr.execute("select datname from pg_database where datdba=(select usesysid from pg_user where usename=%s) and datname not in ('template0', 'template1', 'postgres')", (db_user,)) + cr.execute("select datname from pg_database where datdba=(select usesysid from pg_user where usename=%s) and datname not in ('template0', 'template1', 'postgres') order by datname", (db_user,)) else: - cr.execute("select datname from pg_database where datname not in('template0', 'template1','postgres')") + cr.execute("select datname from pg_database where datname not in('template0', 'template1','postgres') order by datname") res = [name for (name,) in cr.fetchall()] cr.close() except: From 9e72676066e05fe2cfe4b12a3d52a2f16401b361 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Fri, 19 Dec 2008 01:18:23 +0100 Subject: [PATCH 2/2] [IMP] * patch to authorized the database name started with a number * patch drop function to work with this improvement bzr revid: christophe.chauvet@syleam.fr-20081219001823-0ikl2j5ztcxlbhdy --- bin/service/web_services.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/service/web_services.py b/bin/service/web_services.py index f1946a01e88..08cf055dd11 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -70,7 +70,7 @@ class db(netsvc.Service): cr = db.cursor() cr.autocommit(True) time.sleep(0.2) - cr.execute('CREATE DATABASE ' + db_name + ' ENCODING \'unicode\'') + cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\'' % db_name) cr.close() class DBInitialize(object): def __call__(self, serv, id, db_name, demo, lang, user_password='admin'): @@ -149,7 +149,7 @@ class db(netsvc.Service): cr.autocommit(True) try: try: - cr.execute('DROP DATABASE ' + db_name) + cr.execute('DROP DATABASE "%s"' % db_name) except Exception, e: logger.notifyChannel("web-services", netsvc.LOG_ERROR, 'DROP DB: %s failed:\n%s' % (db_name, e)) @@ -198,7 +198,7 @@ class db(netsvc.Service): db = sql_db.db_connect('template1', serialize=1) cr = db.cursor() cr.autocommit(True) - cr.execute('CREATE DATABASE ' + db_name + ' ENCODING \'unicode\'') + cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\'' % db_name) cr.close() cmd = ['pg_restore']