diff --git a/mozilla/extensions/sql/base/public/mozISqlService.idl b/mozilla/extensions/sql/base/public/mozISqlService.idl
index e91366baa8a..8d1fd6081de 100644
--- a/mozilla/extensions/sql/base/public/mozISqlService.idl
+++ b/mozilla/extensions/sql/base/public/mozISqlService.idl
@@ -37,6 +37,7 @@
 #include "nsISupports.idl"
 
 interface nsIRDFResource;
+interface nsISimpleEnumerator;
 interface mozISqlConnection;
 
 /**
@@ -77,13 +78,15 @@ interface mozISqlService : nsISupports
    * @param aHostname   hostname for the database
    * @param aPort       port for the database
    * @param aDatabase   database name
+   * @param aPriority   priority
    * @return            an RDF resource representing the alias
    */
    nsIRDFResource addAlias(in AString aName,
                            in AString aType,
                            in AString aHostname,
                            in long aPort,
-                           in AString aDatabase);
+                           in AString aDatabase,
+                           in long aPriority);
 
   /**
    * Retrieves alias information. The out parameters are filled in with
@@ -95,13 +98,15 @@ interface mozISqlService : nsISupports
    * @param aHostname   hostname of the database
    * @param aPort       port of the database
    * @param aDatabase   database name
+   * @param aPriority   priority
    */
   void fetchAlias(in nsIRDFResource aAlias,
                   out AString aName,
                   out AString aType,
                   out AString aHostname,
                   out long aPort,
-                  out AString aDatabase);
+                  out AString aDatabase,
+                  out long aPriority);
 
   /**
    * Update the information of an alias that has already been added. The new
@@ -114,13 +119,15 @@ interface mozISqlService : nsISupports
    * @param aHostname   hostname for the database
    * @param aPort       port for the database
    * @param aDatabase   database name
+   * @param aPriority   priority
    */
   void updateAlias(in nsIRDFResource aAlias,
                    in AString aName,
                    in AString aType,
                    in AString aHostname,
                    in long aPort,
-                   in AString aDatabase);
+                   in AString aDatabase,
+                   in long aPriority);
 
   /**
    * Removes an alias that already exists.
@@ -137,6 +144,14 @@ interface mozISqlService : nsISupports
    */
   nsIRDFResource getAlias(in AString aName);
 
