From 7a16ddffa0da624ffbc7803597bb867eb2f97ef7 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 21 Nov 2006 16:52:51 +0000 Subject: [PATCH] - fix db encoding check --- tools/upgrade-db.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/upgrade-db.py b/tools/upgrade-db.py index 8c66854..e38a8b4 100755 --- a/tools/upgrade-db.py +++ b/tools/upgrade-db.py @@ -292,11 +292,10 @@ try: # check db encoding sql = " SELECT pg_catalog.pg_encoding_to_char(d.encoding)" \ " FROM pg_catalog.pg_database d " \ - " LEFT JOIN pg_catalog.pg_user u ON d.datdba = u.usesysid " \ " WHERE d.datname = '%s' " % config['PLC_DB_NAME'] cursor.execute(sql) rows = cursor.fetchall() - if rows[0][0] not in ['UTF8']: + if rows[0][0] not in ['UTF8', 'UNICODE']: print "WARNING: db encoding is not utf8. Attempting to encode" db.close() # generate db dump -- 2.43.0