Ticket #10357: db.patch

db/backends/mysql/client.py

@@ -1 +1 @@
 from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
+import sys
 
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'mysql'
 
     def runshell(self):
-        args = ['']
+        args = [self.executable_name]
         db = settings.DATABASE_OPTIONS.get('db', settings.DATABASE_NAME)
         user = settings.DATABASE_OPTIONS.get('user', settings.DATABASE_USER)
         passwd = settings.DATABASE_OPTIONS.get('passwd', settings.DATABASE_PASSWORD)
@@ -28 +29 @@
         if db:
             args += [db]
 
-        os.execvp(self.executable_name, args)
+        if os.name == 'nt':
+            sys.exit(os.system(" ".join(args)))
+        else:
+            os.execvp(self.executable_name, args)

db/backends/oracle/client.py

@@ -1 +1 @@
 from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
+import sys
 
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'sqlplus'
@@ -12 +13 @@
         if settings.DATABASE_NAME:
             dsn += "@%s" % settings.DATABASE_NAME
         args = [self.executable_name, "-L", dsn]
-        os.execvp(self.executable_name, args)
+        if os.name == 'nt':
+            sys.exit(os.system(" ".join(args)))
+        else:
+            os.execvp(self.executable_name, args)

db/backends/postgresql/client.py

@@ -1 +1 @@
 from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
+import sys
 
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'psql'
@@ -16 +17 @@
         if settings.DATABASE_PORT:
             args.extend(["-p", str(settings.DATABASE_PORT)])
         args += [settings.DATABASE_NAME]
-        os.execvp(self.executable_name, args)
+        if os.name == 'nt':
+            sys.exit(os.system(" ".join(args)))
+        else:
+            os.execvp(self.executable_name, args)

db/backends/sqlite3/client.py

@@ -1 +1 @@
 from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
+import sys
 
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'sqlite3'
 
     def runshell(self):
-        args = ['', settings.DATABASE_NAME]
-        os.execvp(self.executable_name, args)
+        args = [self.executable_name, settings.DATABASE_NAME]
+        if os.name == 'nt':
+            sys.exit(os.system(" ".join(args)))
+        else:
+            os.execvp(self.executable_name, args)