Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 04:22:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 443433 - [refactor] move places table creation statements to one file

Browse Source 
This refactors how tables are created in places.  There is no change in logic.
r=dietrich
This commit is contained in:
Shawn Wilsher 2008-08-04 13:14:17 -04:00
parent 6fc4c9b907
commit 3f3b07898a
5 changed files with 166 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
toolkit/components/places/src/nsAnnotationService.cpp
View File

@ -50,6 +50,7 @@
#include "nsString.h"
#include "nsVariant.h"
#include "nsNavBookmarks.h"
#include "nsPlacesTables.h"
const PRInt32 nsAnnotationService::kAnnoIndex_ID = 0;
const PRInt32 nsAnnotationService::kAnnoIndex_PageOrItem = 1;
@ -248,16 +249,7 @@ nsAnnotationService::InitTables(mozIStorageConnection* aDBConn)
rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_annos"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (! exists) {
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_annos ("
"id INTEGER PRIMARY KEY,"
"place_id INTEGER NOT NULL,"
"anno_attribute_id INTEGER,"
"mime_type VARCHAR(32) DEFAULT NULL,"
"content LONGVARCHAR, flags INTEGER DEFAULT 0,"
"expiration INTEGER DEFAULT 0,"
"type INTEGER DEFAULT 0,"
"dateAdded INTEGER DEFAULT 0,"
"lastModified INTEGER DEFAULT 0)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_ANNOS);
NS_ENSURE_SUCCESS(rv, rv);
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -268,26 +260,14 @@ nsAnnotationService::InitTables(mozIStorageConnection* aDBConn)
rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_anno_attributes"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (! exists) {
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TABLE moz_anno_attributes ("
"id INTEGER PRIMARY KEY,"
"name VARCHAR(32) UNIQUE NOT NULL)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_ANNO_ATTRIBUTES);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_items_annos"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (! exists) {
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_items_annos ("
"id INTEGER PRIMARY KEY,"
"item_id INTEGER NOT NULL,"
"anno_attribute_id INTEGER,"
"mime_type VARCHAR(32) DEFAULT NULL,"
"content LONGVARCHAR, flags INTEGER DEFAULT 0,"
"expiration INTEGER DEFAULT 0,"
"type INTEGER DEFAULT 0,"
"dateAdded INTEGER DEFAULT 0,"
"lastModified INTEGER DEFAULT 0)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_ITEMS_ANNOS);
NS_ENSURE_SUCCESS(rv, rv);
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE UNIQUE INDEX moz_items_annos_itemattributeindex ON moz_items_annos (item_id, anno_attribute_id)"));

8
toolkit/components/places/src/nsFaviconService.cpp
View File

@ -63,6 +63,7 @@
#include "nsStringStream.h"
#include "mozStorageHelper.h"
#include "plbase64.h"
#include "nsPlacesTables.h"
// For favicon optimization
#include "imgITools.h"
@ -194,12 +195,7 @@ nsFaviconService::InitTables(mozIStorageConnection* aDBConn)
PRBool exists = PR_FALSE;
aDBConn->TableExists(NS_LITERAL_CSTRING("moz_favicons"), &exists);
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)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_FAVICONS);
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;

24
toolkit/components/places/src/nsNavBookmarks.cpp
View File

@ -51,6 +51,7 @@
#include "prprf.h"
#include "nsILivemarkService.h"
#include "nsPlacesTriggers.h"
#include "nsPlacesTables.h"
const PRInt32 nsNavBookmarks::kFindBookmarksIndex_ID = 0;
const PRInt32 nsNavBookmarks::kFindBookmarksIndex_Type = 1;
@ -327,19 +328,7 @@ nsNavBookmarks::InitTables(mozIStorageConnection* aDBConn)
nsresult rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_bookmarks"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (! exists) {
// The fk column is for "foreign key". It contains ids from moz_places
// if the row is a bookmark.
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_bookmarks ("
"id INTEGER PRIMARY KEY,"
"type INTEGER, "
"fk INTEGER DEFAULT NULL, "
"parent INTEGER, "
"position INTEGER, "
"title LONGVARCHAR, "
"keyword_id INTEGER, "
"folder_type TEXT, "
"dateAdded INTEGER, "
"lastModified INTEGER)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_BOOKMARKS);
NS_ENSURE_SUCCESS(rv, rv);
// This index will make it faster to determine if a given item is
@ -368,9 +357,7 @@ nsNavBookmarks::InitTables(mozIStorageConnection* aDBConn)
rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_bookmarks_roots"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_bookmarks_roots ("
"root_name VARCHAR(16) UNIQUE, "
"folder_id INTEGER)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_BOOKMARKS_ROOTS);
NS_ENSURE_SUCCESS(rv, rv);
}
@ -378,10 +365,7 @@ nsNavBookmarks::InitTables(mozIStorageConnection* aDBConn)
rv = aDBConn->TableExists(NS_LITERAL_CSTRING("moz_keywords"), &exists);
NS_ENSURE_SUCCESS(rv, rv);
if (! exists) {
rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TABLE moz_keywords ("
"id INTEGER PRIMARY KEY AUTOINCREMENT, "
"keyword TEXT UNIQUE)"));
rv = aDBConn->ExecuteSimpleSQL(CREATE_MOZ_KEYWORDS);
NS_ENSURE_SUCCESS(rv, rv);
// Create trigger to update as well

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

@ -44,6 +44,7 @@
#include "nsNavHistory.h"
#include "nsNavBookmarks.h"
#include "nsAnnotationService.h"
#include "nsPlacesTables.h"
#include "nsIArray.h"
#include "nsArrayEnumerator.h"
@ -792,16 +793,7 @@ nsNavHistory::InitDB(PRInt16 *aMadeChanges)
// moz_places
if (!tableExists) {
*aMadeChanges = DB_MIGRATION_CREATED;
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_places ("
"id INTEGER PRIMARY KEY, "
"url LONGVARCHAR, "
"title LONGVARCHAR, "
"rev_host LONGVARCHAR, "
"visit_count INTEGER DEFAULT 0, "
"hidden INTEGER DEFAULT 0 NOT NULL, "
"typed INTEGER DEFAULT 0 NOT NULL, "
"favicon_id INTEGER, "
"frecency INTEGER DEFAULT -1 NOT NULL)"));
rv = mDBConn->ExecuteSimpleSQL(CREATE_MOZ_PLACES);
NS_ENSURE_SUCCESS(rv, rv);
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -830,13 +822,7 @@ nsNavHistory::InitDB(PRInt16 *aMadeChanges)
rv = mDBConn->TableExists(NS_LITERAL_CSTRING("moz_historyvisits"), &tableExists);
NS_ENSURE_SUCCESS(rv, rv);
if (! tableExists) {
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_historyvisits ("
"id INTEGER PRIMARY KEY, "
"from_visit INTEGER, "
"place_id INTEGER, "
"visit_date INTEGER, "
"visit_type INTEGER, "
"session INTEGER)"));
rv = mDBConn->ExecuteSimpleSQL(CREATE_MOZ_HISTORYVISITS);
NS_ENSURE_SUCCESS(rv, rv);
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -865,11 +851,7 @@ nsNavHistory::InitDB(PRInt16 *aMadeChanges)
rv = mDBConn->TableExists(NS_LITERAL_CSTRING("moz_inputhistory"), &tableExists);
NS_ENSURE_SUCCESS(rv, rv);
if (!tableExists) {
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING("CREATE TABLE moz_inputhistory ("
"place_id INTEGER NOT NULL, "
"input LONGVARCHAR NOT NULL, "
"use_count INTEGER, "
"PRIMARY KEY (place_id, input))"));
rv = mDBConn->ExecuteSimpleSQL(CREATE_MOZ_INPUTHISTORY);
NS_ENSURE_SUCCESS(rv, rv);
}

152
toolkit/components/places/src/nsPlacesTables.h Normal file
View File

@ -0,0 +1,152 @@
/* vim: sw=2 ts=2 sts=2 expandtab
* ***** 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 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):
* Shawn Wilsher <me@shawnwilsher.com> (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 ***** */
#ifndef __nsPlacesTables_h__
#define __nsPlacesTables_h__
#define CREATE_MOZ_PLACES NS_LITERAL_CSTRING( \
"CREATE TABLE moz_places ( " \
" id INTEGER PRIMARY KEY" \
", url LONGVARCHAR" \
", title LONGVARCHAR" \
", rev_host LONGVARCHAR" \
", visit_count INTEGER DEFAULT 0" \
", hidden INTEGER DEFAULT 0 NOT NULL" \
", typed INTEGER DEFAULT 0 NOT NULL" \
", favicon_id INTEGER" \
", frecency INTEGER DEFAULT -1 NOT NULL" \
")" \
)
#define CREATE_MOZ_HISTORYVISITS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_historyvisits (" \
" id INTEGER PRIMARY KEY" \
", from_visit INTEGER" \
", place_id INTEGER" \
", visit_date INTEGER" \
", visit_type INTEGER" \
", session INTEGER" \
")" \
)
#define CREATE_MOZ_INPUTHISTORY NS_LITERAL_CSTRING( \
"CREATE TABLE moz_inputhistory (" \
" place_id INTEGER NOT NULL" \
", input LONGVARCHAR NOT NULL" \
", use_count INTEGER" \
", PRIMARY KEY (place_id, input)" \
")" \
)
#define CREATE_MOZ_ANNOS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_annos (" \
" id INTEGER PRIMARY KEY" \
", place_id INTEGER NOT NULL" \
", anno_attribute_id INTEGER" \
", mime_type VARCHAR(32) DEFAULT NULL" \
", content LONGVARCHAR" \
", flags INTEGER DEFAULT 0" \
", expiration INTEGER DEFAULT 0" \
", type INTEGER DEFAULT 0" \
", dateAdded INTEGER DEFAULT 0" \
", lastModified INTEGER DEFAULT 0" \
")" \
)
#define CREATE_MOZ_ANNO_ATTRIBUTES NS_LITERAL_CSTRING( \
"CREATE TABLE moz_anno_attributes (" \
" id INTEGER PRIMARY KEY" \
", name VARCHAR(32) UNIQUE NOT NULL" \
")" \
)
#define CREATE_MOZ_ITEMS_ANNOS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_items_annos (" \
" id INTEGER PRIMARY KEY" \
", item_id INTEGER NOT NULL" \
", anno_attribute_id INTEGER" \
", mime_type VARCHAR(32) DEFAULT NULL" \
", content LONGVARCHAR" \
", flags INTEGER DEFAULT 0" \
", expiration INTEGER DEFAULT 0" \
", type INTEGER DEFAULT 0" \
", dateAdded INTEGER DEFAULT 0" \
", lastModified INTEGER DEFAULT 0" \
")" \
)
#define CREATE_MOZ_FAVICONS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_favicons (" \
" id INTEGER PRIMARY KEY" \
", url LONGVARCHAR UNIQUE" \
", data BLOB" \
", mime_type VARCHAR(32)" \
", expiration LONG" \
")" \
)
#define CREATE_MOZ_BOOKMARKS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_bookmarks (" \
" id INTEGER PRIMARY KEY" \
", type INTEGER" \
", fk INTEGER DEFAULT NULL" /* place_id */ \
", parent INTEGER" \
", position INTEGER" \
", title LONGVARCHAR" \
", keyword_id INTEGER" \
", folder_type TEXT" \
", dateAdded INTEGER" \
", lastModified INTEGER" \
")" \
)
#define CREATE_MOZ_BOOKMARKS_ROOTS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_bookmarks_roots (" \
" root_name VARCHAR(16) UNIQUE" \
", folder_id INTEGER" \
")" \
)
#define CREATE_MOZ_KEYWORDS NS_LITERAL_CSTRING( \
"CREATE TABLE moz_keywords (" \
" id INTEGER PRIMARY KEY AUTOINCREMENT" \
", keyword TEXT UNIQUE" \
")" \
)
#endif // __nsPlacesTables_h__