File tree Expand file tree Collapse file tree 1 file changed +16
-2
lines changed Expand file tree Collapse file tree 1 file changed +16
-2
lines changed Original file line number Diff line number Diff line change 44import logging
55import os
66import mamonsu .lib .platform as platform
7+ if platform .WINDOWS :
8+ import win32api
9+ else :
10+ import getpass
711
812
913class PgsqlConfig (object ):
1014
1115 @staticmethod
1216 def default_user ():
13- user = os .environ .get ('PGUSER' ) or os .getlogin () or 'postgres'
17+ if platform .WINDOWS :
18+ username = win32api .GetUserName ()
19+ else :
20+ username = getpass .getuser ()
21+
22+ user = os .environ .get ('PGUSER' ) or username or 'postgres'
1423 return user
1524
1625 @staticmethod
@@ -40,7 +49,12 @@ def default_app():
4049
4150 @staticmethod
4251 def default_db ():
43- database = os .environ .get ('PGDATABASE' ) or os .environ .get ('PGUSER' ) or os .getlogin ()
52+ if platform .WINDOWS :
53+ username = win32api .GetUserName ()
54+ else :
55+ username = getpass .getuser ()
56+
57+ database = os .environ .get ('PGDATABASE' ) or os .environ .get ('PGUSER' ) or username
4458 database = database or 'postgres'
4559 return database
4660
You can’t perform that action at this time.
0 commit comments