Fixed #5461 -- Refactored the database backend code to use classes for the creation and introspection modules. Introduces a new validation module for DB-specific validation. This is a backwards incompatible change; see the wiki for details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8296 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 24 insertions, 22 deletions

diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py
index 116074a9ce..24758867af 100644
--- a/django/db/backends/mysql/client.py
+++ b/django/db/backends/mysql/client.py
@@ -1,27 +1,29 @@
+from django.db.backends import BaseDatabaseClient
 from django.conf import settings
 import os
 
-def runshell():
-    args = ['']
-    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)
-    host = settings.DATABASE_OPTIONS.get('host', settings.DATABASE_HOST)
-    port = settings.DATABASE_OPTIONS.get('port', settings.DATABASE_PORT)
-    defaults_file = settings.DATABASE_OPTIONS.get('read_default_file')
-    # Seems to be no good way to set sql_mode with CLI
+class DatabaseClient(BaseDatabaseClient):
+    def runshell(self):
+        args = ['']
+        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)
+        host = settings.DATABASE_OPTIONS.get('host', settings.DATABASE_HOST)
+        port = settings.DATABASE_OPTIONS.get('port', settings.DATABASE_PORT)
+        defaults_file = settings.DATABASE_OPTIONS.get('read_default_file')
+        # Seems to be no good way to set sql_mode with CLI
     
-    if defaults_file:
-        args += ["--defaults-file=%s" % defaults_file]
-    if user:
-        args += ["--user=%s" % user]
-    if passwd:
-        args += ["--password=%s" % passwd]
-    if host:
-        args += ["--host=%s" % host]
-    if port:
-        args += ["--port=%s" % port]
-    if db:
-        args += [db]
+        if defaults_file:
+            args += ["--defaults-file=%s" % defaults_file]
+        if user:
+            args += ["--user=%s" % user]
+        if passwd:
+            args += ["--password=%s" % passwd]
+        if host:
+            args += ["--host=%s" % host]
+        if port:
+            args += ["--port=%s" % port]
+        if db:
+            args += [db]
 
-    os.execvp('mysql', args)
+        os.execvp('mysql', args)