mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

reverted changes from [1534] and [1536] regarding ticket #966

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer
2005-12-04 18:54:44 +00:00
parent e19edfbea0
commit c464e57da9
6 changed files with 42 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/core/db/backends/ado_mssql.py
View File

@@ -132,12 +132,6 @@ OPERATOR_MAPPING = {
'endswith': 'LIKE %s',
'istartswith': 'LIKE %s',
'iendswith': 'LIKE %s',
'notcontains': 'NOT LIKE %s',
'notstartswith': 'NOT LIKE %s',
'notendswith': 'NOT LIKE %s',
'inotcontains': 'NOT LIKE %s',
'inotstartswith': 'NOT LIKE %s',
'inotendswith': 'NOT LIKE %s',
}
DATA_TYPES = {

6
django/core/db/backends/mysql.py
View File

@@ -146,12 +146,6 @@ OPERATOR_MAPPING = {
'endswith': 'LIKE BINARY %s',
'istartswith': 'LIKE %s',
'iendswith': 'LIKE %s',
'notcontains': 'NOT LIKE BINARY %s',
'notstartswith': 'NOT LIKE BINARY %s',
'notendswith': 'NOT LIKE BINARY %s',
'inotcontains': 'NOT LIKE %s',
'inotstartswith': 'NOT LIKE %s',
'inotendswith': 'NOT LIKE %s',
}
# This dictionary maps Field objects to their associated MySQL column

6
django/core/db/backends/postgresql.py
View File

@@ -151,12 +151,6 @@ OPERATOR_MAPPING = {
'endswith': 'LIKE %s',
'istartswith': 'ILIKE %s',
'iendswith': 'ILIKE %s',
'notcontains': 'NOT LIKE %s',
'notstartswith': 'NOT LIKE %s',
'notendswith': 'NOT LIKE %s',
'inotcontains': 'NOT ILIKE %s',
'inotstartswith': 'NOT ILIKE %s',
'inotendswith': 'NOT ILIKE %s',
}
# This dictionary maps Field objects to their associated PostgreSQL column

6
django/core/db/backends/sqlite3.py
View File

@@ -153,12 +153,6 @@ OPERATOR_MAPPING = {
'endswith': "LIKE %s ESCAPE '\\'",
'istartswith': "LIKE %s ESCAPE '\\'",
'iendswith': "LIKE %s ESCAPE '\\'",
'notcontains': "NOT LIKE %s ESCAPE '\\'",
'notstartswith': "NOT LIKE %s ESCAPE '\\'",
'notendswith': "NOT LIKE %s ESCAPE '\\'",
'inotcontains': "NOT LIKE %s ESCAPE '\\'",
'inotstartswith': "NOT LIKE %s ESCAPE '\\'",
'inotendswith': "NOT LIKE %s ESCAPE '\\'",
}
# SQLite doesn't actually support most of these types, but it "does the right

6
django/core/meta/fields.py
View File

@@ -181,13 +181,13 @@ class Field(object):
return value
elif lookup_type == 'year':
return ['%s-01-01' % value, '%s-12-31' % value]
elif lookup_type in ('contains', 'icontains', 'notcontains', 'inotcontains'):
elif lookup_type in ('contains', 'icontains'):
return ["%%%s%%" % prep_for_like_query(value)]
elif lookup_type == 'iexact':
return [prep_for_like_query(value)]
elif lookup_type in ('startswith', 'istartswith', 'notstartswith', 'inotstartswith'):
elif lookup_type in ('startswith', 'istartswith'):
return ["%s%%" % prep_for_like_query(value)]
elif lookup_type in ('endswith', 'iendswith', 'notendswith', 'inotendswith'):
elif lookup_type in ('endswith', 'iendswith'):
return ["%%%s" % prep_for_like_query(value)]
elif lookup_type == 'isnull':
return []