From 43464b624348d580ba337471b848f261febdcf77 Mon Sep 17 00:00:00 2001 From: TERAOKA Yoshinori Date: Thu, 5 Sep 2013 12:40:16 +0900 Subject: [PATCH] fix get_db_info using pg_roles instead of pg_user if database owner is a role (not user) then it can not select form pg_user table. --- library/database/postgresql_db | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/database/postgresql_db b/library/database/postgresql_db index 7f08c5f1bd5..f7274da8846 100644 --- a/library/database/postgresql_db +++ b/library/database/postgresql_db @@ -130,10 +130,10 @@ def get_encoding_id(cursor, encoding): def get_db_info(cursor, db): query = """ - SELECT usename AS owner, + SELECT rolname AS owner, pg_encoding_to_char(encoding) AS encoding, encoding AS encoding_id, datcollate AS lc_collate, datctype AS lc_ctype - FROM pg_database JOIN pg_user ON pg_user.usesysid = pg_database.datdba + FROM pg_database JOIN pg_roles ON pg_roles.oid = pg_database.datdba WHERE datname = %(db)s """ cursor.execute(query, {'db':db})