git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix db encoding check
[plcapi.git]
/
tools
/
upgrade-db.py
diff --git
a/tools/upgrade-db.py
b/tools/upgrade-db.py
index
8c66854
..
e38a8b4
100755
(executable)
--- 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 " \
# 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()
" 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
print "WARNING: db encoding is not utf8. Attempting to encode"
db.close()
# generate db dump