mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 555218 - 4: (nsFaviconService.cpp) Fix Places usage of deprecated Storage APIs. r=dietrich

This commit is contained in:
Marco Bonardo 2010-04-27 13:25:00 +02:00
Родитель 1dadfe7bcf
Коммит 14f79b02cb
1 изменённых файлов: 37 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

72
toolkit/components/places/src/nsFaviconService.cpp
Просмотреть файл

@ -159,7 +159,8 @@ nsFaviconService::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
return nsnull;
RETURN_IF_STMT(mDBGetIconInfo, NS_LITERAL_CSTRING(
"SELECT id, length(data), expiration FROM moz_favicons WHERE url = ?1"));
"SELECT id, length(data), expiration FROM moz_favicons "
"WHERE url = :icon_url"));
// If the page does not exist url = NULL will return NULL instead of 0,
// since (1 = NULL) is NULL. Thus the need for the IFNULL.
@ -168,46 +169,47 @@ nsFaviconService::GetStatement(const nsCOMPtr<mozIStorageStatement>& aStmt)
"IFNULL(url = (SELECT f.url "
"FROM ( "
"SELECT favicon_id FROM moz_places_temp "
"WHERE url = ?2 "
"WHERE url = :page_url "
"UNION ALL "
"SELECT favicon_id FROM moz_places "
"WHERE url = ?2 "
"WHERE url = :page_url "
") AS h "
"JOIN moz_favicons f ON h.favicon_id = f.id "
"LIMIT 1), "
"0)"
"FROM moz_favicons WHERE url = ?1"));
"FROM moz_favicons WHERE url = :icon_url"));
RETURN_IF_STMT(mDBGetURL, NS_LITERAL_CSTRING(
"SELECT f.id, f.url, length(f.data), f.expiration "
"FROM ( "
"SELECT " MOZ_PLACES_COLUMNS " FROM moz_places_temp "
"WHERE url = ?1 "
"WHERE url = :page_url "
"UNION ALL "
"SELECT " MOZ_PLACES_COLUMNS " FROM moz_places "
"WHERE url = ?1 "
"WHERE url = :page_url "
") AS h JOIN moz_favicons f ON h.favicon_id = f.id "
"LIMIT 1"));
RETURN_IF_STMT(mDBGetData, NS_LITERAL_CSTRING(
"SELECT f.data, f.mime_type FROM moz_favicons f WHERE url = ?1"));
"SELECT f.data, f.mime_type FROM moz_favicons f WHERE url = :icon_url"));
RETURN_IF_STMT(mDBInsertIcon, NS_LITERAL_CSTRING(
"INSERT OR REPLACE INTO moz_favicons (id, url, data, mime_type, expiration) "
"VALUES (?1, ?2, ?3, ?4, ?5)"));
"VALUES (:icon_id, :icon_url, :data, :mime_type, :expiration)"));
RETURN_IF_STMT(mDBUpdateIcon, NS_LITERAL_CSTRING(
"UPDATE moz_favicons SET data = ?2, mime_type = ?3, expiration = ?4 "
"WHERE id = ?1"));
"UPDATE moz_favicons SET data = :data, mime_type = :mime_type, "
"expiration = :expiration "
"WHERE id = :icon_id"));
RETURN_IF_STMT(mDBSetPageFavicon, NS_LITERAL_CSTRING(
"UPDATE moz_places_view SET favicon_id = ?2 WHERE id = ?1"));
"UPDATE moz_places_view SET favicon_id = :icon_id WHERE id = :page_id"));
RETURN_IF_STMT(mDBAssociateFaviconURIToPageURI, NS_LITERAL_CSTRING(
"UPDATE moz_places_view "
"SET favicon_id = (SELECT id FROM moz_favicons WHERE url = ?1) "
"WHERE url = ?2"));
"SET favicon_id = (SELECT id FROM moz_favicons WHERE url = :icon_url) "
"WHERE url = :page_url"));
RETURN_IF_STMT(mDBRemoveOnDiskReferences, NS_LITERAL_CSTRING(
"UPDATE moz_places "
@ -347,7 +349,7 @@ nsFaviconService::SetFaviconUrlForPageInternal(nsIURI* aPageURI,
mozStorageTransaction transaction(mDBConn, PR_FALSE);
{
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetIconInfo);
rv = BindStatementURI(stmt, 0, aFaviconURI);
rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult = PR_FALSE;
@ -369,16 +371,16 @@ nsFaviconService::SetFaviconUrlForPageInternal(nsIURI* aPageURI,
// We did not find any entry, so create a new one
// not-binded params are automatically nullified by mozStorage
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBInsertIcon);
rv = stmt->BindNullParameter(0);
rv = stmt->BindNullByName(NS_LITERAL_CSTRING("icon_id"));
NS_ENSURE_SUCCESS(rv, rv);
rv = BindStatementURI(stmt, 1, aFaviconURI);
rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
{
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(getInfoStmt, mDBGetIconInfo);
rv = BindStatementURI(getInfoStmt, 0, aFaviconURI);
rv = URIBinder::Bind(getInfoStmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult;
@ -395,9 +397,9 @@ nsFaviconService::SetFaviconUrlForPageInternal(nsIURI* aPageURI,
NS_ENSURE_SUCCESS(rv, rv);
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBSetPageFavicon);
rv = stmt->BindInt64Parameter(0, pageId);
rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("page_id"), pageId);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->BindInt64Parameter(1, iconId);
rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("icon_id"), iconId);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
@ -598,7 +600,7 @@ nsFaviconService::SetFaviconData(nsIURI* aFaviconURI, const PRUint8* aData,
// this block forces the scoper to reset our statement: necessary for the
// next statement
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetIconInfo);
rv = BindStatementURI(stmt, 0, aFaviconURI);
rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult;
@ -606,34 +608,34 @@ nsFaviconService::SetFaviconData(nsIURI* aFaviconURI, const PRUint8* aData,
NS_ENSURE_SUCCESS(rv, rv);
if (hasResult) {
// update old one (statement parameter 0 = ID)
// Get id of the old entry and update it.
PRInt64 id;
rv = stmt->GetInt64(0, &id);
NS_ENSURE_SUCCESS(rv, rv);
statement = GetStatement(mDBUpdateIcon);
NS_ENSURE_STATE(statement);
rv = statement->BindInt64Parameter(0, id);
rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("icon_id"), id);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindBlobParameter(1, data, dataLen);
rv = statement->BindBlobByName(NS_LITERAL_CSTRING("data"), data, dataLen);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindUTF8StringParameter(2, *mimeType);
rv = statement->BindUTF8StringByName(NS_LITERAL_CSTRING("mime_type"), *mimeType);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindInt64Parameter(3, aExpiration);
rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("expiration"), aExpiration);
NS_ENSURE_SUCCESS(rv, rv);
}
else {
// insert new one (statement parameter 0 = favicon URL)
// Insert a new entry.
statement = GetStatement(mDBInsertIcon);
NS_ENSURE_STATE(statement);
rv = statement->BindNullParameter(0);
rv = statement->BindNullByName(NS_LITERAL_CSTRING("icon_id"));
NS_ENSURE_SUCCESS(rv, rv);
rv = BindStatementURI(statement, 1, aFaviconURI);
rv = URIBinder::Bind(statement, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindBlobParameter(2, data, dataLen);
rv = statement->BindBlobByName(NS_LITERAL_CSTRING("data"), data, dataLen);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindUTF8StringParameter(3, *mimeType);
rv = statement->BindUTF8StringByName(NS_LITERAL_CSTRING("mime_type"), *mimeType);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindInt64Parameter(4, aExpiration);
rv = statement->BindInt64ByName(NS_LITERAL_CSTRING("expiration"), aExpiration);
NS_ENSURE_SUCCESS(rv, rv);
}
}
@ -716,7 +718,7 @@ nsFaviconService::GetFaviconData(nsIURI* aFaviconURI, nsACString& aMimeType,
NS_ENSURE_ARG_POINTER(aData);
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetData);
nsresult rv = BindStatementURI(stmt, 0, aFaviconURI);
nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult = PR_FALSE;
@ -772,7 +774,7 @@ nsFaviconService::GetFaviconForPage(nsIURI* aPageURI, nsIURI** _retval)
NS_ENSURE_ARG_POINTER(_retval);
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetURL);
nsresult rv = BindStatementURI(stmt, 0, aPageURI);
nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), aPageURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult;
@ -794,7 +796,7 @@ nsFaviconService::GetFaviconImageForPage(nsIURI* aPageURI, nsIURI** _retval)
NS_ENSURE_ARG_POINTER(_retval);
DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetURL);
nsresult rv = BindStatementURI(stmt, 0, aPageURI);
nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), aPageURI);
NS_ENSURE_SUCCESS(rv, rv);
PRBool hasResult;
@ -1027,7 +1029,7 @@ nsFaviconService::GetFaviconDataAsync(nsIURI* aFaviconURI,
{
NS_ASSERTION(aCallback, "Doesn't make sense to call this without a callback");
DECLARE_AND_ASSIGN_LAZY_STMT(stmt, mDBGetData);
nsresult rv = BindStatementURI(stmt, 0, aFaviconURI);
nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<mozIStoragePendingStatement> pendingStatement;