Ticket #593: matchoperator.diff

core/db/__init__.py

@@ -37 +37 @@
-get_table_list = dbmod.get_table_list
-get_table_description = dbmod.get_table_description
-get_relations = dbmod.get_relations
+get_fulltext_op_sql = dbmod.get_fulltext_op_sql
-OPERATOR_MAPPING = dbmod.OPERATOR_MAPPING
-DATA_TYPES = dbmod.DATA_TYPES
-DATA_TYPES_REVERSE = dbmod.DATA_TYPES_REVERSE

core/db/backends/ado_mssql.py

@@ -118 +118 @@
-def get_relations(cursor, table_name):
-    raise NotImplementedError
-
+def get_fulltext_op_sql():
+    raise NotImplementedError
+
-OPERATOR_MAPPING = {
-    'exact': '= %s',
-    'iexact': 'LIKE %s',

core/db/backends/mysql.py

@@ -132 +132 @@
-def get_relations(cursor, table_name):
-    raise NotImplementedError
-
+def get_fulltext_op_sql(**kwargs):
+    return "match (%s%s) against ('%s' in boolean mode)"
+
-OPERATOR_MAPPING = {
-    'exact': '= %s',
-    'iexact': 'LIKE %s',

core/db/backends/postgresql.py

@@ -126 +126 @@
-            continue
-    return relations
-
+def get_fulltext_op_sql():
+    raise NotImplementedError
+
-# Register these custom typecasts, because Django expects dates/times to be
-# in Python's native (standard-library) datetime/time format, whereas psycopg
-# use mx.DateTime by default.

core/db/backends/sqlite3.py

@@ -134 +134 @@
-def get_relations(cursor, table_name):
-    raise NotImplementedError
-
+def get_fulltext_op_sql():
+        raise NotImplementedError
+
-# Operators and fields ########################################################
-
-# SQLite requires LIKE statements to include an ESCAPE clause if the value

core/meta/__init__.py

@@ -1349 +1349 @@
-        return "%s = %%s" % db.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 == 'match':
+        return db.get_fulltext_op_sql() % (table_prefix, field_name, value)
-    raise TypeError, "Got invalid lookup_type: %s" % repr(lookup_type)
-
-def function_get_object(opts, klass, does_not_exist_exception, **kwargs):

core/meta/fields.py

@@ -189 +189 @@
-            return ["%s%%" % prep_for_like_query(value)]
-        elif lookup_type in ('endswith', 'iendswith'):
-            return ["%%%s" % prep_for_like_query(value)]
-== 'isnull'
+in ('isnull', 'match')
-            return []
-        raise TypeError, "Field has invalid lookup: %s" % lookup_type
-