+  /**
+   * Get the aliases with the given name.
+   *
+   * @param aName      the name of the aliases to retrieve
+   * @return           an enumerator for the aliases
+   */
+  nsISimpleEnumerator getAliases(in AString aName);
+
   /**
    * Retrieves an SQL connection to a database given its alias. If a
    * connection is already open, that connection is returned. Otherwise,
diff --git a/mozilla/extensions/sql/base/resources/content/aliasDialog.js b/mozilla/extensions/sql/base/resources/content/aliasDialog.js
index 3996bd63b7d..9b9a19bd60a 100644
--- a/mozilla/extensions/sql/base/resources/content/aliasDialog.js
+++ b/mozilla/extensions/sql/base/resources/content/aliasDialog.js
@@ -40,6 +40,7 @@ var type;
 var hostname;
 var port;
 var database;
+var priority;
 
 function init() {
   sqlService = Components.classes["@mozilla.org/sql/service;1"]
@@ -50,11 +51,12 @@ function init() {
   hostname = document.getElementById("hostname");
   port = document.getElementById("port");
   database = document.getElementById("database");
+  priority = document.getElementById("priority");
 
   if (window.arguments) {
     // get original values
     var alias = window.arguments[0];
-    sqlService.fetchAlias(alias, name, type, hostname, port, database);
+    sqlService.fetchAlias(alias, name, type, hostname, port, database, priority);
   }
 }
 
@@ -63,11 +65,11 @@ function onAccept() {
     // update an existing alias
     var alias = window.arguments[0];
     sqlService.updateAlias(alias, name.value, type.value, hostname.value,
-                           port.value, database.value);
+                           port.value, database.value, priority.value);
   }
   else {
     // add a new database
     sqlService.addAlias(name.value, type.value, hostname.value,
-                        port.value, database.value);
+                        port.value, database.value, priority.value);
   }
 }
diff --git a/mozilla/extensions/sql/base/resources/content/aliasDialog.xul b/mozilla/extensions/sql/base/resources/content/aliasDialog.xul
index 45090a9d1c4..8cdcacf74dd 100644
--- a/mozilla/extensions/sql/base/resources/content/aliasDialog.xul
+++ b/mozilla/extensions/sql/base/resources/content/aliasDialog.xul
@@ -42,7 +42,7 @@
 <dialog id="aliasDialog"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&window.title;"
-  width="250" height="180"
+  width="250" height="200"
   buttons="accept,cancel" buttonpack="center"
   ondialogaccept="return onAccept(event);"
   onload="init()">
@@ -75,6 +75,10 @@
         <label value="&database.label;"/>
         <textbox id="database"/>
       </row>
+      <row>
+        <label value="&priority.label;"/>
+        <textbox id="priority"/>
+      </row>
     </rows>
   </grid>
 
diff --git a/mozilla/extensions/sql/base/resources/content/aliasManager.js b/mozilla/extensions/sql/base/resources/content/aliasManager.js
new file mode 100644
index 00000000000..f8fe2b7a9ef
--- /dev/null
+++ b/mozilla/extensions/sql/base/resources/content/aliasManager.js
@@ -0,0 +1,71 @@
+/* ***** 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Jan Varga
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+var sqlService = null;
+
+function getSqlService() {
+  if (! sqlService)
+    sqlService = Components.classes["@mozilla.org/sql/service;1"]
+                 .getService(Components.interfaces.mozISqlService);
+  return sqlService;
+}
+
+function getSelectedAlias() {
+  var tree = document.getElementById("aliasesTree");
+  return tree.builderView.getResourceAtIndex(tree.currentIndex);
+}
+
+function updateButtons() {
+  var tree = document.getElementById("aliasesTree");
+  const buttons = ["updateButton", "removeButton"];
+  for (i = 0; i < buttons.length; i++)
+    document.getElementById(buttons[i]).disabled = tree.currentIndex < 0;
+}
+
+function addAlias() {
+  window.openDialog("aliasDialog.xul", "addAlias", "chrome,modal=yes,resizable=no,centerscreen");
+}
+
+function updateAlias() {
+  var alias = getSelectedAlias();
+  window.openDialog("aliasDialog.xul", "updateDatabase", "chrome,modal=yes,resizable=no,centerscreen", alias);
+}
+
+function removeAlias() {
+  var sqlService = getSqlService();
+  var alias = getSelectedAlias();
+  sqlService.removeAlias(alias);  
+  updateButtons();
+}
diff --git a/mozilla/extensions/sql/base/resources/content/aliasManager.xul b/mozilla/extensions/sql/base/resources/content/aliasManager.xul
new file mode 100644
index 00000000000..6fe1ff6ec9e
--- /dev/null
+++ b/mozilla/extensions/sql/base/resources/content/aliasManager.xul
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+
+<!-- ***** 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 mozilla.org code.
+   -
+   - The Initial Developer of the Original Code is Jan Varga
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - 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 ***** -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE page SYSTEM "chrome://sql/locale/aliasManager.dtd">
+
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&title.label;"
+	style="width: 42em; height: 15em;"
+	buttons="accept">
+
+  <script type="application/x-javascript" src="aliasManager.js"/>
+
+  <groupbox flex="1">
+    <caption label="&aliases.label;"/>
+    <hbox flex="1">
+      <tree id="aliasesTree" flex="1"
+            seltype="single"
+            datasources="rdf:sql" ref="SQL:AliasesRoot" flags="dont-build-content"
+            onselect="updateButtons()">
+        <treecols>
+          <treecol id="nameCol" flex="1" label="&nameCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#name"
+                   sortActive="true" sortDirection="ascending"/>
+          <treecol id="typeCol" flex="1" label="&typeCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#type"/>
+          <treecol id="hostnameCol" flex="1" label="&hostnameCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
+          <treecol id="portCol" flex="1" label="&portCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#port"/>
+          <treecol id="databaseCol" flex="1" label="&databaseCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#database"/>
+          <treecol id="priorityCol" flex="1" label="&priorityCol.label;"
+                   sort="rdf:http://www.mozilla.org/SQL-rdf#priority"/>
+        </treecols>
+        <template>
+          <treechildren>
+            <treeitem uri="rdf:*">
+              <treerow>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#name"/>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#type"/>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#port"/>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#database"/>
+                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#priority"/>
+              </treerow>
+            </treeitem>
+          </treechildren>
+        </template>
+      </tree>
+      <vbox>
+        <button id="addButton" label="&add.label;" oncommand="addAlias()"/>
+        <button id="updateButton" label="&update.label;" disabled="true" oncommand="updateAlias()"/>
+        <button id="removeButton" label="&remove.label;" disabled="true" oncommand="removeAlias()"/>
+      </vbox>
+    </hbox>
+  </groupbox>
+
+</dialog>
diff --git a/mozilla/extensions/sql/base/resources/content/pref-sql.js b/mozilla/extensions/sql/base/resources/content/pref-sql.js
index f8fe2b7a9ef..be482b3f327 100644
--- a/mozilla/extensions/sql/base/resources/content/pref-sql.js
+++ b/mozilla/extensions/sql/base/resources/content/pref-sql.js
@@ -33,39 +33,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var sqlService = null;
-
-function getSqlService() {
-  if (! sqlService)
-    sqlService = Components.classes["@mozilla.org/sql/service;1"]
-                 .getService(Components.interfaces.mozISqlService);
-  return sqlService;
-}
-
-function getSelectedAlias() {
-  var tree = document.getElementById("aliasesTree");
-  return tree.builderView.getResourceAtIndex(tree.currentIndex);
-}
-
-function updateButtons() {
-  var tree = document.getElementById("aliasesTree");
-  const buttons = ["updateButton", "removeButton"];
-  for (i = 0; i < buttons.length; i++)
-    document.getElementById(buttons[i]).disabled = tree.currentIndex < 0;
-}
-
-function addAlias() {
-  window.openDialog("aliasDialog.xul", "addAlias", "chrome,modal=yes,resizable=no,centerscreen");
-}
-
-function updateAlias() {
-  var alias = getSelectedAlias();
-  window.openDialog("aliasDialog.xul", "updateDatabase", "chrome,modal=yes,resizable=no,centerscreen", alias);
-}
-
-function removeAlias() {
-  var sqlService = getSqlService();
-  var alias = getSelectedAlias();
-  sqlService.removeAlias(alias);  
-  updateButtons();
+function manageAliases() {
+  window.openDialog("aliasManager.xul", "_blank", "chrome,resizable");
 }
diff --git a/mozilla/extensions/sql/base/resources/content/pref-sql.xul b/mozilla/extensions/sql/base/resources/content/pref-sql.xul
index 76307b9a8d3..4c20f542fe3 100644
--- a/mozilla/extensions/sql/base/resources/content/pref-sql.xul
+++ b/mozilla/extensions/sql/base/resources/content/pref-sql.xul
@@ -40,50 +40,16 @@
 <!DOCTYPE page SYSTEM "chrome://sql/locale/pref-sql.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  headertitle="&header.label;"
-  onload="parent.initPanel('chrome://sql/content/pref-sql.xul');">
+      headertitle="&header.label;"
+      onload="parent.initPanel('chrome://sql/content/pref-sql.xul');">
 
   <script type="application/x-javascript" src="pref-sql.js"/>
 
-  <groupbox flex="1">
-    <caption label="&aliases.label;"/>
-    <hbox flex="1">
-      <tree id="aliasesTree" flex="1"
-            seltype="single"
-            datasources="rdf:sql" ref="SQL:AliasesRoot" flags="dont-build-content"
-            onselect="updateButtons()">
-        <treecols>
-          <treecol id="nameCol" flex="1" label="&nameCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#name"
-                   sortActive="true" sortDirection="ascending"/>
-          <treecol id="typeCol" flex="1" label="&typeCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#type"/>
-          <treecol id="hostnameCol" flex="1" label="&hostnameCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
-          <treecol id="portCol" flex="1" label="&portCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#port"/>
-          <treecol id="databaseCol" flex="1" label="&databaseCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#database"/>
-        </treecols>
-        <template>
-          <treechildren>
-            <treeitem uri="rdf:*">
-              <treerow>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#name"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#type"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#port"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#database"/>
-              </treerow>
-            </treeitem>
-          </treechildren>
-        </template>
-      </tree>
-      <vbox>
-        <button id="addButton" label="&add.label;" oncommand="addAlias()"/>
-        <button id="updateButton" label="&update.label;" disabled="true" oncommand="updateAlias()"/>
-        <button id="removeButton" label="&remove.label;" disabled="true" oncommand="removeAlias()"/>
-      </vbox>
+  <groupbox>
+   <caption label="&aliasManager.label;"/>
+   <description>&aliasManagerDescription.label;</description>
+    <hbox pack="end">
+      <button label="&manageAliases.label;" oncommand="manageAliases()"/>
     </hbox>
   </groupbox>
 
diff --git a/mozilla/extensions/sql/base/resources/jar.mn b/mozilla/extensions/sql/base/resources/jar.mn
index 224f826cdbc..8e231e02a45 100644
--- a/mozilla/extensions/sql/base/resources/jar.mn
+++ b/mozilla/extensions/sql/base/resources/jar.mn
@@ -5,7 +5,10 @@ sql.jar:
     content/sql/pref-sql.js				(content/pref-sql.js)
     content/sql/aliasDialog.xul				(content/aliasDialog.xul)
     content/sql/aliasDialog.js				(content/aliasDialog.js)
+    content/sql/aliasManager.xul			(content/aliasManager.xul)
+    content/sql/aliasManager.js				(content/aliasManager.js)
     locale/en-US/sql/contents.rdf			(locale/en-US/contents.rdf)
     locale/en-US/sql/sqlPrefsOverlay.dtd		(locale/en-US/sqlPrefsOverlay.dtd)
     locale/en-US/sql/pref-sql.dtd			(locale/en-US/pref-sql.dtd)
     locale/en-US/sql/aliasDialog.dtd			(locale/en-US/aliasDialog.dtd)
+    locale/en-US/sql/aliasManager.dtd			(locale/en-US/aliasManager.dtd)
diff --git a/mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd b/mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd
index 419457661ff..4082852427d 100644
--- a/mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd
+++ b/mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd
@@ -40,3 +40,4 @@
 <!ENTITY hostname.label "Hostname:">
 <!ENTITY port.label "Port:">
 <!ENTITY database.label "Database:">
+<!ENTITY priority.label "Priority:">
diff --git a/mozilla/extensions/sql/base/resources/locale/en-US/aliasManager.dtd b/mozilla/extensions/sql/base/resources/locale/en-US/aliasManager.dtd
new file mode 100644
index 00000000000..fd203f21108
--- /dev/null
+++ b/mozilla/extensions/sql/base/resources/locale/en-US/aliasManager.dtd
@@ -0,0 +1,48 @@
+<!-- ***** 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 mozilla.org code.
+   -
+   - The Initial Developer of the Original Code is Jan Varga
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - 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 ***** -->
+
+<!ENTITY title.label "Alias manager">
+
+<!ENTITY aliases.label "Aliases">
+<!ENTITY nameCol.label "Name">
+<!ENTITY typeCol.label "Type">
+<!ENTITY hostnameCol.label "Hostname">
+<!ENTITY portCol.label "Port">
+<!ENTITY databaseCol.label "Database">
+<!ENTITY priorityCol.label "Priority">
+
+<!ENTITY add.label "Add alias">
+<!ENTITY update.label "Update alias">
+<!ENTITY remove.label "Remove alias">
diff --git a/mozilla/extensions/sql/base/resources/locale/en-US/pref-sql.dtd b/mozilla/extensions/sql/base/resources/locale/en-US/pref-sql.dtd
index 8d8cf5cadbb..3f2ac5ac591 100644
--- a/mozilla/extensions/sql/base/resources/locale/en-US/pref-sql.dtd
+++ b/mozilla/extensions/sql/base/resources/locale/en-US/pref-sql.dtd
@@ -35,13 +35,6 @@
 
 <!ENTITY header.label "SQL support">
 
-<!ENTITY aliases.label "Aliases">
-<!ENTITY nameCol.label "Name">
-<!ENTITY typeCol.label "Type">
-<!ENTITY hostnameCol.label "Hostname">
-<!ENTITY portCol.label "Port">
-<!ENTITY databaseCol.label "Database">
-
-<!ENTITY add.label "Add alias">
-<!ENTITY update.label "Update alias">
-<!ENTITY remove.label "Remove alias">
+<!ENTITY aliasManager.label "Alias Manager">
+<!ENTITY aliasManagerDescription.label "Alias manager maintains a set of aliases, one for each database to connect to.">
+<!ENTITY manageAliases.label "Manage Aliases...">
diff --git a/mozilla/extensions/sql/base/src/mozSqlService.cpp b/mozilla/extensions/sql/base/src/mozSqlService.cpp
index 215bb8c14b1..4dc2e9626ac 100644
--- a/mozilla/extensions/sql/base/src/mozSqlService.cpp
+++ b/mozilla/extensions/sql/base/src/mozSqlService.cpp
@@ -63,6 +63,7 @@ nsIRDFResource*         mozSqlService::kSQL_Type;
 nsIRDFResource*         mozSqlService::kSQL_Hostname;
 nsIRDFResource*         mozSqlService::kSQL_Port;
 nsIRDFResource*         mozSqlService::kSQL_Database;
+nsIRDFResource*         mozSqlService::kSQL_Priority;
 
 
 mozSqlService::mozSqlService()
@@ -82,6 +83,7 @@ mozSqlService::~mozSqlService()
   NS_IF_RELEASE(kSQL_Hostname);
   NS_IF_RELEASE(kSQL_Port);
   NS_IF_RELEASE(kSQL_Database);
+  NS_IF_RELEASE(kSQL_Priority);
 
   nsServiceManager::ReleaseService(kRDFContainerUtilsCID, gRDFContainerUtils);
   gRDFContainerUtils = nsnull;
@@ -128,6 +130,8 @@ mozSqlService::Init()
                            &kSQL_Port);
   gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "database"),
                            &kSQL_Database);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "priority"),
+                           &kSQL_Priority);
 
   nsCOMPtr<nsIFile> file;
   rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
@@ -155,6 +159,7 @@ mozSqlService::AddAlias(const nsAString& aName,
                         const nsAString& aHostname,
                         PRInt32 aPort,
                         const nsAString& aDatabase,
+			PRInt32 aPriority,
                         nsIRDFResource** aResult)
 {
   nsCOMPtr<nsIRDFResource> alias;
@@ -178,6 +183,9 @@ mozSqlService::AddAlias(const nsAString& aName,
   gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
   mInner->Assert(alias, kSQL_Database, rdfLiteral, PR_TRUE);
 
+  gRDFService->GetIntLiteral(aPriority, getter_AddRefs(rdfInt));
+  mInner->Assert(alias, kSQL_Priority, rdfInt, PR_TRUE);
+
   nsresult rv = EnsureAliasesContainer();
   if (NS_FAILED(rv))
     return rv;
@@ -197,7 +205,8 @@ mozSqlService::FetchAlias(nsIRDFResource* aAlias,
                           nsAString& aType,
                           nsAString& aHostname,
                           PRInt32* aPort,
-                          nsAString& aDatabase)
+                          nsAString& aDatabase,
+                          PRInt32* aPriority)
 {
   nsCOMPtr<nsIRDFNode> rdfNode;
   nsCOMPtr<nsIRDFLiteral> rdfLiteral;
@@ -238,6 +247,12 @@ mozSqlService::FetchAlias(nsIRDFResource* aAlias,
     aDatabase.Assign(value);
   }
 
+  mInner->GetTarget(aAlias, kSQL_Priority, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfInt = do_QueryInterface(rdfNode);
+    rdfInt->GetValue(aPriority);
+  }
+
   return NS_OK;
 }
 
@@ -247,7 +262,8 @@ mozSqlService::UpdateAlias(nsIRDFResource* aAlias,
                            const nsAString& aType,
                            const nsAString& aHostname,
                            PRInt32 aPort,
-                           const nsAString& aDatabase)
+                           const nsAString& aDatabase,
+                           PRInt32 aPriority)
 {
   nsCOMPtr<nsIRDFNode> rdfNode;
   nsCOMPtr<nsIRDFLiteral> rdfLiteral;
@@ -273,6 +289,13 @@ mozSqlService::UpdateAlias(nsIRDFResource* aAlias,
   gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
   mInner->Change(aAlias, kSQL_Database, rdfNode, rdfLiteral);
 
+  mInner->GetTarget(aAlias, kSQL_Priority, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetIntLiteral(aPriority, getter_AddRefs(rdfInt));
+  if (rdfNode)
+    mInner->Change(aAlias, kSQL_Priority, rdfNode, rdfInt);
+  else
+    mInner->Assert(aAlias, kSQL_Priority, rdfInt, PR_TRUE);
+
   Flush();
 
   return NS_OK;
@@ -298,6 +321,9 @@ mozSqlService::RemoveAlias(nsIRDFResource* aAlias)
   mInner->GetTarget(aAlias, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
   mInner->Unassert(aAlias, kSQL_Database, rdfNode);
 
+  mInner->GetTarget(aAlias, kSQL_Priority, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Priority, rdfNode);
+
   nsresult rv = EnsureAliasesContainer();
   if (NS_FAILED(rv))
     return rv;
@@ -327,6 +353,25 @@ mozSqlService::GetAlias(const nsAString& aName, nsIRDFResource** _retval)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+mozSqlService::GetAliases(const nsAString& aName, nsISimpleEnumerator** _retval)
+{
+  nsCOMPtr<nsIRDFLiteral> nameLiteral;
+  nsresult rv = gRDFService->GetLiteral(PromiseFlatString(aName).get(),
+                                        getter_AddRefs(nameLiteral));
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCOMPtr<nsISimpleEnumerator> aliases;
+  rv = mInner->GetSources(kSQL_Name, nameLiteral, PR_TRUE, getter_AddRefs(aliases));
+  if (NS_FAILED(rv))
+    return rv;
+
+  NS_IF_ADDREF(*_retval = aliases);
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 mozSqlService::GetConnection(nsIRDFResource* aAlias, mozISqlConnection **_retval)
 {
@@ -371,7 +416,8 @@ mozSqlService::GetNewConnection(nsIRDFResource* aAlias, mozISqlConnection **_ret
   nsAutoString hostname;
   PRInt32 port;
   nsAutoString database;
-  nsresult rv = FetchAlias(aAlias, name, type, hostname, &port, database);
+  PRInt32 priority;
+  nsresult rv = FetchAlias(aAlias, name, type, hostname, &port, database, &priority);
   if (NS_FAILED(rv))
     return rv;
 
diff --git a/mozilla/extensions/sql/base/src/mozSqlService.h b/mozilla/extensions/sql/base/src/mozSqlService.h
index caa8f5cda37..c6e8de07a1d 100644
--- a/mozilla/extensions/sql/base/src/mozSqlService.h
+++ b/mozilla/extensions/sql/base/src/mozSqlService.h
@@ -76,6 +76,7 @@ class mozSqlService : public mozISqlService,
     static nsIRDFResource*              kSQL_Hostname;
     static nsIRDFResource*              kSQL_Port;
     static nsIRDFResource*              kSQL_Database;
+    static nsIRDFResource*              kSQL_Priority;
 	
     nsString                            mErrorMessage;
     nsCOMPtr<nsIRDFDataSource>          mInner;