wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 463863 - Download history not shown in Places history, r=dietrich, ui-r=beltzner

Browse Source
This commit is contained in:
Marco Bonardo 2008-12-04 13:59:04 +01:00
parent 7c477545da
commit d984c838eb
2 changed files with 141 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
toolkit/components/places/src/nsNavHistory.cpp
View File

@ -3160,11 +3160,9 @@ PlacesSQLQueryBuilder::SelectAsURI()
"JOIN moz_historyvisits v ON h.id = v.place_id " "JOIN moz_historyvisits v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.hidden <> 1 AND v.visit_type NOT IN ") + "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
nsPrintfCString("(0,%d,%d) ", nsPrintfCString("(0,%d) ",
nsINavHistoryService::TRANSITION_EMBED, nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_DOWNLOAD) + NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
NS_LITERAL_CSTRING("AND h.visit_count > 0 "
"{ADDITIONAL_CONDITIONS} "
"GROUP BY h.id " "GROUP BY h.id "
") " ") "
"UNION ALL " "UNION ALL "
@ -3179,12 +3177,10 @@ PlacesSQLQueryBuilder::SelectAsURI()
"JOIN moz_historyvisits v ON h.id = v.place_id " "JOIN moz_historyvisits v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.hidden <> 1 AND v.visit_type NOT IN ") + "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
nsPrintfCString("(0,%d,%d) ", nsPrintfCString("(0,%d) ",
nsINavHistoryService::TRANSITION_EMBED, nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_DOWNLOAD) + NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
NS_LITERAL_CSTRING("AND h.visit_count > 0 "
"AND h.id NOT IN (SELECT id FROM moz_places_temp) " "AND h.id NOT IN (SELECT id FROM moz_places_temp) "
"{ADDITIONAL_CONDITIONS} "
"GROUP BY h.id " "GROUP BY h.id "
") " ") "
"UNION ALL " "UNION ALL "
@ -3199,12 +3195,10 @@ PlacesSQLQueryBuilder::SelectAsURI()
"JOIN moz_historyvisits_temp v ON h.id = v.place_id " "JOIN moz_historyvisits_temp v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.hidden <> 1 AND v.visit_type NOT IN ") + "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
nsPrintfCString("(0,%d,%d) ", nsPrintfCString("(0,%d) ",
nsINavHistoryService::TRANSITION_EMBED, nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_DOWNLOAD) + NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
NS_LITERAL_CSTRING("AND h.visit_count > 0 "
"AND h.id NOT IN (SELECT id FROM moz_places_temp) " "AND h.id NOT IN (SELECT id FROM moz_places_temp) "
"{ADDITIONAL_CONDITIONS} "
"GROUP BY h.id " "GROUP BY h.id "
") " ") "
"UNION ALL " "UNION ALL "
@ -3219,11 +3213,9 @@ PlacesSQLQueryBuilder::SelectAsURI()
"JOIN moz_historyvisits_temp v ON h.id = v.place_id " "JOIN moz_historyvisits_temp v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.hidden <> 1 AND v.visit_type NOT IN ") + "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
nsPrintfCString("(0,%d,%d) ", nsPrintfCString("(0,%d) ",
nsINavHistoryService::TRANSITION_EMBED, nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_DOWNLOAD) + NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
NS_LITERAL_CSTRING("AND h.visit_count > 0 "
"{ADDITIONAL_CONDITIONS} "
"GROUP BY h.id " "GROUP BY h.id "
") " ") "
") " ") "
@ -3401,11 +3393,9 @@ PlacesSQLQueryBuilder::SelectAsVisit()
"FROM moz_places h " "FROM moz_places h "
"JOIN moz_historyvisits v ON h.id = v.place_id " "JOIN moz_historyvisits v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.visit_count > 0 " "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
"AND h.hidden <> 1 AND v.visit_type NOT IN ") + nsPrintfCString("(0,%d) ",
nsPrintfCString("(0,%d,%d) ", nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_EMBED,
nsINavHistoryService::TRANSITION_DOWNLOAD) +
NS_LITERAL_CSTRING("AND h.id NOT IN (SELECT id FROM moz_places_temp) " NS_LITERAL_CSTRING("AND h.id NOT IN (SELECT id FROM moz_places_temp) "
"{ADDITIONAL_CONDITIONS} " "{ADDITIONAL_CONDITIONS} "
"UNION ALL " "UNION ALL "
@ -3414,11 +3404,9 @@ PlacesSQLQueryBuilder::SelectAsVisit()
"FROM moz_places_temp h " "FROM moz_places_temp h "
"JOIN moz_historyvisits v ON h.id = v.place_id " "JOIN moz_historyvisits v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.visit_count > 0 " "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
"AND h.hidden <> 1 AND v.visit_type NOT IN ") + nsPrintfCString("(0,%d) ",
nsPrintfCString("(0,%d,%d) ", nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_EMBED,
nsINavHistoryService::TRANSITION_DOWNLOAD) +
NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} " NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
"UNION ALL " "UNION ALL "
"SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, " "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
@ -3426,12 +3414,10 @@ PlacesSQLQueryBuilder::SelectAsVisit()
"FROM moz_places h " "FROM moz_places h "
"JOIN moz_historyvisits_temp v ON h.id = v.place_id " "JOIN moz_historyvisits_temp v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.visit_count > 0 " "WHERE h.id NOT IN (SELECT id FROM moz_places_temp) "
"AND h.id NOT IN (SELECT id FROM moz_places_temp) "
"AND h.hidden <> 1 AND v.visit_type NOT IN ") + "AND h.hidden <> 1 AND v.visit_type NOT IN ") +
nsPrintfCString("(0,%d,%d) ", nsPrintfCString("(0,%d) ",
nsINavHistoryService::TRANSITION_EMBED, nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_DOWNLOAD) +
NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} " NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "
"UNION ALL " "UNION ALL "
"SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, " "SELECT h.id, h.url, h.title, h.rev_host, h.visit_count, "
@ -3439,11 +3425,9 @@ PlacesSQLQueryBuilder::SelectAsVisit()
"FROM moz_places_temp h " "FROM moz_places_temp h "
"JOIN moz_historyvisits_temp v ON h.id = v.place_id " "JOIN moz_historyvisits_temp v ON h.id = v.place_id "
"LEFT JOIN moz_favicons f ON h.favicon_id = f.id " "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
"WHERE h.visit_count > 0 " "WHERE h.hidden <> 1 AND v.visit_type NOT IN ") +
"AND h.hidden <> 1 AND v.visit_type NOT IN ") + nsPrintfCString("(0,%d) ",
nsPrintfCString("(0,%d,%d) ", nsINavHistoryService::TRANSITION_EMBED) +
nsINavHistoryService::TRANSITION_EMBED,
nsINavHistoryService::TRANSITION_DOWNLOAD) +
NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} "); NS_LITERAL_CSTRING("{ADDITIONAL_CONDITIONS} ");
} }
else { else {
@ -3558,14 +3542,14 @@ PlacesSQLQueryBuilder::SelectAsDay()
"SELECT id FROM moz_historyvisits_temp " "SELECT id FROM moz_historyvisits_temp "
"WHERE visit_date >= %llu " "WHERE visit_date >= %llu "
"AND visit_date < %llu " "AND visit_date < %llu "
"AND visit_type NOT IN (0, 4) " "AND visit_type NOT IN (0,%d) "
"LIMIT 1 " "LIMIT 1 "
") " ") "
"OR EXISTS ( " "OR EXISTS ( "
"SELECT * FROM moz_historyvisits " "SELECT * FROM moz_historyvisits "
"WHERE visit_date >= %llu " "WHERE visit_date >= %llu "
"AND visit_date < %llu " "AND visit_date < %llu "
"AND visit_type NOT IN (0, 4) " "AND visit_type NOT IN (0,%d) "
"LIMIT 1 " "LIMIT 1 "
") " ") "
"LIMIT 1) TUNION%d UNION ", "LIMIT 1) TUNION%d UNION ",
@ -3574,8 +3558,10 @@ PlacesSQLQueryBuilder::SelectAsDay()
midnight.Get(toDayAgo), midnight.Get(toDayAgo),
midnight.Get(fromDayAgo), midnight.Get(fromDayAgo),
midnight.Get(toDayAgo), midnight.Get(toDayAgo),
nsINavHistoryService::TRANSITION_EMBED,
midnight.Get(fromDayAgo), midnight.Get(fromDayAgo),
midnight.Get(toDayAgo), midnight.Get(toDayAgo),
nsINavHistoryService::TRANSITION_EMBED,
i); i);
mQueryString.Append( dayRange ); mQueryString.Append( dayRange );
@ -3598,13 +3584,13 @@ PlacesSQLQueryBuilder::SelectAsDay()
"WHERE EXISTS ( " "WHERE EXISTS ( "
"SELECT id FROM moz_historyvisits_temp " "SELECT id FROM moz_historyvisits_temp "
"WHERE visit_date < %llu " "WHERE visit_date < %llu "
"AND visit_type NOT IN (0, 4) " "AND visit_type NOT IN (0,%d) "
"LIMIT 1 " "LIMIT 1 "
") " ") "
"OR EXISTS ( " "OR EXISTS ( "
"SELECT id FROM moz_historyvisits " "SELECT id FROM moz_historyvisits "
"WHERE visit_date < %llu " "WHERE visit_date < %llu "
"AND visit_type NOT IN (0, 4) " "AND visit_type NOT IN (0,%d) "
"LIMIT 1 " "LIMIT 1 "
") " ") "
"LIMIT 1) TUNIONLAST " "LIMIT 1) TUNIONLAST "
@ -3615,7 +3601,9 @@ PlacesSQLQueryBuilder::SelectAsDay()
dateParam.get(), dateParam.get(),
midnight.Get(-MAX_HISTORY_DAYS), midnight.Get(-MAX_HISTORY_DAYS),
midnight.Get(-MAX_HISTORY_DAYS), midnight.Get(-MAX_HISTORY_DAYS),
midnight.Get(-MAX_HISTORY_DAYS) nsINavHistoryService::TRANSITION_EMBED,
midnight.Get(-MAX_HISTORY_DAYS),
nsINavHistoryService::TRANSITION_EMBED
)); ));
return NS_OK; return NS_OK;
@ -3941,8 +3929,10 @@ nsNavHistory::ConstructQueryString(
"SELECT * FROM ( " "SELECT * FROM ( "
"SELECT DISTINCT place_id " "SELECT DISTINCT place_id "
"FROM moz_historyvisits " "FROM moz_historyvisits "
"WHERE visit_type NOT IN (0,4) " "WHERE visit_type NOT IN ") +
"AND NOT EXISTS (SELECT id FROM moz_places h WHERE h.id = place_id AND hidden = 1) " nsPrintfCString("(0,%d) ", nsINavHistoryService::TRANSITION_EMBED) +
NS_LITERAL_CSTRING("AND NOT EXISTS "
"(SELECT id FROM moz_places h WHERE h.id = place_id AND hidden = 1) "
"AND NOT EXISTS (SELECT id FROM moz_places_temp h WHERE h.id = place_id AND hidden = 1) " "AND NOT EXISTS (SELECT id FROM moz_places_temp h WHERE h.id = place_id AND hidden = 1) "
"ORDER by visit_date DESC LIMIT ") + "ORDER by visit_date DESC LIMIT ") +
nsPrintfCString("%d ", aOptions->MaxResults()) + nsPrintfCString("%d ", aOptions->MaxResults()) +
@ -3951,9 +3941,11 @@ nsNavHistory::ConstructQueryString(
"SELECT * FROM ( " "SELECT * FROM ( "
"SELECT DISTINCT place_id " "SELECT DISTINCT place_id "
"FROM moz_historyvisits_temp " "FROM moz_historyvisits_temp "
"WHERE visit_type NOT IN (0,4) " "WHERE visit_type NOT IN ") +
"AND NOT EXISTS (SELECT id FROM moz_places h WHERE h.id = place_id AND hidden = 1) " nsPrintfCString("(0,%d) ", nsINavHistoryService::TRANSITION_EMBED) +
"AND NOT EXISTS (SELECT id FROM moz_places_temp h WHERE h.id = place_id AND hidden = 1) " NS_LITERAL_CSTRING("AND NOT EXISTS "
"(SELECT id FROM moz_places h WHERE h.id = place_id AND hidden = 1) "
"AND NOT EXISTS (SELECT id FROM moz_places_temp h WHERE h.id = place_id AND hidden = 1) "
"ORDER by visit_date DESC LIMIT ") + "ORDER by visit_date DESC LIMIT ") +
nsPrintfCString("%d ", aOptions->MaxResults()) + nsPrintfCString("%d ", aOptions->MaxResults()) +
NS_LITERAL_CSTRING(")"); NS_LITERAL_CSTRING(")");

