--- a/app/django/db/backends/postgresql/client.py	Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/db/backends/postgresql/client.py	Tue Oct 14 16:00:59 2008 +0000
@@ -1,15 +1,19 @@
+from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
 
-def runshell():
-    args = ['psql']
-    if settings.DATABASE_USER:
-        args += ["-U", settings.DATABASE_USER]
-    if settings.DATABASE_PASSWORD:
-        args += ["-W"]
-    if settings.DATABASE_HOST:
-        args.extend(["-h", settings.DATABASE_HOST])
-    if settings.DATABASE_PORT:
-        args.extend(["-p", str(settings.DATABASE_PORT)])
-    args += [settings.DATABASE_NAME]
-    os.execvp('psql', args)
+class DatabaseClient(BaseDatabaseClient):
+    executable_name = 'psql'
+
+    def runshell(self):
+        args = [self.executable_name]
+        if settings.DATABASE_USER:
+            args += ["-U", settings.DATABASE_USER]
+        if settings.DATABASE_PASSWORD:
+            args += ["-W"]
+        if settings.DATABASE_HOST:
+            args.extend(["-h", settings.DATABASE_HOST])
+        if settings.DATABASE_PORT:
+            args.extend(["-p", str(settings.DATABASE_PORT)])
+        args += [settings.DATABASE_NAME]
+        os.execvp(self.executable_name, args)