From 725365fe1021e63a784e9e1f0b71ba78eba6c164 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PINCE Date: Thu, 19 Jul 2012 10:07:02 +0800 Subject: Fix the issue the SQL request built by QuickSearchBox is not handled properly by Sqlite3. SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC has to be replaced with: SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (bookmarks.url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC Change-Id: Ib9fc03c2e102cca83c09168f75f2911a191af5ae Author: Jean-Christophe PINCE Signed-off-by: Xiaokang Qin Signed-off-by: Bruce Beare Signed-off-by: Jack Ren Author-tracking-BZ: 43188 --- res/xml/bookmarks_searchable.xml | 2 +- res/xml/searchable.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/xml/bookmarks_searchable.xml b/res/xml/bookmarks_searchable.xml index de56add..8b83f26 100644 --- a/res/xml/bookmarks_searchable.xml +++ b/res/xml/bookmarks_searchable.xml @@ -25,6 +25,6 @@ android:searchSettingsDescription="@string/search_settings_description" android:searchSuggestAuthority="browser" android:searchSuggestPath="bookmarks" - android:searchSuggestSelection="url LIKE ?" + android:searchSuggestSelection="bookmarks.url LIKE ?" android:searchSuggestIntentAction="android.intent.action.VIEW" /> diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml index 3397a40..a06d5b0 100644 --- a/res/xml/searchable.xml +++ b/res/xml/searchable.xml @@ -27,6 +27,6 @@ android:inputType="textUri" android:imeOptions="actionGo" android:searchSuggestAuthority="browser" - android:searchSuggestSelection="url LIKE ?" + android:searchSuggestSelection="history.url LIKE ?" android:searchSuggestIntentAction="android.intent.action.VIEW" /> -- cgit v1.1