99
toolkit/components/places/tests/unit/test_463863.js Normal file
View File

@ -0,0 +1,99 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Places unit test code.
*
* The Initial Developer of the Original Code is
* Mozilla Corporation.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Marco Bonardo <mak77@bonardo.net> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/*
* TEST DESCRIPTION:
*
* This test checks that in a basic history query all transition types visits
* appear but TRANSITION_EMBED ones.
*/
var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
getService(Ci.nsINavHistoryService);
// adds a test URI visit to the database, and checks for a valid visitId
function add_visit(aURI, aType) {
var visitId = hs.addVisit(uri(aURI),
Date.now() * 1000,
null, // no referrer
aType,
false, // not redirect
0);
do_check_true(visitId > 0);
return visitId;
}
var transitions = [ hs.TRANSITION_LINK,
hs.TRANSITION_TYPED,
hs.TRANSITION_BOOKMARK,
hs.TRANSITION_EMBED,
hs.TRANSITION_REDIRECT_PERMANENT,
hs.TRANSITION_REDIRECT_TEMPORARY,
hs.TRANSITION_DOWNLOAD ];
function runQuery(aResultType) {
var options = hs.getNewQueryOptions();
options.resultType = aResultType;
var query = hs.getNewQuery();
var result = hs.executeQuery(query, options);
var root = result.root;
root.containerOpen = true;
var cc = root.childCount;
do_check_eq(cc, transitions.length-1);
for (var i = 0; i < cc; i++) {
var node = root.getChild(i);
// Check that all transition types but TRANSITION_EMBED appear in results
do_check_neq(node.uri.substr(6,1), hs.TRANSITION_EMBED);
}
root.containerOpen = false;
}
// main
function run_test() {
// add visits, one for each transition type
transitions.forEach(
function(transition) {
add_visit("http://" + transition +".mozilla.org/", transition)
});
runQuery(Ci.nsINavHistoryQueryOptions.RESULTS_AS_VISIT);
runQuery(Ci.nsINavHistoryQueryOptions.RESULTS_AS_URI);
}