diff -r b758351d191f -r cc9b7e14412b web/lib/django/db/backends/postgresql/client.py
--- a/web/lib/django/db/backends/postgresql/client.py	Wed May 19 17:43:59 2010 +0200
+++ b/web/lib/django/db/backends/postgresql/client.py	Tue May 25 02:43:45 2010 +0200
@@ -9,13 +9,13 @@
     def runshell(self):
         settings_dict = self.connection.settings_dict
         args = [self.executable_name]
-        if settings_dict['DATABASE_USER']:
-            args += ["-U", settings_dict['DATABASE_USER']]
-        if settings_dict['DATABASE_HOST']:
-            args.extend(["-h", settings_dict['DATABASE_HOST']])
-        if settings_dict['DATABASE_PORT']:
-            args.extend(["-p", str(settings_dict['DATABASE_PORT'])])
-        args += [settings_dict['DATABASE_NAME']]
+        if settings_dict['USER']:
+            args += ["-U", settings_dict['USER']]
+        if settings_dict['HOST']:
+            args.extend(["-h", settings_dict['HOST']])
+        if settings_dict['PORT']:
+            args.extend(["-p", str(settings_dict['PORT'])])
+        args += [settings_dict['NAME']]
         if os.name == 'nt':
             sys.exit(os.system(" ".join(args)))
         else: