Ticket #18332: ticket18332-patch2.diff

django/db/backends/__init__.py

@@ -310 +310 @@
 
     def make_debug_cursor(self, cursor):
         return util.CursorDebugWrapper(cursor, self)
+        
+    def backend_info(self):
+        """
+        Returns a namedtuple that containd the name and version tuple
+        from the current database.
+        """
+        return self._get_backend_info()
 
 class BaseDatabaseFeatures(object):
     allows_group_by_pk = False

django/db/backends/sqlite3/base.py

@@ -10 +10 @@
 import warnings
 import re
 import sys
+import sqlite3
 
+from collections import namedtuple
 from django.db import utils
 from django.db.backends import *
 from django.db.backends.signals import connection_created
@@ -26 +28 @@
         from pysqlite2 import dbapi2 as Database
     except ImportError:
         from sqlite3 import dbapi2 as Database
+        from sqlite3 import sqlite_version
 except ImportError as exc:
     from django.core.exceptions import ImproperlyConfigured
     raise ImproperlyConfigured("Error loading either pysqlite2 or sqlite3 modules (tried in that order): %s" % exc)
@@ -322 +325 @@
         # an in-memory db.
         if self.settings_dict['NAME'] != ":memory:":
             BaseDatabaseWrapper.close(self)
+    
+    def _get_backend_info(self):
+        version_tuple = tuple(map(lambda x: int(x), sqlite_version.split('.')))
+        BackendInfo = namedtuple('BackendInfo', 'vendor version')
+        return BackendInfo(self.vendor, version_tuple)
 
 FORMAT_QMARK_REGEX = re.compile(r'(?<!%)%s')
 

docs/releases/1.5.txt

@@ -33 +33 @@
 What's new in Django 1.5
 ========================
 
+Backend info
+~~~~~~~~~~~~
+ *  It was added connection.backend_info() that returns the name and the version of the current database. 
+    Authors of other backends should implement this in their custom backends.
+
+ *  Use of backend_info:
+    >>> from django.db import connection
+    >>> connection.backend_info()
+    BackendInfo(vendor='sqlite', version=(3, 7, 2))
+
+
 Support for saving a subset of model's fields
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

tests/regressiontests/backends/tests.py

@@ -4 +4 @@
 
 import datetime
 import threading
-
+from sqlite3 import sqlite_version
 from django.conf import settings
 from django.core.management.color import no_style
 from django.core.exceptions import ImproperlyConfigured
@@ -409 +409 @@
         query = 'CREATE TABLE %s (id INTEGER);' % models.Article._meta.db_table
         with self.assertRaises(DatabaseError):
             cursor.execute(query)
+            
+    def test_backend_info_sqlite(self):
+        self.assertEqual(connection.vendor, connection.backend_info().vendor)
+        version_tuple = tuple(map(lambda x: int(x), sqlite_version.split('.')))
+        self.assertEqual(version_tuple, connection.backend_info().version)            
 
 # We don't make these tests conditional because that means we would need to
 # check and differentiate between: