Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #593 -- Added 'search' DB-API lookup type, which does full-text…

… index searches in MySQL

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 168429d5977592e8e5aaa8f740191711b1cbe054 1 parent 142e59b
Adrian Holovaty adrianholovaty authored
3  django/db/backends/ado_mssql/base.py
View
@@ -125,6 +125,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "RAND()"
+def get_fulltext_search_sql(field_name):
+ raise NotImplementedError
+
def get_drop_foreignkey_sql():
return "DROP CONSTRAINT"
1  django/db/backends/dummy/base.py
View
@@ -33,5 +33,6 @@ def close(self):
get_date_trunc_sql = complain
get_limit_offset_sql = complain
get_random_function_sql = complain
+get_fulltext_search_sql = complain
get_drop_foreignkey_sql = complain
OPERATOR_MAPPING = {}
3  django/db/backends/mysql/base.py
View
@@ -152,6 +152,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "RAND()"
+def get_fulltext_search_sql(field_name):
+ return 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % field_name
+
def get_drop_foreignkey_sql():
return "DROP FOREIGN KEY"
3  django/db/backends/oracle/base.py
View
@@ -108,6 +108,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "DBMS_RANDOM.RANDOM"
+def get_fulltext_search_sql(field_name):
+ raise NotImplementedError
+
def get_drop_foreignkey_sql():
return "DROP FOREIGN KEY"
3  django/db/backends/postgresql/base.py
View
@@ -102,6 +102,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "RANDOM()"
+def get_fulltext_search_sql(field_name):
+ raise NotImplementedError
+
def get_drop_foreignkey_sql():
return "DROP CONSTRAINT"
3  django/db/backends/postgresql_psycopg2/base.py
View
@@ -108,6 +108,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "RANDOM()"
+def get_fulltext_search_sql(field_name):
+ raise NotImplementedError
+
def get_drop_foreignkey_sql():
return "DROP CONSTRAINT"
3  django/db/backends/sqlite3/base.py
View
@@ -124,6 +124,9 @@ def get_limit_offset_sql(limit, offset=None):
def get_random_function_sql():
return "RANDOM()"
+def get_fulltext_search_sql(field_name):
+ raise NotImplementedError
+
def get_drop_foreignkey_sql():
return ""
2  django/db/models/fields/__init__.py
View
@@ -162,7 +162,7 @@ def get_db_prep_save(self, value):
def get_db_prep_lookup(self, lookup_type, value):
"Returns field's value prepared for database lookup."
- if lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte', 'ne', 'year', 'month', 'day'):
+ if lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte', 'ne', 'year', 'month', 'day', 'search'):
return [value]
elif lookup_type in ('range', 'in'):
return value
2  django/db/models/query.py
View
@@ -615,6 +615,8 @@ def get_where_clause(lookup_type, table_prefix, field_name, value):
return "%s = %%s" % backend.get_date_extract_sql(lookup_type, table_prefix + field_name)
elif lookup_type == 'isnull':
return "%s%s IS %sNULL" % (table_prefix, field_name, (not value and 'NOT ' or ''))
+ elif lookup_type == 'search':
+ return backend.get_fulltext_search_sql(table_prefix + field_name)
raise TypeError, "Got invalid lookup_type: %s" % repr(lookup_type)
def get_cached_row(klass, row, index_start):
9 docs/db-api.txt
View
@@ -1035,6 +1035,15 @@ SQL equivalent::
SELECT ... WHERE pub_date IS NULL;
+search
+~~~~~~
+
+A boolean full-text search, taking advantage of full-text indexing. This is
+like ``contains`` but is significantly faster due to full-text indexing.
+
+Note this is only available in MySQL and requires direct manipulation of the
+database to add the full-text index.
+
Default lookups are exact
~~~~~~~~~~~~~~~~~~~~~~~~~
Please sign in to comment.
Something went wrong with that request. Please try again.