Correct pgpass.conf resolution on win32.

James William Pye · James William Pye · commit a8f3183eb2a5 · 2009-06-11T15:10:35.000-07:00
diff --git a/postgresql/clientparameters.py b/postgresql/clientparameters.py
@@ -128,12 +128,13 @@ def defaults(environ = os.environ):
 
 	# If appdata is available, override the pgdata and pgpassfile
 	# configuration settings.
-	pgpassfile = os.path.join(userdir, pg_home_passfile)
 	if sys.platform == 'win32':
 		appdata = environ.get('APPDATA')
 		if appdata:
 			pgdata = os.path.join(appdata, pg_appdata_directory)
-			pgpassfile = os.path.join(appdata, pg_appdata_passfile)
+			pgpassfile = os.path.join(pgdata, pg_appdata_passfile)
+	else:
+		pgpassfile = os.path.join(userdir, pg_home_passfile)
 
 	for k, v in (
 		('sslcrtfile', os.path.join(pgdata, 'postgresql.crt')),
diff --git a/postgresql/documentation/changes.py b/postgresql/documentation/changes.py
@@ -13,6 +13,7 @@
    a mechanism that would use SQL predefined type names instead of
    qualified names. [#1010620, Reported by Dallas Morisett]
  * Fix DB-API setting of rowcount after execute. [Reported by Mike Bayer; 1010643]
+ * Fix pgpass.conf resolution on win32
 
 0.8.1 released on 2009-04-30
 ----------------------------
