Forces case insensitivity on mysql fts by forcin upper case.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@933 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum_modules/mysqlfulltext/fts_install.sql b/forum_modules/mysqlfulltext/fts_install.sql
index 4cd6bd1911c064f9abe60a955199f94598d0c3a3..5ad821e36017956fcfb02cc36c56f8fcd6742e26 100644 (file)
--- a/forum_modules/mysqlfulltext/fts_install.sql
+++ b/forum_modules/mysqlfulltext/fts_install.sql
@@ -14,7 +14,7 @@ delimiter |
 CREATE TRIGGER fts_on_insert AFTER INSERT ON forum_node
   FOR EACH ROW
   BEGIN
-    INSERT INTO forum_mysqlftsindex (node_id, body) VALUES (NEW.id, CONCAT_WS('\n', NEW.title, NEW.body, NEW.tagnames));
+    INSERT INTO forum_mysqlftsindex (node_id, body) VALUES (NEW.id, UPPER(CONCAT_WS('\n', NEW.title, NEW.body, NEW.tagnames)));
   END;
 |
 
@@ -23,9 +23,9 @@ delimiter |
 CREATE TRIGGER fts_on_update AFTER UPDATE ON forum_node
   FOR EACH ROW
   BEGIN
-    UPDATE forum_mysqlftsindex SET body = CONCAT_WS('\n', NEW.title, NEW.body, NEW.tagnames) WHERE node_id = NEW.id;
+    UPDATE forum_mysqlftsindex SET body = UPPER(CONCAT_WS('\n', NEW.title, NEW.body, NEW.tagnames)) WHERE node_id = NEW.id;
   END;
 
 |
 
-INSERT INTO forum_mysqlftsindex (node_id, body) SELECT id, CONCAT_WS('\n', title, body, tagnames) FROM forum_node;
\ No newline at end of file
+INSERT INTO forum_mysqlftsindex (node_id, body) SELECT id, UPPER(CONCAT_WS('\n', title, body, tagnames)) FROM forum_node;
\ No newline at end of file

diff --git a/forum_modules/mysqlfulltext/startup.py b/forum_modules/mysqlfulltext/startup.py
index 363b4e1cb57bbe87020cfa6e345b41dc477ca464..b1031a532bccf8519a12f50159155deec9f05483 100644 (file)
--- a/forum_modules/mysqlfulltext/startup.py
+++ b/forum_modules/mysqlfulltext/startup.py
@@ -31,4 +31,4 @@ word_re = re.compile(r'\w+', re.UNICODE)
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
-    return False, self.filter(models.Q(ftsindex__body__search=keywords))
\ No newline at end of file
+    return False, self.filter(models.Q(ftsindex__body__search=keywords.upper()))
\ No newline at end of file