Changeset 3073

Timestamp:

06/03/06 18:28:24 (2 years ago)

Author:

adrian

Message:

Fixed #593 -- Added 'search' DB-API lookup type, which does full-text index searches in MySQL

Files:

• django/trunk/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/docs/db-api.txt (modified) (1 diff)

django/trunk/django/db/backends/ado_mssql/base.py

@@ -126 +126 @@
-    return "RAND()"
-
+def get_fulltext_search_sql(field_name):
+    raise NotImplementedError
+
-def get_drop_foreignkey_sql():
-    return "DROP CONSTRAINT"

django/trunk/django/db/backends/dummy/base.py

@@ -34 +34 @@
-get_limit_offset_sql = complain
-get_random_function_sql = complain
+get_fulltext_search_sql = complain
-get_drop_foreignkey_sql = complain
-OPERATOR_MAPPING = {}

django/trunk/django/db/backends/mysql/base.py

@@ -153 +153 @@
-    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"

django/trunk/django/db/backends/oracle/base.py

@@ -109 +109 @@
-    return "DBMS_RANDOM.RANDOM"
-
+def get_fulltext_search_sql(field_name):
+    raise NotImplementedError
+
-def get_drop_foreignkey_sql():
-    return "DROP FOREIGN KEY"

django/trunk/django/db/backends/postgresql/base.py

@@ -103 +103 @@
-    return "RANDOM()"
-
+def get_fulltext_search_sql(field_name):
+    raise NotImplementedError
+
-def get_drop_foreignkey_sql():
-    return "DROP CONSTRAINT"

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

@@ -109 +109 @@
-    return "RANDOM()"
-
+def get_fulltext_search_sql(field_name):
+    raise NotImplementedError
+
-def get_drop_foreignkey_sql():
-    return "DROP CONSTRAINT"

django/trunk/django/db/backends/sqlite3/base.py

@@ -125 +125 @@
-    return "RANDOM()"
-
+def get_fulltext_search_sql(field_name):
+    raise NotImplementedError
+
-def get_drop_foreignkey_sql():
-    return ""

django/trunk/django/db/models/fields/__init__.py

@@ -163 +163 @@
-    def get_db_prep_lookup(self, lookup_type, value):
-        "Returns field's value prepared for database lookup."
-
+, 'search'
-            return [value]
-        elif lookup_type in ('range', 'in'):

django/trunk/django/db/models/query.py

@@ -616 +616 @@
-    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)
-

django/trunk/docs/db-api.txt

@@ -1036 +1036 @@
-    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
-~~~~~~~~~~~~~~~~~~~~~~~~~