Ticket #1631: dbclient.patch

django/db/backends/postgresql/base.py

@@ -98 +98 @@
 def get_random_function_sql():
     return "RANDOM()"
 
+def exec_client():
+    """Execute psql commandline client using current project's DB settings"""
+    from django.conf import settings
+    import os
+    args = ['']
+    args += ["-U %s" % settings.DATABASE_USER]
+    if settings.DATABASE_PASSWORD:
+        args += ["-W"]
+    if settings.DATABASE_HOST:
+        args += ["-h %s" % settings.DATABASE_HOST]
+    if settings.DATABASE_PORT:
+        args += ["-p %s" % settings.DATABASE_PORT]
+    args += [settings.DATABASE_NAME]
+    os.execvp('psql', args)
+
 # Register these custom typecasts, because Django expects dates/times to be
 # in Python's native (standard-library) datetime/time format, whereas psycopg
 # use mx.DateTime by default.

django/db/backends/sqlite3/base.py

@@ -128 +128 @@
     elif lookup_type == 'day':
         return "%i-%02i-%02i 00:00:00" % (dt.year, dt.month, dt.day)
 
+def exec_client():
+    """Execute SQLite client using current DB settings"""
+    from django.conf import settings
+    import os
+    args = ['', settings.DATABASE_NAME]
+    os.execvp('sqlite3', args)
+                                
 # SQLite requires LIKE statements to include an ESCAPE clause if the value
 # being escaped has a percent or underscore in it.
 # See http://www.sqlite.org/lang_expr.html for an explanation.

django/db/backends/mysql/base.py

@@ -146 +146 @@
 def get_random_function_sql():
     return "RAND()"
 
+def exec_client():
+    """Execute MySQL commandline client using current project's DB settings"""
+    from django.conf import settings
+    import os
+    args = ['']
+    args += ["--user=%s" % settings.DATABASE_USER]
+    if settings.DATABASE_PASSWORD:
+        args += ["--password=%s" % settings.DATABASE_PASSWORD]
+    if settings.DATABASE_HOST:
+        args += ["--host=%s" % settings.DATABASE_HOST]
+    if settings.DATABASE_PORT:
+        args += ["--port=%s" % settings.DATABASE_PORT]
+    args += [settings.DATABASE_NAME]
+    os.execvp('mysql', args)
+
 OPERATOR_MAPPING = {
     'exact': '= %s',
     'iexact': 'LIKE %s',

django/db/backends/dummy/base.py

@@ -23 +23 @@
     def close(self):
         pass # close()
 
+def exec_client():
+    print "DATABASE_ENGINE is not set."
+
 supports_constraints = False
 quote_name = complain
 dictfetchone = complain

django/core/management.py

@@ -1038 +1038 @@
         code.interact()
 run_shell.args = '[--plain]'
 
+def dbclient():
+    """Run interactive client for current DATABASE_ENGINE"""
+    from django.db import backend
+    backend.exec_client()
+dbclient.args = ""
+
 # Utilities for command-line script
 
 DEFAULT_ACTION_MAPPING = {
     'adminindex': get_admin_index,
     'createcachetable' : createcachetable,
+    'dbclient': dbclient,
     'diffsettings': diffsettings,
     'inspectdb': inspectdb,
     'install': install,
@@ -1065 +1072 @@
 NO_SQL_TRANSACTION = (
     'adminindex',
     'createcachetable',
+    'dbclient',
     'diffsettings',
     'install',
     'reset',
     'sqlindexes',
-    'syncdb'
+    'syncdb',
 )
 
 class DjangoOptionParser(OptionParser):
@@ -1131 +1139 @@
 
     if action == 'shell':
         action_mapping[action](options.plain is True)
-    elif action in ('syncdb', 'validate', 'diffsettings'):
+    elif action in ('syncdb', 'validate', 'diffsettings', 'dbclient'):
         action_mapping[action]()
     elif action == 'inspectdb':
         try: