Changeset 2736

Timestamp:

04/23/06 17:18:53 (3 years ago)

Author:

adrian

Message:

magic-removal: Fixed #1481 -- Added support for using alternate MySQL Unix sockets. Thanks, Geert Vanderkelen

Files:

• django/branches/magic-removal/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/magic-removal/docs/settings.txt (modified) (1 diff)

django/branches/magic-removal/django/db/backends/mysql/base.py

@@ -76 +76 @@
-                'db': settings.DATABASE_NAME,
-                'passwd': settings.DATABASE_PASSWORD,
-                'host': settings.DATABASE_HOST,
-                'conv': django_conversions,
-            }
+            if settings.DATABASE_HOST.startswith('/'):
+                kwargs['unix_socket'] = settings.DATABASE_HOST
+            else:
+                kwargs['host'] = settings.DATABASE_HOST
-            if settings.DATABASE_PORT:
-                kwargs['port'] = int(settings.DATABASE_PORT)

django/branches/magic-removal/docs/settings.txt

@@ -239 +239 @@
-Which host to use when connecting to the database. An empty string means
-localhost. Not used with SQLite.
+
+If this value starts with a forward slash (``'/'``) and you're using MySQL,
+MySQL will connect via a Unix socket to the specified socket. For example::
+
+    DATABASE_HOST = '/var/run/mysql'
+
+If you're using MySQL and this value *doesn't* start with a forward slash, then
+this value is assumed to be the host.
-
-DATABASE_NAME