Changeset 5957

Timestamp:

08/19/07 18:13:06 (1 year ago)

Author:

adrian

Message:

Refactored get_fulltext_search_sql() to DatabaseOperations?.fulltext_search_sql(). Refs #5106

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/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (2 diffs)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (2 diffs)
• 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/query.py (modified) (1 diff)

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

@@ -111 +111 @@
-    return "RAND()"
-
-def get_fulltext_search_sql(field_name):
-    raise NotImplementedError
-
-def get_pk_default_value():
-    return "DEFAULT"

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

@@ -47 +47 @@
-get_limit_offset_sql = complain
-get_random_function_sql = complain
-get_fulltext_search_sql = complain
-get_pk_default_value = complain
-get_max_name_length = ignore

django/trunk/django/db/backends/__init__.py

@@ -92 +92 @@
-        """
-        return "DROP CONSTRAINT"
+
+    def fulltext_search_sql(self, field_name):
+        """
+        Returns the SQL WHERE clause to use in order to perform a full-text
+        search of the given field_name. Note that the resulting string should
+        contain a '%s' placeholder for the value being searched against.
+        """
+        raise NotImplementedError('Full-text search is not implemented for this database backend')

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

@@ -74 +74 @@
-    def drop_foreignkey_sql(self):
-        return "DROP FOREIGN KEY"
+
+    def fulltext_search_sql(self, field_name):
+        return 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % field_name
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -165 +168 @@
-    return "RAND()"
-
-def get_fulltext_search_sql(field_name):
-    return 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % field_name
-
-def get_pk_default_value():
-    return "DEFAULT"

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

@@ -84 +84 @@
-    def drop_foreignkey_sql(self):
-        return "DROP FOREIGN KEY"
+
+    def fulltext_search_sql(self, field_name):
+        return 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % field_name
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -184 +187 @@
-    return "RAND()"
-
-def get_fulltext_search_sql(field_name):
-    return 'MATCH (%s) AGAINST (%%s IN BOOLEAN MODE)' % field_name
-
-def get_pk_default_value():
-    return "DEFAULT"

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

@@ -186 +186 @@
-def get_random_function_sql():
-    return "DBMS_RANDOM.RANDOM"
-
-def get_fulltext_search_sql(field_name):
-    raise NotImplementedError
-
-def get_pk_default_value():

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

@@ -140 +140 @@
-def get_random_function_sql():
-    return "RANDOM()"
-
-def get_fulltext_search_sql(field_name):
-    raise NotImplementedError
-
-def get_pk_default_value():

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

@@ -94 +94 @@
-def get_random_function_sql():
-    return "RANDOM()"
-
-def get_fulltext_search_sql(field_name):
-    raise NotImplementedError
-
-def get_pk_default_value():

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

@@ -127 +127 @@
-def get_random_function_sql():
-    return "RANDOM()"
-
-def get_fulltext_search_sql(field_name):
-    raise NotImplementedError
-
-def get_pk_default_value():

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

@@ -811 +811 @@
-        return "%s IS %sNULL" % (field_sql, (not value and 'NOT ' or ''))
-    elif lookup_type == 'search':
-backend.get_
+connection.ops.
-    elif lookup_type in ('regex', 'iregex'):
-        if settings.DATABASE_ENGINE == 'oracle':