[1.0.X] Fixed #9814 -- Allowed SafeStrings to be saved to sqlite DB when running on Python 2.6.

r9654 from trunk, also updated merge metadata to reflect that all other bugfix changetsets have been merged.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9655 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 0 deletions

diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 745f9982a0..15b0e983ad 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -10,6 +10,7 @@ from django.db.backends import *
 from django.db.backends.sqlite3.client import DatabaseClient
 from django.db.backends.sqlite3.creation import DatabaseCreation
 from django.db.backends.sqlite3.introspection import DatabaseIntrospection
+from django.utils.safestring import SafeString                                                           
 
 try:
     try:
@@ -49,6 +50,7 @@ if Database.version_info >= (2,4,1):
     # slow-down, this adapter is only registered for sqlite3 versions
     # needing it.
     Database.register_adapter(str, lambda s:s.decode('utf-8'))
+    Database.register_adapter(SafeString, lambda s:s.decode('utf-8'))
 
 class DatabaseFeatures(BaseDatabaseFeatures):
     # SQLite cannot handle us only partially reading from a cursor's result set