From 26e0697196920b55c51c7e8009fa32a6460c34b7 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Wed, 5 Oct 2016 13:46:31 +0200 Subject: [PATCH] Bug 1306609 - BrowserProvider.getHighlights(): Reorder columns. r=ahunt The UNION operator requires the two result sets to have the columns in the same order. MozReview-Commit-ID: JRtw0LDZ5ib --HG-- extra : rebase_source : a2cc6b2a9190cf9fb8ec75351446e0a91e613710 --- .../android/base/java/org/mozilla/gecko/db/BrowserProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java index 2a0d62ad80d4..715b13d691f9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java @@ -1199,8 +1199,8 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider { // Select recent bookmarks that have not been visited much final String bookmarksQuery = "SELECT * FROM (SELECT " + - DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + "-1 AS " + Combined.HISTORY_ID + ", " + + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.URL) + ", " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.TITLE) + ", " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.DATE_CREATED) + " AS " + Highlights.DATE + " " +