Bug 1306609 - BrowserProvider.getHighlights(): Reorder columns. r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Wed, 05 Oct 2016 13:46:31 +0200
changeset 421146 6b81c5972721ae8ece4a7efa08714ab3b80a25c0
parent 420794 33b3f0d70e95570121da85b211d21cc7c190221a
child 421147 1abc8d4c45781af8e4574bdc5d1c63f3c4c756a1
push id31401
push users.kaspari@gmail.com
push dateWed, 05 Oct 2016 12:01:12 +0000
reviewersahunt
bugs1306609
milestone52.0a1
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
mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
@@ -1194,18 +1194,18 @@ public class BrowserProvider extends Sha
     public Cursor getHighlights(final SQLiteDatabase db, String limit) {
         final int totalLimit = limit == null ? 20 : Integer.parseInt(limit);
 
         final long threeDaysAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24 * 3);
         final long bookmarkLimit = 1;
 
         // Select recent bookmarks that have not been visited much
         final String bookmarksQuery = "SELECT * FROM (SELECT " +
+                "-1 AS " + Combined.HISTORY_ID + ", " +
                 DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks._ID) + " AS " + Combined.BOOKMARK_ID + ", " +
-                "-1 AS " + Combined.HISTORY_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 + " " +
                 "FROM " + Bookmarks.TABLE_NAME + " " +
                 "LEFT JOIN " + History.TABLE_NAME + " ON " +
                     DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.URL) + " = " +
                     DBUtils.qualifyColumn(History.TABLE_NAME, History.URL) + " " +
                 "WHERE " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.DATE_CREATED) + " > " + threeDaysAgo + " " +