From 3a5fcddb66343df6f759d8f21cf0482d33ccccaf Mon Sep 17 00:00:00 2001 From: "sspitzer%mozilla.org" Date: Sat, 7 Jul 2007 01:15:29 +0000 Subject: [PATCH] fix for bug #386303: Duplicate indexes in nsFaviconService and nsAnnotationService patch=Marco Bonardo r=sspitzer git-svn-id: svn://10.0.0.236/trunk@229470 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/components/places/src/nsAnnotationService.cpp | 3 --- mozilla/toolkit/components/places/src/nsFaviconService.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/mozilla/toolkit/components/places/src/nsAnnotationService.cpp b/mozilla/toolkit/components/places/src/nsAnnotationService.cpp index 62e0e969ea1..417a5a6de2c 100644 --- a/mozilla/toolkit/components/places/src/nsAnnotationService.cpp +++ b/mozilla/toolkit/components/places/src/nsAnnotationService.cpp @@ -263,9 +263,6 @@ nsAnnotationService::InitTables(mozIStorageConnection* aDBConn) "id INTEGER PRIMARY KEY," "name VARCHAR(32) UNIQUE NOT NULL)")); NS_ENSURE_SUCCESS(rv, rv); - rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING( - "CREATE INDEX moz_anno_attributes_nameindex ON moz_anno_attributes (name)")); - NS_ENSURE_SUCCESS(rv, rv); } rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_items_annos"), &exists); diff --git a/mozilla/toolkit/components/places/src/nsFaviconService.cpp b/mozilla/toolkit/components/places/src/nsFaviconService.cpp index 012917be651..4607658d5b5 100644 --- a/mozilla/toolkit/components/places/src/nsFaviconService.cpp +++ b/mozilla/toolkit/components/places/src/nsFaviconService.cpp @@ -184,8 +184,6 @@ nsFaviconService::InitTables(mozIStorageConnection* aDBConn) if (! exists) { rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_favicons (id INTEGER PRIMARY KEY, url LONGVARCHAR UNIQUE, data BLOB, mime_type VARCHAR(32), expiration LONG)")); NS_ENSURE_SUCCESS(rv, rv); - rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE INDEX moz_favicons_url ON moz_favicons (url)")); - NS_ENSURE_SUCCESS(rv, rv); } return NS_OK; }