Django

Code

Changeset 8532

Show
Ignore:
Timestamp:
08/24/08 23:13:27 (3 months ago)
Author:
mtredinnick
Message:

Fixed #7464 -- Fixed the psycopg2 backend to handle SafeString? values as
parameters. Based on a patch from Digitalxero@gmail.com.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/backends/postgresql_psycopg2/base.py

    r8317 r8532  
    1111from django.db.backends.postgresql.version import get_version 
    1212from django.db.backends.postgresql_psycopg2.introspection import DatabaseIntrospection 
     13from django.utils.safestring import SafeUnicode, SafeString 
    1314 
    14 from django.utils.safestring import SafeUnicode 
    1515try: 
    1616    import psycopg2 as Database 
    …… 
    2424 
    2525psycopg2.extensions.register_type(psycopg2.extensions.UNICODE) 
     26psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString) 
    2627psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString) 
    2728 

  • django/trunk/tests/modeltests/field_defaults/models.py

    r6816 r8532  
    5050True 
    5151 
    52 # make sure that SafeUnicode fields work 
    53 >>> from django.utils.safestring import SafeUnicode 
     52# make sure that SafeString/SafeUnicode fields work 
     53>>> from django.utils.safestring import SafeUnicode, SafeString 
    5454>>> a.headline = SafeUnicode(u'SafeUnicode Headline') 
    5555>>> a.save() 
     56>>> a.headline = SafeString(u'SafeString Headline') 
     57>>> a.save() 
    5658"""}