This commit was manufactured by cvs2svn to create branch

'AVIARY_1_0_20040515_BRANCH'.

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@156431 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/sql/base/Makefile.in

@@ -0,0 +1,46 @@
+# ***** 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 ***** */
+
+DEPTH           = ../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+DIRS            = \
+		public \
+		src \
+		resources
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/public/Makefile.in

@@ -0,0 +1,54 @@
+# ***** 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 ***** */
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+MODULE		= sql
+
+XPIDLSRCS	= \
+		mozISqlConnection.idl \
+		mozISqlRequest.idl \
+		mozISqlDataSource.idl \
+		mozISqlInputStream.idl \
+		mozISqlRequestObserver.idl \
+		mozISqlResult.idl \
+		mozISqlResultEnumerator.idl \
+		mozISqlService.idl \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/public/mozISqlConnection.idl

@@ -0,0 +1,154 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface mozISqlResult;
+interface mozISqlRequest;
+interface mozISqlRequestObserver;
+
+/**
+ * A connection to a SQL database. This interface may be further extended
+ * by a particular database implementation. The SQL service is responsible
+ * for creating and maintaining connections, so there isn't a means to create
+ * one directly via this interface.
+ *
+ * @status UNDER_REVIEW
+ */
+
+[scriptable, uuid(f16397a4-1ecb-4e08-84f8-27750c04b779)]
+interface mozISqlConnection : nsISupports
+{
+  /**
+   * A string holding the name and/or version info of the database.
+   */
+  readonly attribute AString serverVersion;
+
+  /**
+   * The most recent error message.
+   */
+  readonly attribute AString errorMessage;
+
+  /**
+   * The ID of the most recently added record.
+   */
+  readonly attribute long lastID;
+
+  /**
+   * Set up the connection. This is called by the SQL service. There is no
+   * need to call this method directly.
+   *
+   * @param aHost       the host name.
+   * @param aPort       the port at which the host is listening.
+   * @param aDatabase   the real database name to connect to.
+   * @param aUsername   the username to connect as.
+   * @param aPassword   the password to use in authentification phase.   
+   */
+  void init(in AString aHost,
+            in long aPort,
+            in AString aDatabase,
+            in AString aUsername,
+            in AString aPassword);
+
+  /**
+   * Execute an SQL query synchronously and return the query result.
+   *
+   * @param aQuery      the SQL string of the query to execute
+   * @return            the result of the query
+   */
+  mozISqlResult executeQuery(in AString aQuery);
+
+  /**
+   * Execute an SQL update synchronously and return the number of updated
+   * rows.
+   *
+   * @param aUpdate     the update to execute
+   * @return            the result of the query
+   */
+  long executeUpdate(in AString aUpdate);
+
+  /**
+   * Execute an SQL query asynchronously and return a request. An observer
+   * may be used to track when the query has completed.
+   *
+   * @param aQuery      the SQL string of the query to execute
+   * @param aContext    extra argument that will be passed to the observer
+   * @param aObserver   observer that will be notified when the query is done
+   * @return            a request object
+   */
+  mozISqlRequest asyncExecuteQuery(in AString aQuery,
+                                   in nsISupports aContext,
+                                   in mozISqlRequestObserver aObserver);
+
+  /**
+   * Execute an SQL update asynchronously and return a request. An observer
+   * may be used to track when the query has completed.
+   *
+   * @param aQuery      the SQL string of the update to execute
+   * @param aContext    extra argument that will be passed to the observer
+   * @param aObserver   observer that will be notified when the update is done
+   * @return            a request object
+   */
+  mozISqlRequest asyncExecuteUpdate(in AString aQuery,
+                                    in nsISupports aContext,
+                                    in mozISqlRequestObserver aObserver);
+
+  /**
+   * Begin a transaction. Updates made during the transaction will not be
+   * made permanent until it is committed using commitTransaction.
+   */
+  void beginTransaction();
+
+  /**
+   * Commit the current transaction
+   */
+  void commitTransaction();
+
+  /**
+   * Rollback (cancel) the current transaction
+   */
+  void rollbackTransaction();
+
+  /**
+   * Return the primary keys of a given table.
+   *
+   * @param aSchema     the schema
+   * @param aTable      the table name of the keys to retrieve
+   * @return            the result which holds the keys
+   */
+  mozISqlResult getPrimaryKeys(in AString aSchema, in AString aTable);
+
+};

mozilla/extensions/sql/base/public/mozISqlDataSource.idl

@@ -0,0 +1,63 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface nsIRDFResource;
+
+/**
+ * @status UNDER_REVIEW
+ */
+
+[scriptable, uuid(3c0a954f-b595-46a4-932c-3660f55e2e10)]
+interface mozISqlDataSource : nsISupports
+{
+
+  /**
+   * Retrieve the RDF resource associated with the specified row.
+   *
+   * @param aRowIndex   The row index.
+   */
+  nsIRDFResource getResourceAtIndex(in long aRowIndex);
+
+  /**
+   * Retrieve the index associated with specified RDF resource.
+   *
+   * @param aResource   The resource.
+   */
+  long getIndexOfResource(in nsIRDFResource aResource);
+
+};

mozilla/extensions/sql/base/public/mozISqlInputStream.idl

@@ -0,0 +1,64 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+/**
+ * This interface is a utility for reading SQL result contents as a stream.
+ *
+ * @status UNDER_DEVELOPMENT
+ */
+
+[scriptable, uuid(555f2485-ba82-4c5c-9dd2-d801104dc09e)]
+interface mozISqlInputStream : nsISupports
+{
+  /**
+   * Retrieves the name of a column given its index. Indicies start at zero.
+   *
+   * @param aColumnIndex   the index of the column to return
+   * @return               the column name
+   */
+  AString getColumnHeader(in long aColumnIndex);
+
+  /**
+   * Sets the name of a column given its index. Indicies start at zero.
+   *
+   * @param aColumnIndex   the index of the column to change
+   * @param aLabel         the column name
+   */
+  void setColumnHeader(in long aColumnIndex, in AString aLabel);
+
+};

mozilla/extensions/sql/base/public/mozISqlRequest.idl

@@ -0,0 +1,108 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface mozISqlConnection;
+interface mozISqlRequestObserver;
+interface mozISqlResult;
+
+/**
+ * A request interface used during an asynchronous SQL query or update operation.
+ *
+ * @status UNDER_REVIEW
+ */
+
+[scriptable, uuid(f67cb817-5e07-49ff-aacc-5c80585c5031)]
+interface mozISqlRequest : nsISupports
+{
+  /**
+   * The most recent error message.
+   */
+  readonly attribute AString errorMessage;
+
+  /**
+   * The result of the operation.
+   */
+  readonly attribute mozISqlResult result;
+
+  /**
+   * The number of rows that were affected during an update.
+   */
+  readonly attribute long affectedRows;
+
+  /**
+   * The ID of the most recently added record.
+   */
+  readonly attribute long lastID;
+
+  /**
+   * The SQL query
+   */
+  readonly attribute AString query;
+
+  /**
+   * The context passed to the connection's asyncExecuteQuery or
+   * asyncExecuteUpdate method.
+   */
+  readonly attribute nsISupports ctxt;
+
+  /**
+   * The observer that listens for when the request is finished.
+   * Methods of the observer should be called by the request.
+   */
+  readonly attribute mozISqlRequestObserver observer;
+
+  /**
+   * Status codes
+   */
+  const long STATUS_NONE        = 0;
+  const long STATUS_EXECUTED    = 1;
+  const long STATUS_COMPLETE    = 2;
+  const long STATUS_ERROR       = 3;
+  const long STATUS_CANCELLED   = 4;
+  
+  /**
+   * The status of the request.
+   */
+  readonly attribute long status;
+  
+  /**
+   * Cancels the operation.
+   */
+  void cancel();
+
+};

mozilla/extensions/sql/base/public/mozISqlRequestObserver.idl

@@ -0,0 +1,70 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface mozISqlRequest;
+
+/**
+ * This observer interface is used to listen to asynchronous SQL query or
+ * update requests.
+ *
+ * @status UNDER_REVIEW
+ */
+
+[scriptable, uuid(9e950bc0-e252-41ef-ac6f-3e3c4acd9dd8)]
+interface mozISqlRequestObserver : nsISupports
+{
+  /**
+   * This method will be called when the request is started.
+   *
+   * @param aRequest the request that has started
+   * @param aContext a context that was supplied in the query/update call
+   */
+  void onStartRequest(in mozISqlRequest aRequest,
+                      in nsISupports aContext);
+
+  /**
+   * This method will be called when the request has finished. This function
+   * will be called in both success and error cases.
+   *
+   * @param aRequest the request that has started
+   * @param aContext a context that was supplied in the query/update call
+   */
+  void onStopRequest(in mozISqlRequest aRequest,
+                     in nsISupports aContext);
+
+};

mozilla/extensions/sql/base/public/mozISqlResult.idl

@@ -0,0 +1,154 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface mozISqlConnection;
+interface mozISqlResultEnumerator;
+interface mozISqlInputStream;
+
+/**
+ * The result of an SQL query. Use the enumerate method to retrieve each
+ * row.
+ *
+ * @status UNDER_DEVELOPMENT
+ */
+
+[scriptable, uuid(08c220b0-7140-456a-89e9-c94609a7392d)]
+interface mozISqlResult : nsISupports
+{
+  /**
+   * The connection used to execute the query
+   */
+  readonly attribute mozISqlConnection connection;
+
+  /**
+   * The SQL query
+   */
+  readonly attribute AString query;
+
+  /**
+   * The table that was used in the query. If more than one table was used,
+   * only the first is returned. 
+   */
+  readonly attribute AString tableName;
+
+  /**
+   * The number of rows in the result
+   */
+  readonly attribute long rowCount;
+
+  /**
+   * The number of columns in the result
+   */
+  readonly attribute long columnCount;
+
+  /**
+   * Retrieves the name of a column given its index. Indicies start at zero.
+   *
+   * @param aColumnIndex   the index of the column to return
+   * @return               the column name
+   */
+  AString getColumnName(in long aColumnIndex);
+
+  /**
+   * Retrieves the index of a column given its name. If the column does not
+   * exist, -1 is returned.
+   *
+   * @param aColumnName    the column name to return
+   * @return               the column index
+   */
+  long getColumnIndex(in AString aColumnName);
+
+  /**
+   * column type constants used by |getColumnType|.
+   */
+  const long TYPE_STRING        = 1;
+  const long TYPE_INT           = 2;
+  const long TYPE_FLOAT         = 3;
+  const long TYPE_DECIMAL       = 4;
+  const long TYPE_DATE	        = 5;
+  const long TYPE_TIME	        = 6;
+  const long TYPE_DATETIME      = 7;
+  const long TYPE_BOOL	        = 8;
+
+  /**
+   * Returns the type of the data in a given column.
+   *
+   * @param aColumnIndex   the index of the column to return the type of
+   * @return               the column type
+   */
+  long getColumnType(in long aColumnIndex);
+
+  /**
+   * Returns the type of the data in a given column as a string. This is used
+   * as an alternative to using the constants and will return either
+   * string, int, float, decimal, date, time, datetime or bool.
+   *
+   * @param aColumnIndex   the index of the column to return the type of
+   * @return               the column type
+   */
+  AString getColumnTypeAsString(in long aColumnIndex);
+
+  /**
+   * Returns the maximum number of bytes that are needed to hold a value in a
+   * particular column.
+   *
+   * @param aColumnIndex   the index of the column to return the size of
+   * @return               the column size
+   */
+  long getColumnDisplaySize(in long aColumnIndex);
+
+  /**
+   * Returns an enumerator to enumerator over the returned rows.
+   *
+   * @return               the row enumerator
+   */
+  mozISqlResultEnumerator enumerate();
+
+  /**
+   * Returns a stream which may be used to return the rows as HTML.
+   *
+   * @return               the input stream
+   */
+  mozISqlInputStream open();
+
+  /**
+   * Re-executes the query.
+   */
+  void reload();
+
+};

mozilla/extensions/sql/base/public/mozISqlResultEnumerator.idl

@@ -0,0 +1,363 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface nsIVariant;
+
+/**
+ * This interface is used to get the results from an SQL query.
+ * The enumerator uses a row pointer which can be adjusted with
+ * the next and previous methods. Other methods operate only on
+ * the row selected by the pointer.
+ *
+ * The row pointer starts just before the first row, so you should
+ * always call the next method once before attempting to read row
+ * data.
+ *
+ * @status UNDER_DEVELOPMENT
+ */
+
+[scriptable, uuid(dcc0d29e-2b44-460e-b39f-89121ff8b963)]
+interface mozISqlResultEnumerator : nsISupports
+{
+  /**
+   * The most recent error message.
+   */
+  readonly attribute AString errorMessage;
+
+  /**
+   * Moves the row pointer to the next row in the results.
+   * Returns true if there is a next row and false if there are
+   * no more rows.
+   *
+   * @return               false if there are no more rows
+   */
+  boolean next();
+
+  /**
+   * Moves the row pointer to the previous row in the results.
+   * Returns true if there is a previous row.
+   *
+   * @return               false if there are no previous rows
+   */
+  boolean previous();
+
+  /**
+   * Moves the row pointer to just before the first row.
+   */
+  void beforeFirst();
+
+  /**
+   * Moves the row pointer to the first row.
+   */
+  void first();
+
+  /**
+   * Moves the row pointer to the last row.
+   */
+  void last();
+
+  /**
+   * Moves the row pointer by a number relative to the current row.
+   * An error occurs if this causes the row pointer to extend past
+   * the last row. This method may also be used to move the row pointer
+   * back by using a negative value.
+   *
+   * @param aRowIndex      aRowIndex the number of rows to move by
+   */
+  void relative(in long aRows);
+
+  /**
+   * Moves the row pointer to a specific row. An error occurs if the index
+   * is after the last row.
+   *
+   * @param aRowIndex      the index of the row to move to
+   */
+  void absolute(in long aRowIndex);
+
+
+  /**
+   * Returns true if the value at the specified column in the current row
+   * is null.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               true if the value is null
+   */
+  boolean isNull(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a variant.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the value as a variant
+   */
+  nsIVariant getVariant(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a string.
+   * An error occurs if the value is not a string type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the string value
+   */
+  AString getString(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as an
+   * integer. An error occurs if the value is not a integer type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the integer value
+   */
+  long getInt(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a
+   * float. An error occurs if the value is not a float type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the float value
+   */
+  float getFloat(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a
+   * decimal. An error occurs if the value is not a decimal type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the decimal value
+   */
+  float getDecimal(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a date.
+   * An error occurs if the value is not a date type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the date value
+   */
+  long long getDate(in long aColumnIndex);
+
+  /**
+   * Returns the value at the specified column in the current row as a
+   * boolean. An error occurs if the value is not a boolean type.
+   *
+   * @param aColumnIndex   the column to retrieve
+   * @return               the boolean value
+   */
+  boolean getBool(in long aColumnIndex);
+
+
+  /**
+   * Sets the value at the specified column in the current row to null.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   */
+  void setNull(in long aColumnIndex);
+
+  /**
+   * Sets the value at the specified column in the current row to the
+   * default value for that column. Changes are not committed until either the
+   * insertRow or updateRow method is called.
+   *
+   * @param aColumnIndex   the column to modify
+   */
+  void setDefault(in long aColumnIndex);
+
+  /**
+   * Sets the value at the specified column in the current row to its original
+   * value. The row may be changed with the various setX methods and then
+   * commited with updateRow.
+   *
+   * @param aColumnIndex   the column to modify
+   */
+  void copy(in long aColumnIndex);
+
+  /**
+   * Sets the value at the specified column in the current row to a variant.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setVariant(in long aColumnIndex, in nsIVariant aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to a string.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setString(in long aColumnIndex, in AString aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to an integer.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setInt(in long aColumnIndex, in long aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to a float.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setFloat(in long aColumnIndex, in float aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to a decimal.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setDecimal(in long aColumnIndex, in float aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to a date.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setDate(in long aColumnIndex, in long long aValue);
+
+  /**
+   * Sets the value at the specified column in the current row to a boolean.
+   * Changes are not committed until either the insertRow or updateRow method
+   * is called.
+   *
+   * @param aColumnIndex   the column to modify
+   * @param aValue         the value to assign
+   */
+  void setBool(in long aColumnIndex, in boolean aValue);
+
+
+  /**
+   * Sets the value of the cells in all columns in the current row to null.
+   * This is equivalent to calling setNullValue for every column.
+   */
+  void setNullValues();
+
+  /**
+   * Sets the value of the cells in all columns in the current row to the
+   * default values for the columns. This is equivalent to calling
+   * setDefaultValue for every column.
+   */
+  void setDefaultValues();
+
+  /**
+   * Sets the values of all of the cells in the current row to their original
+   * values. The row may be changed with the various set methods and then
+   * commited with updateRow. This method is equivalent to calling the copy
+   * method for each column.
+   */
+  void copyValues();
+
+
+  /**
+   * Returns true if inserts are allowed.
+   *
+   * @return               true if inserts are allowed
+   */
+  boolean canInsert();
+
+  /**
+   * Returns true if updates are allowed.
+   *
+   * @return               true if updates are allowed
+   */
+  boolean canUpdate();
+
+  /**
+   * Returns true if deletes are allowed.
+   *
+   * @return               true if deletes are allowed
+   */
+  boolean canDelete();
+
+  /**
+   * Inserts a row using the data assigned using the various setX methods.
+   * The row was inserted successfully if 0 or 1 is returned, however if 0
+   * is returned, the row does not satisfy the where condition of the result
+   * (that is, it doesn't belong in the result enumerator) and does not need
+   * to be displayed.
+   *
+   * @return               1 if the row was inserted, 0 if the row was
+   *                       inserted but does not fit the condition, or -1
+   *                       if an error occured.
+   */
+  long insertRow();
+  
+  /**
+   * Updates the current row using the data assigned using the various setX
+   * methods. The row was inserted successfully if 0 or 1 is returned, however
+   * if 0 is returned, the row does not satisfy the where condition of the
+   * result and does not need to be displayed.
+   *
+   * @return               1 if the row was updated, 0 if the row was updated
+   *                       but does not fit the condition, or -1 if an error
+   *                       occured.
+   */
+  long updateRow();
+
+  /**
+   * Deletes the current row.
+   *
+   * @return               1 if the row was deleted or -1 if an error occured.
+   */
+  long deleteRow();
+
+  /**
+   * Holds the SQL condition clause.
+   */
+  readonly attribute AString currentCondition;
+
+};

mozilla/extensions/sql/base/public/mozISqlService.idl

@@ -0,0 +1,158 @@
+/* ***** 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):
+ *   Neil Deakin <enndeakin@sympatico.ca>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface nsIRDFResource;
+interface mozISqlConnection;
+
+/**
+ * The SQL service is used to construct direct connections to SQL-based
+ * databases. The service maintains a set of aliases, one for each database
+ * to connect to. Methods are provided for adding, retrieving and removing
+ * aliases. Once an alias has been added, it is persistent, so it does not need
+ * to be added again. The aliases are stored in user preferences.
+ * Aliases are identfied using an RDF resource.
+ *
+ * Once an alias has been added, a connection may be opened to a database using
+ * the RDF resource.
+ *
+ * @status UNDER_DEVELOPMENT
+ */
+
+[scriptable, uuid(1ceb35b7-daa8-4ce4-ac67-125fb17cb019)]
+interface mozISqlService : nsISupports
+{
+  /**
+   * Holds the string message of the last error that occured when a connection
+   * was opened.
+   */
+  readonly attribute AString errorMessage;
+
+  /**
+   * Add an alias for a database connection. An alias must be added before a
+   * connection can be made.
+   *
+   * Different types of databases may be connected to using the |aType|
+   * argument. For instance 'pgsql' or 'mysql'. When a connection is made, a
+   * component of the form '@mozilla.org/sql/connection;1?type=<type>' will be
+   * looked up using the component manager. This allows additional database
+   * implementations to be provided separately of mozSQL.
+   *
+   * @param aName       human-readable name of the alias
+   * @param aType       database type (such as pgsql)
+   * @param aHostname   hostname for the database
+   * @param aPort       port for the database
+   * @param aDatabase   database name
+   * @return            an RDF resource representing the alias
+   */
+   nsIRDFResource addAlias(in AString aName,
+                           in AString aType,
+                           in AString aHostname,
+                           in long aPort,
+                           in AString aDatabase);
+
+  /**
+   * Retrieves alias information. The out parameters are filled in with
+   * the corresponding information.
+   *
+   * @param aAlias      the alias to retrieve
+   * @param aName       human-readable name of the alias
+   * @param aType       database type
+   * @param aHostname   hostname of the database
+   * @param aPort       port of the database
+   * @param aDatabase   database name
+   */
+  void fetchAlias(in nsIRDFResource aAlias,
+                  out AString aName,
+                  out AString aType,
+                  out AString aHostname,
+                  out long aPort,
+                  out AString aDatabase);
+
+  /**
+   * Update the information of an alias that has already been added. The new
+   * information replaces the old information.
+   *
+   *
+   * @param aAlias      the alias to update
+   * @param aName       human-readable name of the alias
+   * @param aType       database type (such as pgsql)
+   * @param aHostname   hostname for the database
+   * @param aPort       port for the database
+   * @param aDatabase   database name
+   */
+  void updateAlias(in nsIRDFResource aAlias,
+                   in AString aName,
+                   in AString aType,
+                   in AString aHostname,
+                   in long aPort,
+                   in AString aDatabase);
+
+  /**
+   * Removes an alias that already exists.
+   *
+   * @param aAlias      the alias to remove
+   */
+  void removeAlias(in nsIRDFResource aAlias);
+
+  /**
+   * Get the alias resource with the given name.
+   *
+   * @param aName      the name of the alias to retrieve
+   * @return           the RDF resource for the alias, or null if it doesn't exist.
+   */
+  nsIRDFResource getAlias(in AString aName);
+
+  /**
+   * Retrieves an SQL connection to a database given its alias. If a
+   * connection is already open, that connection is returned. Otherwise,
+   * a new connection is opened and returned.
+   *
+   * @param aAlias      the alias to use to open a connection
+   * @return            a connection
+   */
+  mozISqlConnection getConnection(in nsIRDFResource aAlias);
+
+  /**
+   * Opens and returns a new connection to a database. The user will be
+   * prompted for a username and password.
+   *
+   * @param aAlias      the alias to use to open a connection
+   * @return            a newly opened connection
+   */
+  mozISqlConnection getNewConnection(in nsIRDFResource aAlias);
+};

mozilla/extensions/sql/base/resources/Makefile.in

@@ -0,0 +1,41 @@
+# ***** 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 ***** */
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/resources/content/aliasDialog.js

@@ -0,0 +1,73 @@
+/* ***** 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;
+
+var name;
+var type;
+var hostname;
+var port;
+var database;
+
+function init() {
+  sqlService = Components.classes["@mozilla.org/sql/service;1"]
+              .getService(Components.interfaces.mozISqlService);
+
+  name = document.getElementById("name");
+  type = document.getElementById("type");
+  hostname = document.getElementById("hostname");
+  port = document.getElementById("port");
+  database = document.getElementById("database");
+
+  if (window.arguments) {
+    // get original values
+    var alias = window.arguments[0];
+    sqlService.fetchAlias(alias, name, type, hostname, port, database);
+  }
+}
+
+function onAccept() {
+  if (window.arguments) {
+    // update an existing alias
+    var alias = window.arguments[0];
+    sqlService.updateAlias(alias, name.value, type.value, hostname.value,
+                           port.value, database.value);
+  }
+  else {
+    // add a new database
+    sqlService.addAlias(name.value, type.value, hostname.value,
+                        port.value, database.value);
+  }
+}

mozilla/extensions/sql/base/resources/content/aliasDialog.xul

@@ -0,0 +1,81 @@
+<?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 dialog SYSTEM "chrome://sql/locale/aliasDialog.dtd">
+
+<dialog id="aliasDialog"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  title="&window.title;"
+  width="250" height="180"
+  buttons="accept,cancel" buttonpack="center"
+  ondialogaccept="return onAccept(event);"
+  onload="init()">
+
+  <script type="application/x-javascript" src="aliasDialog.js"/>
+
+  <grid flex="1">
+    <columns>
+      <column/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row>
+        <label value="&name.label;"/>
+        <textbox id="name"/>
+      </row>
+      <row>
+        <label value="&type.label;"/>
+        <textbox id="type"/>
+      </row>
+      <row>
+        <label value="&hostname.label;"/>
+        <textbox id="hostname"/>
+      </row>
+      <row>
+        <label value="&port.label;"/>
+        <textbox id="port"/>
+      </row>
+      <row>
+        <label value="&database.label;"/>
+        <textbox id="database"/>
+      </row>
+    </rows>
+  </grid>
+
+</dialog>

mozilla/extensions/sql/base/resources/content/contents.rdf

@@ -0,0 +1,63 @@
+<?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 ***** -->
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:sql"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:sql"
+        chrome:displayName="SQL support"
+        chrome:author="mozilla.org"
+        chrome:name="sql">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/> 
+  </RDF:Seq>
+
+  <!-- sql preferences branches -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://sql/content/sqlPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>                                                                    
+
+</RDF:RDF>

mozilla/extensions/sql/base/resources/content/pref-sql.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();
+}

mozilla/extensions/sql/base/resources/content/pref-sql.xul

@@ -0,0 +1,90 @@
+<?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/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');">
+
+  <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>
+    </hbox>
+  </groupbox>
+
+</page>

mozilla/extensions/sql/base/resources/content/sqlPrefsOverlay.xul

@@ -0,0 +1,52 @@
+<?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 ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://sql/locale/sqlPrefsOverlay.dtd">
+
+<overlay id="sqlPrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- category tree entries for sql -->
+  <treechildren id="panelChildren">
+    <treeitem id="sql">
+      <treerow>
+        <treecell label="&sql.label;" url="chrome://sql/content/pref-sql.xul"/>
+      </treerow>
+    </treeitem>
+  </treechildren>
+
+</overlay>

mozilla/extensions/sql/base/resources/jar.mn

@@ -0,0 +1,11 @@
+sql.jar:
+    content/sql/contents.rdf				(content/contents.rdf)
+    content/sql/sqlPrefsOverlay.xul			(content/sqlPrefsOverlay.xul)
+    content/sql/pref-sql.xul				(content/pref-sql.xul)
+    content/sql/pref-sql.js				(content/pref-sql.js)
+    content/sql/aliasDialog.xul				(content/aliasDialog.xul)
+    content/sql/aliasDialog.js				(content/aliasDialog.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)

mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd

@@ -0,0 +1,42 @@
+<!-- ***** 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 window.title "Alias">
+
+<!ENTITY name.label "Name:">
+<!ENTITY type.label "Type:">
+<!ENTITY hostname.label "Hostname:">
+<!ENTITY port.label "Port:">
+<!ENTITY database.label "Database:">

mozilla/extensions/sql/base/resources/locale/en-US/contents.rdf

@@ -0,0 +1,59 @@
+<?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 ***** -->
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locales being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US"
+        chrome:displayName="English(US)"
+        chrome:author="mozilla.org"
+        chrome:name="en-US"
+        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:sql"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+</RDF:RDF>

mozilla/extensions/sql/base/resources/locale/en-US/pref-sql.dtd

@@ -0,0 +1,47 @@
+<!-- ***** 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 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">

mozilla/extensions/sql/base/resources/locale/en-US/sqlPrefsOverlay.dtd

@@ -0,0 +1,36 @@
+<!-- ***** 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 sql.label "SQL support">

mozilla/extensions/sql/base/src/Makefile.in

@@ -0,0 +1,68 @@
+# ***** 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 ***** */
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= sql
+LIBRARY_NAME	= sqlbase_s
+REQUIRES	= xpcom \
+		  string \
+		  unicharutil \
+		  locale \
+		  necko \
+		  rdf \
+		  windowwatcher \
+		  $(NULL)
+
+CPPSRCS		= \
+		  mozSqlConnection.cpp \
+		  mozSqlRequest.cpp \
+		  mozSqlResult.cpp \
+		  mozSqlService.cpp
+
+EXPORTS		= \
+		  mozSqlConnection.h \
+		  mozSqlRequest.h \
+		  mozSqlResult.h \
+		  mozSqlService.h
+
+FORCE_STATIC_LIB=1
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/src/mozSqlConnection.cpp

@@ -0,0 +1,275 @@
+/* ***** 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 ***** */
+
+#include "nsIProxyObjectManager.h"
+#include "mozSqlRequest.h"
+#include "mozSqlConnection.h"
+
+mozSqlConnection::mozSqlConnection()
+  : mLock(nsnull),
+    mCondVar(nsnull),
+    mThread(nsnull),
+    mShutdown(PR_FALSE),
+    mWaiting(PR_FALSE)
+{
+  mExecLock = PR_NewLock();
+}
+
+mozSqlConnection::~mozSqlConnection()
+{
+  mRequests.Clear();
+
+  if (mCondVar)
+    PR_DestroyCondVar(mCondVar);
+  PR_DestroyLock(mExecLock);
+  if (mLock)
+    PR_DestroyLock(mLock);
+}
+
+// We require a special implementation of Release, which knows about
+// a circular strong reference
+NS_IMPL_THREADSAFE_ADDREF(mozSqlConnection)
+NS_IMPL_THREADSAFE_QUERY_INTERFACE3(mozSqlConnection,
+                                    mozISqlConnection,
+                                    nsIRunnable,
+				    nsISupportsWeakReference)
+NS_IMETHODIMP_(nsrefcnt)
+mozSqlConnection::Release()
+{
+  PR_AtomicDecrement((PRInt32*)&mRefCnt);
+  // Delete if the last reference is our strong circular reference.
+  if (mThread && mRefCnt == 1) {
+    PR_Lock(mLock);
+    mRequests.Clear();
+    mShutdown = PR_TRUE;
+    if (mWaiting)
+      PR_NotifyCondVar(mCondVar);
+    else
+      CancelExec();
+    PR_Unlock(mLock);
+    return 0;
+  }
+  else if (mRefCnt == 0) {
+    delete this;
+    return 0;
+  }
+  return mRefCnt;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::GetServerVersion(nsAString& aServerVersion) 
+{
+  aServerVersion = mServerVersion;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::GetErrorMessage(nsAString& aErrorMessage) 
+{
+  aErrorMessage = mErrorMessage;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::GetLastID(PRInt32* aLastID) 
+{
+  *aLastID = mLastID;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::Init(const nsAString & aHost, PRInt32 aPort,
+                       const nsAString & aDatabase, const nsAString & aUsername,
+                       const nsAString & aPassword)
+{
+  // descendants have to implement this themselves
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::ExecuteQuery(const nsAString& aQuery, mozISqlResult** _retval)
+{
+  PR_Lock(mExecLock);
+  nsresult rv = RealExec(aQuery, _retval, nsnull);
+  PR_Unlock(mExecLock);
+  return rv;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::ExecuteUpdate(const nsAString& aUpdate, PRInt32* _retval)
+{
+  PR_Lock(mExecLock);
+  nsresult rv = RealExec(aUpdate, nsnull, _retval);
+  PR_Unlock(mExecLock);
+  return rv;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::AsyncExecuteQuery(const nsAString& aQuery, nsISupports* aCtxt, 
+                                    mozISqlRequestObserver* aObserver,
+                                    mozISqlRequest **_retval)
+{
+  if (!mThread) {
+    mLock = PR_NewLock();
+    mCondVar = PR_NewCondVar(mLock);
+    NS_NewThread(getter_AddRefs(mThread), this, 0, PR_UNJOINABLE_THREAD);
+  }
+
+  mozSqlRequest* request = new mozSqlRequest(this);
+  if (! request)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  request->mIsQuery = PR_TRUE;
+  request->mQuery = aQuery;
+  request->mCtxt = aCtxt;
+
+  nsresult rv = NS_GetProxyForObject(NS_CURRENT_EVENTQ,
+                                     NS_GET_IID(mozISqlRequestObserver),
+                                     aObserver,
+                                     PROXY_SYNC | PROXY_ALWAYS,
+                                     getter_AddRefs(request->mObserver));
+  if (NS_FAILED(rv))
+    return rv;
+
+  PR_Lock(mLock);
+  mRequests.AppendObject(request);
+  if (mWaiting && mRequests.Count() == 1)
+    PR_NotifyCondVar(mCondVar);
+  PR_Unlock(mLock);
+
+  NS_ADDREF(*_retval = request);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::AsyncExecuteUpdate(const nsAString& aQuery, nsISupports* aCtxt, 
+                                     mozISqlRequestObserver* aObserver,
+                                     mozISqlRequest **_retval)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::BeginTransaction()
+{
+  PRInt32 affectedRows;
+  return ExecuteUpdate(NS_LITERAL_STRING("begin"), &affectedRows);
+}
+
+NS_IMETHODIMP
+mozSqlConnection::CommitTransaction()
+{
+  PRInt32 affectedRows;
+  return ExecuteUpdate(NS_LITERAL_STRING("commit"), &affectedRows);
+}
+
+NS_IMETHODIMP
+mozSqlConnection::RollbackTransaction()
+{
+  PRInt32 affectedRows;
+  return ExecuteUpdate(NS_LITERAL_STRING("rollback"), &affectedRows);
+}
+
+NS_IMETHODIMP
+mozSqlConnection::GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval)
+{
+  // descendants have to implement this themselves
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+mozSqlConnection::Run()
+{
+  PR_Lock(mLock);
+  while(!mShutdown) {
+
+    while (mRequests.Count()) {
+      mCurrentRequest = mRequests[0];
+      mRequests.RemoveObjectAt(0);
+
+
+      mozSqlRequest* r = (mozSqlRequest*)mCurrentRequest.get();
+
+      PR_Unlock(mLock);
+      r->mObserver->OnStartRequest(mCurrentRequest, r->mCtxt);
+      PR_Lock(mLock);
+
+      r->mStatus = mozISqlRequest::STATUS_EXECUTED;
+
+      PR_Unlock(mLock);
+
+      nsresult rv = ExecuteQuery(r->mQuery, getter_AddRefs(r->mResult));
+
+      PR_Lock(mLock);
+
+      if (NS_SUCCEEDED(rv))
+        r->mStatus = mozISqlRequest::STATUS_COMPLETE;
+      else {
+        r->mStatus = mozISqlRequest::STATUS_ERROR;
+	GetErrorMessage(r->mErrorMessage);
+      }
+        
+      PR_Unlock(mLock);
+      r->mObserver->OnStopRequest(mCurrentRequest, r->mCtxt);
+      PR_Lock(mLock);
+
+      mCurrentRequest = nsnull;
+
+    }
+    
+    mWaiting = PR_TRUE;
+    PR_WaitCondVar(mCondVar, PR_INTERVAL_NO_TIMEOUT);
+    mWaiting = PR_FALSE;
+  }
+  PR_Unlock(mLock);
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlConnection::CancelRequest(mozISqlRequest* aRequest)
+{
+  PR_Lock(mLock);
+  if (mCurrentRequest == aRequest)
+    CancelExec();
+  else {
+    if (mRequests.RemoveObject(aRequest))
+      ((mozSqlRequest*)aRequest)->mStatus = mozISqlRequest::STATUS_CANCELLED;
+  }
+  PR_Unlock(mLock);
+
+  return NS_OK;
+}

mozilla/extensions/sql/base/src/mozSqlConnection.h

@@ -0,0 +1,88 @@
+/* ***** 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 ***** */
+
+#ifndef mozSqlConnection_h
+#define mozSqlConnection_h                                                  
+
+#include "prcvar.h"
+#include "nsString.h"
+#include "nsCOMArray.h"
+#include "nsWeakReference.h"
+#include "nsIThread.h"
+#include "nsIRunnable.h"
+#include "mozISqlConnection.h"
+#include "mozISqlRequest.h"
+#include "mozISqlResult.h"
+
+class mozSqlConnection : public mozISqlConnection,
+                         public nsIRunnable,
+                         public nsSupportsWeakReference
+{
+  public:
+    mozSqlConnection();
+    virtual ~mozSqlConnection();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLCONNECTION
+
+    NS_DECL_NSIRUNNABLE
+
+    friend class mozSqlRequest;
+    friend class mozSqlResult;
+
+  protected:
+    virtual nsresult RealExec(const nsAString& aQuery,
+                              mozISqlResult** aResult, PRInt32* aAffectedRows) = 0;
+    virtual nsresult CancelExec() = 0;
+    virtual nsresult GetIDName(nsAString& aIDName) = 0;
+
+    nsresult CancelRequest(mozISqlRequest* aRequest);
+
+    nsString                    mServerVersion;
+    nsString                    mErrorMessage;
+    PRInt32                     mLastID;
+
+    PRLock*                     mLock;
+    PRCondVar*                  mCondVar;
+    PRLock*                     mExecLock;
+    nsCOMPtr<nsIThread>         mThread;
+    nsCOMArray<mozISqlRequest>  mRequests;
+    nsCOMPtr<mozISqlRequest>    mCurrentRequest;
+    PRBool                      mShutdown;
+    PRBool                      mWaiting;
+};
+
+#endif // mozSqlConnection_h

mozilla/extensions/sql/base/src/mozSqlRequest.cpp

@@ -0,0 +1,120 @@
+/* ***** 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 ***** */
+
+#include "mozSqlConnection.h"
+#include "mozSqlRequest.h"
+
+mozSqlRequest::mozSqlRequest(mozISqlConnection* aConnection)
+  : mAffectedRows(-1),
+    mIsQuery(PR_TRUE),
+    mStatus(mozISqlRequest::STATUS_NONE)
+{
+  mConnection = do_GetWeakReference(aConnection);
+}
+
+mozSqlRequest::~mozSqlRequest()
+{
+}
+
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(mozSqlRequest,
+                              mozISqlRequest);
+
+NS_IMETHODIMP
+mozSqlRequest::GetErrorMessage(nsAString & aErrorMessage)
+{
+  aErrorMessage = mErrorMessage;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetResult(mozISqlResult * *aResult)
+{
+  NS_IF_ADDREF(*aResult = mResult);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetAffectedRows(PRInt32 *aAffectedRows)
+{
+  *aAffectedRows = mAffectedRows;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetLastID(PRInt32* aLastID)
+{
+  *aLastID = mLastID;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetQuery(nsAString & aQuery)
+{
+  aQuery = mQuery;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetCtxt(nsISupports * *aCtxt)
+{
+  NS_IF_ADDREF(*aCtxt = mCtxt);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetObserver(mozISqlRequestObserver * *aObserver)
+{
+  NS_IF_ADDREF(*aObserver = mObserver);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::GetStatus(PRInt32 *aStatus)
+{
+  *aStatus = mStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlRequest::Cancel()
+{
+  nsCOMPtr<mozISqlConnection> connection = do_QueryReferent(mConnection);
+  if (!connection)
+    return NS_ERROR_FAILURE;
+
+  mozISqlConnection* connectionRaw = connection.get();
+  return ((mozSqlConnection*)connectionRaw)->CancelRequest(this);
+}

mozilla/extensions/sql/base/src/mozSqlRequest.h

@@ -0,0 +1,76 @@
+/* ***** 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 ***** */
+
+#ifndef mozSqlRequest_h
+#define mozSqlRequest_h                                                  
+
+#include "nsString.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.h"
+#include "mozISqlConnection.h"
+#include "mozISqlResult.h"
+#include "mozISqlRequest.h"
+#include "mozISqlRequestObserver.h"
+
+class mozSqlRequest : public mozISqlRequest
+{
+  public:
+    mozSqlRequest(mozISqlConnection* aConnection);
+    virtual ~mozSqlRequest();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLREQUEST
+
+    friend class mozSqlConnection;
+
+  protected:
+    nsCOMPtr<nsIWeakReference>          mConnection;
+
+    nsString                            mErrorMessage;
+    nsCOMPtr<mozISqlResult>             mResult;
+    PRInt32                             mAffectedRows;
+    PRInt32                             mLastID;
+
+    PRBool                              mIsQuery;
+    nsString                            mQuery;
+    nsCOMPtr<nsISupports>               mCtxt;
+    nsCOMPtr<mozISqlRequestObserver>    mObserver;
+
+    PRInt32                             mStatus;
+
+};
+
+#endif // mozSqlRequest_h

mozilla/extensions/sql/base/src/mozSqlResult.h

@@ -0,0 +1,402 @@
+/* ***** 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 ***** */
+
+#ifndef mozSqlResult_h
+#define mozSqlResult_h                                                  
+
+#include "nsCRT.h"
+#include "nsFixedSizeAllocator.h"
+#include "nsVoidArray.h"
+#include "nsCOMArray.h"
+#include "nsHashtable.h"
+#include "nsCOMPtr.h"
+#include "nsWeakReference.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIRDFService.h"
+#include "nsIRDFDataSource.h"
+#include "nsIRDFRemoteDataSource.h"
+#include "nsIDateTimeFormat.h"
+#include "nsIInputStream.h"
+#include "mozISqlConnection.h"
+#include "mozISqlDataSource.h"
+#include "mozISqlResult.h"
+#include "mozISqlResultEnumerator.h"
+#include "mozISqlInputStream.h"
+
+#define CELL_FLAG_NULL          0x80
+#define CELL_FLAG_DEFAULT       0x40
+#define CELL_FLAG_MASK          ~(CELL_FLAG_NULL | CELL_FLAG_DEFAULT)
+
+class ColumnInfo {
+  public:
+    static ColumnInfo*
+    Create(nsFixedSizeAllocator& aAllocator,
+           PRUnichar* aName,
+	   PRInt32 aType,
+	   PRInt32 aSize,
+	   PRInt32 aMod,
+           nsIRDFResource* aProperty) {
+      void* place = aAllocator.Alloc(sizeof(ColumnInfo));
+      return place ? ::new(place) ColumnInfo(aName, aType, aSize, aMod, aProperty) : nsnull;
+    }
+
+    static void
+    Destroy(nsFixedSizeAllocator& aAllocator, ColumnInfo* aColumnInfo) {
+      aColumnInfo->~ColumnInfo();
+      aAllocator.Free(aColumnInfo, sizeof(ColumnInfo));
+    }
+
+    ColumnInfo(PRUnichar* aName, PRInt32 aType, PRInt32 aSize, PRInt32 aMod, nsIRDFResource* aProperty)
+      : mName(aName),
+        mType(aType),
+        mSize(aSize),
+        mMod(aMod),
+	mProperty(aProperty) {
+      NS_IF_ADDREF(mProperty);
+    }
+
+    ~ColumnInfo() {
+      if (mName)
+        nsMemory::Free(mName);
+      NS_IF_RELEASE(mProperty);
+    }
+
+    PRUnichar*          mName;
+    PRInt32             mType;
+    PRInt32             mSize;
+    PRInt32             mMod;
+    nsIRDFResource*     mProperty;
+
+  private:
+    // Hide so that only Create() and Destroy() can be used to
+    // allocate and deallocate from the heap
+    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
+    static void operator delete(void*, size_t) {}
+};
+
+class Cell {
+  public:
+    static Cell*
+    Create(nsFixedSizeAllocator& aAllocator,
+           PRInt32 aType) {
+      void* place = aAllocator.Alloc(sizeof(Cell));
+      return place ? ::new(place) Cell(aType) : nsnull;
+    }
+
+    static Cell*
+    Create(nsFixedSizeAllocator& aAllocator,
+           PRInt32 aType,
+           Cell* aSrcCell) {
+      void* place = aAllocator.Alloc(sizeof(Cell));
+      if (! place)
+        return nsnull;
+      Cell* newCell = ::new(place) Cell(aType);
+      Copy(aSrcCell, newCell);
+      return newCell;
+    }
+
+    static void
+    Copy(Cell* aSrcCell, Cell* aDestCell) {
+      if (aSrcCell->IsNull())
+        aDestCell->SetNull(PR_TRUE);
+      else {
+        aDestCell->SetNull(PR_FALSE);
+        PRInt32 type = aSrcCell->GetType();
+        if (type == mozISqlResult::TYPE_STRING)
+          aDestCell->SetString(nsCRT::strdup(aSrcCell->mString));
+        else if (type == mozISqlResult::TYPE_INT)
+          aDestCell->mInt = aSrcCell->mInt;
+        else if (type == mozISqlResult::TYPE_FLOAT ||
+                 type == mozISqlResult::TYPE_DECIMAL)
+          aDestCell->mFloat = aSrcCell->mFloat;
+        else if (type == mozISqlResult::TYPE_DATE ||
+                 type == mozISqlResult::TYPE_TIME ||
+                 type == mozISqlResult::TYPE_DATETIME)
+          aDestCell->mDate = aSrcCell->mDate;
+        else if (type == mozISqlResult::TYPE_BOOL)
+          aDestCell->mBool = aSrcCell->mBool;
+      }
+    }
+
+    static void
+    Destroy(nsFixedSizeAllocator& aAllocator, Cell* aCell) {
+      aCell->~Cell();
+      aAllocator.Free(aCell, sizeof(Cell));
+    }
+
+    Cell(PRInt32 aType)
+      : mString(nsnull),
+        mType(aType | CELL_FLAG_NULL) {
+    }
+
+    ~Cell() {
+      if ((GetType() == mozISqlResult::TYPE_STRING) && mString) {
+        nsMemory::Free(mString);
+      }
+    }
+
+    void SetString(PRUnichar* aString) {
+     if (mString)
+        nsMemory::Free(mString);
+      mString = aString;
+    }
+
+    PRInt32 GetType() {
+      return mType & CELL_FLAG_MASK;
+    }
+
+    void SetNull(PRBool aNull) {
+      mType &= CELL_FLAG_MASK;
+      if (aNull)
+        mType |= CELL_FLAG_NULL;
+    }
+
+    void SetDefault(PRBool aDefault) {
+      mType &= CELL_FLAG_MASK;
+      if (aDefault)
+        mType |= CELL_FLAG_DEFAULT;
+    }
+
+    PRBool IsNull() {
+      return mType & CELL_FLAG_NULL;
+    }
+
+    PRBool IsDefault() {
+      return mType & CELL_FLAG_DEFAULT;
+    }
+
+    union {
+      PRUnichar*        mString;
+      PRInt32           mInt;
+      float             mFloat;
+      PRInt64           mDate;
+      PRBool            mBool;
+    };
+
+  private:
+    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
+    static void operator delete(void*, size_t) {}
+
+    PRInt8              mType;
+};
+
+class Row {
+  public:
+    static Row*
+    Create(nsFixedSizeAllocator& aAllocator,
+           nsIRDFResource* aSource,
+           nsVoidArray& aColumnInfo) {
+      void* place = aAllocator.Alloc(sizeof(Row));
+      if (! place)
+        return nsnull;
+      Row* newRow = ::new(place) Row(aSource, aColumnInfo.Count());
+      for (PRInt32 i = 0; i < aColumnInfo.Count(); i++) {
+        Cell* newCell = Cell::Create(aAllocator, ((ColumnInfo*)aColumnInfo[i])->mType);
+        newRow->mCells[i] = newCell;
+      }
+      return newRow;
+    }
+
+    static Row*
+    Create(nsFixedSizeAllocator& aAllocator,
+           nsIRDFResource* aSource,
+           nsVoidArray& aColumnInfo,
+           Row* aSrcRow) {
+      void* place = aAllocator.Alloc(sizeof(Row));
+      if (! place)
+        return nsnull;
+      Row* newRow = ::new(place) Row(aSource, aColumnInfo.Count());
+      for (PRInt32 i = 0; i < aColumnInfo.Count(); i++) {
+        Cell* srcCell = aSrcRow->mCells[i];
+        Cell* newCell = Cell::Create(aAllocator, ((ColumnInfo*)aColumnInfo[i])->mType, srcCell);
+        newRow->mCells[i] = newCell;
+      }
+      return newRow;
+    }
+
+    static void
+    Copy(PRInt32 aColumnCount, Row* aSrcRow, Row* aDestRow) {
+      for (PRInt32 i = 0; i < aColumnCount; i++) {
+        Cell* srcCell = aSrcRow->mCells[i];
+        Cell* destCell = aDestRow->mCells[i];
+        Cell::Copy(srcCell, destCell);
+      }
+    }
+
+    static void
+    Destroy(nsFixedSizeAllocator& aAllocator, PRInt32 aColumnCount, Row* aRow) {
+      for (PRInt32 i = 0; i < aColumnCount; i++)
+        Cell::Destroy(aAllocator, aRow->mCells[i]);
+      aRow->~Row();
+      aAllocator.Free(aRow, sizeof(*aRow));
+    }
+
+    Row(nsIRDFResource* aSource, PRInt32 aColumnCount)
+      : mSource(aSource)
+    {
+      NS_IF_ADDREF(mSource);
+      mCells = new Cell*[aColumnCount];
+    }
+
+    ~Row() {
+      delete[] mCells;
+      NS_IF_RELEASE(mSource);
+    }
+    
+    nsIRDFResource*     mSource;
+    Cell**              mCells;
+  private:
+    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
+    static void operator delete(void*, size_t) {}
+};
+
+class mozSqlResult : public mozISqlResult,
+                     public mozISqlDataSource,
+                     public nsIRDFDataSource,
+                     public nsIRDFRemoteDataSource
+{
+  public:
+    mozSqlResult(mozISqlConnection* aConnection,
+                 const nsAString& aQuery);
+    nsresult Init();
+    nsresult Rebuild();
+    virtual ~mozSqlResult();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLRESULT
+
+    NS_DECL_MOZISQLDATASOURCE
+
+    NS_DECL_NSIRDFDATASOURCE
+
+    NS_DECL_NSIRDFREMOTEDATASOURCE
+
+    friend class mozSqlResultEnumerator;
+    friend class mozSqlResultStream;
+
+  protected:
+    virtual nsresult BuildColumnInfo() = 0 ;
+    virtual nsresult BuildRows() = 0;
+    virtual void ClearNativeResult() = 0;
+
+    void ClearColumnInfo();
+    void ClearRows();
+
+    nsresult EnsureTableName();
+    nsresult EnsurePrimaryKeys();
+
+    void AppendValue(Cell* aCell, nsAutoString& aValues);
+    nsresult AppendKeys(Row* aRow, nsAutoString& aKeys);
+    nsresult GetValues(Row* aRow, mozISqlResult** aResult, PRBool aUseID);
+    nsresult CopyValues(mozISqlResult* aResult, Row* aRow);
+
+    virtual nsresult CanInsert(PRBool* _retval) = 0;
+    virtual nsresult CanUpdate(PRBool* _retval) = 0;
+    virtual nsresult CanDelete(PRBool* _retval) = 0;
+
+    nsresult InsertRow(Row* aSrcRow, PRInt32* _retval);
+    nsresult UpdateRow(PRInt32 aRowIndex, Row* aSrcRow, PRInt32* _retval);
+    nsresult DeleteRow(PRInt32 aRowIndex, PRInt32* _retval);
+    nsresult GetCondition(Row* aRow, nsAString& aCurrentCondition);
+
+    static PRInt32                      gRefCnt;
+    static nsIRDFService*               gRDFService;
+    static nsIDateTimeFormat*           gFormat;
+    static nsIRDFResource*              kSQL_ResultRoot;
+    static nsIRDFResource*              kNC_Child;
+    static nsIRDFLiteral*               kNullLiteral;
+    static nsIRDFLiteral*               kTrueLiteral;
+    static nsIRDFLiteral*               kFalseLiteral;
+
+    nsCOMPtr<mozISqlConnection>         mConnection;
+    nsString                            mErrorMessage;
+    nsString                            mQuery;
+    nsString                            mTableName;
+    nsFixedSizeAllocator                mAllocator;
+    nsAutoVoidArray                     mColumnInfo;
+    nsVoidArray                         mRows;
+    nsObjectHashtable                   mSources;
+    nsCOMArray<nsIRDFObserver>          mObservers;
+    nsCOMPtr<mozISqlResultEnumerator>   mPrimaryKeys;
+    PRInt32                             mCanInsert;
+    PRInt32                             mCanUpdate;
+    PRInt32                             mCanDelete;
+};
+
+class mozSqlResultEnumerator : public mozISqlResultEnumerator,
+                               public nsISimpleEnumerator
+{
+  public:
+    mozSqlResultEnumerator(mozSqlResult* aResult);
+    virtual ~mozSqlResultEnumerator();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLRESULTENUMERATOR
+
+    NS_DECL_NSISIMPLEENUMERATOR
+
+  private:
+    mozSqlResult*               mResult;
+    PRInt32                     mCurrentIndex;
+    Row*                        mCurrentRow;
+    Row*                        mBuffer;
+};
+
+class mozSqlResultStream : public mozISqlInputStream,
+                           public nsIInputStream
+{
+  public:
+    mozSqlResultStream(mozSqlResult* aResult);
+    virtual ~mozSqlResultStream();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLINPUTSTREAM
+
+    NS_DECL_NSIINPUTSTREAM
+
+  protected:
+    nsresult EnsureBuffer();
+
+  private:
+    mozSqlResult*               mResult;
+    char*                       mBuffer;
+    PRUint32                    mLength;
+    PRUint32                    mPosition;
+};
+
+#endif // mozSqlResult_h

mozilla/extensions/sql/base/src/mozSqlService.cpp

@@ -0,0 +1,650 @@
+/* ***** 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 ***** */
+
+#include "nsReadableUtils.h"
+#include "nsXPIDLString.h"
+#include "nsCRT.h"
+#include "nsIAtom.h"
+#include "nsISupportsUtils.h"
+#include "nsIServiceManager.h"
+#include "rdf.h"
+#include "nsRDFCID.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsNetUtil.h"
+#include "nsIRDFXMLSink.h"
+#include "nsIWindowWatcher.h"
+#include "nsIPrompt.h"
+#include "mozSqlService.h"
+#include "mozSqlConnection.h"
+
+#define SQL_NAMESPACE_URI "http://www.mozilla.org/SQL-rdf#"
+
+static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kRDFContainerUtilsCID,     NS_RDFCONTAINERUTILS_CID);
+
+nsIRDFService*          mozSqlService::gRDFService;
+nsIRDFContainerUtils*   mozSqlService::gRDFContainerUtils;
+
+nsIRDFResource*         mozSqlService::kSQL_AliasesRoot;
+nsIRDFResource*         mozSqlService::kSQL_Name;
+nsIRDFResource*         mozSqlService::kSQL_Type;
+nsIRDFResource*         mozSqlService::kSQL_Hostname;
+nsIRDFResource*         mozSqlService::kSQL_Port;
+nsIRDFResource*         mozSqlService::kSQL_Database;
+
+
+mozSqlService::mozSqlService()
+  : mConnectionCache(nsnull)
+{
+}
+
+mozSqlService::~mozSqlService()
+{
+  gRDFService->UnregisterDataSource(this);
+
+  delete mConnectionCache;
+
+  NS_IF_RELEASE(kSQL_AliasesRoot);
+  NS_IF_RELEASE(kSQL_Name);
+  NS_IF_RELEASE(kSQL_Type);
+  NS_IF_RELEASE(kSQL_Hostname);
+  NS_IF_RELEASE(kSQL_Port);
+  NS_IF_RELEASE(kSQL_Database);
+
+  nsServiceManager::ReleaseService(kRDFContainerUtilsCID, gRDFContainerUtils);
+  gRDFContainerUtils = nsnull;
+
+  nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
+  gRDFService = nsnull;
+}
+
+NS_IMPL_ISUPPORTS3(mozSqlService,
+                   mozISqlService,
+                   nsIRDFDataSource,
+                   nsIRDFRemoteDataSource);
+
+NS_IMETHODIMP
+mozSqlService::GetErrorMessage(nsAString& aErrorMessage)
+{
+  aErrorMessage = mErrorMessage;
+  return NS_OK;
+}
+
+nsresult
+mozSqlService::Init()
+{
+  nsresult rv;
+
+  rv = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService), 
+                                    (nsISupports**) &gRDFService);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = nsServiceManager::GetService(kRDFContainerUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
+                                    (nsISupports**) &gRDFContainerUtils);
+
+  if (NS_FAILED(rv)) return rv;
+
+  gRDFService->GetResource(NS_LITERAL_CSTRING("SQL:AliasesRoot"),
+                           &kSQL_AliasesRoot);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "name"),
+                           &kSQL_Name);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "type"),
+                           &kSQL_Type);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "hostname"),
+                           &kSQL_Hostname);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "port"),
+                           &kSQL_Port);
+  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "database"),
+                           &kSQL_Database);
+
+  nsCOMPtr<nsIFile> file;
+  rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
+  if (NS_FAILED(rv)) return rv;
+  rv = file->AppendNative(NS_LITERAL_CSTRING("sql.rdf"));
+  if (NS_FAILED(rv)) return rv;
+
+  nsCAutoString sql;
+  NS_GetURLSpecFromFile(file, sql);
+
+  rv = gRDFService->GetDataSourceBlocking(sql.get(), getter_AddRefs(mInner));
+  if (NS_FAILED(rv)) return rv;
+  nsCOMPtr<nsIRDFXMLSink> sink = do_QueryInterface(mInner);
+  if (sink) {
+    nsCOMPtr<nsIAtom> prefix = do_GetAtom("SQL");
+    sink->AddNameSpace(prefix, NS_ConvertASCIItoUCS2(SQL_NAMESPACE_URI));
+  }
+
+  return gRDFService->RegisterDataSource(this, PR_FALSE);
+}
+
+NS_IMETHODIMP
+mozSqlService::AddAlias(const nsAString& aName,
+                        const nsAString& aType,
+                        const nsAString& aHostname,
+                        PRInt32 aPort,
+                        const nsAString& aDatabase,
+                        nsIRDFResource** aResult)
+{
+  nsCOMPtr<nsIRDFResource> alias;
+  gRDFService->GetAnonymousResource(getter_AddRefs(alias));
+
+  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
+  nsCOMPtr<nsIRDFInt> rdfInt;
+
+  gRDFService->GetLiteral(PromiseFlatString(aName).get(), getter_AddRefs(rdfLiteral));
+  mInner->Assert(alias, kSQL_Name, rdfLiteral, PR_TRUE);
+
+  gRDFService->GetLiteral(PromiseFlatString(aType).get(), getter_AddRefs(rdfLiteral));
+  mInner->Assert(alias, kSQL_Type, rdfLiteral, PR_TRUE);
+
+  gRDFService->GetLiteral(PromiseFlatString(aHostname).get(), getter_AddRefs(rdfLiteral));
+  mInner->Assert(alias, kSQL_Hostname, rdfLiteral, PR_TRUE);
+
+  gRDFService->GetIntLiteral(aPort, getter_AddRefs(rdfInt));
+  mInner->Assert(alias, kSQL_Port, rdfInt, PR_TRUE);
+
+  gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
+  mInner->Assert(alias, kSQL_Database, rdfLiteral, PR_TRUE);
+
+  nsresult rv = EnsureAliasesContainer();
+  if (NS_FAILED(rv))
+    return rv;
+  mAliasesContainer->AppendElement(alias);
+
+  Flush();
+
+  NS_ADDREF(*aResult = alias);
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+mozSqlService::FetchAlias(nsIRDFResource* aAlias,
+                          nsAString& aName,
+                          nsAString& aType,
+                          nsAString& aHostname,
+                          PRInt32* aPort,
+                          nsAString& aDatabase)
+{
+  nsCOMPtr<nsIRDFNode> rdfNode;
+  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
+  nsCOMPtr<nsIRDFInt> rdfInt;
+  const PRUnichar* value;
+  
+  mInner->GetTarget(aAlias, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfLiteral = do_QueryInterface(rdfNode);
+    rdfLiteral->GetValueConst(&value);
+    aName.Assign(value);
+  }
+
+  mInner->GetTarget(aAlias, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfLiteral = do_QueryInterface(rdfNode);
+    rdfLiteral->GetValueConst(&value);
+    aType.Assign(value);
+  }
+
+  mInner->GetTarget(aAlias, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfLiteral = do_QueryInterface(rdfNode);
+    rdfLiteral->GetValueConst(&value);
+    aHostname.Assign(value);
+  }
+
+  mInner->GetTarget(aAlias, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfInt = do_QueryInterface(rdfNode);
+    rdfInt->GetValue(aPort);
+  }
+
+  mInner->GetTarget(aAlias, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
+  if (rdfNode) {
+    rdfLiteral = do_QueryInterface(rdfNode);
+    rdfLiteral->GetValueConst(&value);
+    aDatabase.Assign(value);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::UpdateAlias(nsIRDFResource* aAlias,
+                           const nsAString& aName,
+                           const nsAString& aType,
+                           const nsAString& aHostname,
+                           PRInt32 aPort,
+                           const nsAString& aDatabase)
+{
+  nsCOMPtr<nsIRDFNode> rdfNode;
+  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
+  nsCOMPtr<nsIRDFInt> rdfInt;
+
+  mInner->GetTarget(aAlias, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetLiteral(PromiseFlatString(aName).get(), getter_AddRefs(rdfLiteral));
+  mInner->Change(aAlias, kSQL_Name, rdfNode, rdfLiteral);
+
+  mInner->GetTarget(aAlias, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetLiteral(PromiseFlatString(aType).get(), getter_AddRefs(rdfLiteral));
+  mInner->Change(aAlias, kSQL_Type, rdfNode, rdfLiteral);
+
+  mInner->GetTarget(aAlias, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetLiteral(PromiseFlatString(aHostname).get(), getter_AddRefs(rdfLiteral));
+  mInner->Change(aAlias, kSQL_Hostname, rdfNode, rdfLiteral);
+
+  mInner->GetTarget(aAlias, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetIntLiteral(aPort, getter_AddRefs(rdfInt));
+  mInner->Change(aAlias, kSQL_Port, rdfNode, rdfInt);
+
+  mInner->GetTarget(aAlias, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
+  gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
+  mInner->Change(aAlias, kSQL_Database, rdfNode, rdfLiteral);
+
+  Flush();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::RemoveAlias(nsIRDFResource* aAlias)
+{
+  nsCOMPtr<nsIRDFNode> rdfNode;
+
+  mInner->GetTarget(aAlias, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Name, rdfNode);
+
+  mInner->GetTarget(aAlias, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Type, rdfNode);
+
+  mInner->GetTarget(aAlias, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Hostname, rdfNode);
+
+  mInner->GetTarget(aAlias, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Port, rdfNode);
+
+  mInner->GetTarget(aAlias, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
+  mInner->Unassert(aAlias, kSQL_Database, rdfNode);
+
+  nsresult rv = EnsureAliasesContainer();
+  if (NS_FAILED(rv))
+    return rv;
+  mAliasesContainer->RemoveElement(aAlias, PR_TRUE);
+
+  Flush();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::GetAlias(const nsAString& aName, nsIRDFResource** _retval)
+{
+  nsCOMPtr<nsIRDFLiteral> nameLiteral;
+  nsresult rv = gRDFService->GetLiteral(PromiseFlatString(aName).get(),
+                                        getter_AddRefs(nameLiteral));
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCOMPtr<nsIRDFResource> alias;
+  rv = mInner->GetSource(kSQL_Name, nameLiteral, PR_TRUE, getter_AddRefs(alias));
+  if (NS_FAILED(rv))
+    return rv;
+
+  NS_IF_ADDREF(*_retval = alias);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::GetConnection(nsIRDFResource* aAlias, mozISqlConnection **_retval)
+{
+  nsISupportsKey key(aAlias);
+  nsCOMPtr<nsIWeakReference> weakRef;
+  nsCOMPtr<mozISqlConnection> conn;
+
+  if (mConnectionCache) {
+    weakRef = getter_AddRefs(NS_STATIC_CAST(nsIWeakReference*, mConnectionCache->Get(&key)));
+    if (weakRef) {
+      conn = do_QueryReferent(weakRef);
+      if (conn)
+        NS_ADDREF(*_retval = conn);
+    }
+  }
+
+  if (! *_retval) {
+    nsresult rv = GetNewConnection(aAlias, getter_AddRefs(conn));
+    if (NS_FAILED(rv))
+      return rv;
+
+    weakRef = do_GetWeakReference(conn);
+
+    if (! mConnectionCache) {
+      mConnectionCache = new nsSupportsHashtable(16);
+      if (! mConnectionCache)
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+    mConnectionCache->Put(&key, weakRef);
+
+    NS_ADDREF(*_retval = conn);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::GetNewConnection(nsIRDFResource* aAlias, mozISqlConnection **_retval)
+{
+  nsAutoString name;
+  nsAutoString type;
+  nsAutoString hostname;
+  PRInt32 port;
+  nsAutoString database;
+  nsresult rv = FetchAlias(aAlias, name, type, hostname, &port, database);
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCAutoString contractID("@mozilla.org/sql/connection;1?type=");
+  AppendUTF16toUTF8(type, contractID);
+
+  nsCOMPtr<mozISqlConnection> conn = do_CreateInstance(contractID.get());
+  if (! conn)
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIWindowWatcher> watcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
+  nsCOMPtr<nsIPrompt> prompter;
+  watcher->GetNewPrompter(0, getter_AddRefs(prompter));
+
+  PRBool retval;
+  do {
+    nsXPIDLString username;
+    nsXPIDLString password;
+    prompter->PromptUsernameAndPassword(
+      nsnull, // in wstring dialogTitle
+      nsnull, // in wstring text
+      getter_Copies(username),
+      getter_Copies(password),
+      nsnull, // in wstring checkMsg
+      nsnull, // inout boolean checkValue
+      &retval
+    );
+
+    if (retval) {
+      rv = conn->Init(hostname, port, database, username, password);
+      if (NS_FAILED(rv)) {
+        conn->GetErrorMessage(mErrorMessage);
+        prompter->Alert(nsnull, mErrorMessage.get());
+      }
+    }
+  } while(retval && NS_FAILED(rv));
+
+  NS_IF_ADDREF(*_retval = conn);
+
+  return rv;
+}
+
+NS_IMETHODIMP
+mozSqlService::GetURI(char** aURI)
+{
+  if (!aURI)
+    return NS_ERROR_NULL_POINTER;
+  
+  *aURI = nsCRT::strdup("rdf:sql");
+  if (!(*aURI))
+    return NS_ERROR_OUT_OF_MEMORY;
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+mozSqlService::GetSource(nsIRDFResource* aProperty,
+                         nsIRDFNode* aTarget,
+                         PRBool aTruthValue,
+                         nsIRDFResource** aSource) 
+{
+  return mInner->GetSource(aProperty, aTarget, aTruthValue, aSource);
+}
+   
+NS_IMETHODIMP
+mozSqlService::GetSources(nsIRDFResource* aProperty,
+                          nsIRDFNode* aTarget,
+                          PRBool aTruthValue,
+                          nsISimpleEnumerator** aSources) {
+  return mInner->GetSources(aProperty, aTarget, aTruthValue, aSources);
+}
+   
+NS_IMETHODIMP
+mozSqlService::GetTarget(nsIRDFResource* aSource,
+                         nsIRDFResource* aProperty,
+                         PRBool aTruthValue,
+                         nsIRDFNode** aTarget) {
+  return mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget);
+}
+   
+NS_IMETHODIMP
+mozSqlService::GetTargets(nsIRDFResource* aSource,
+                          nsIRDFResource* aProperty,
+                          PRBool aTruthValue,
+                          nsISimpleEnumerator** aTargets) {
+  return mInner->GetTargets(aSource, aProperty, aTruthValue, aTargets);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::Assert(nsIRDFResource* aSource,
+                      nsIRDFResource* aProperty,
+                      nsIRDFNode* aTarget,
+                      PRBool aTruthValue) 
+{
+  return mInner->Assert(aSource, aProperty, aTarget, aTruthValue);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::Unassert(nsIRDFResource* aSource,
+                        nsIRDFResource* aProperty,
+                        nsIRDFNode* aTarget) 
+{
+  return mInner->Unassert(aSource, aProperty, aTarget);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::Change(nsIRDFResource* aSource,
+                      nsIRDFResource* aProperty,
+                      nsIRDFNode* aOldTarget,
+                      nsIRDFNode* aNewTarget) 
+{
+  return mInner->Change(aSource, aProperty, aOldTarget, aNewTarget);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::Move(nsIRDFResource* aOldSource,
+                    nsIRDFResource* aNewSource,
+                    nsIRDFResource* aProperty,
+                    nsIRDFNode* aTarget) 
+{
+  return mInner->Move(aOldSource, aNewSource, aProperty, aTarget);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::HasAssertion(nsIRDFResource* aSource,
+                            nsIRDFResource* aProperty,
+                            nsIRDFNode* aTarget,
+                            PRBool aTruthValue,
+                            PRBool* hasAssertion) 
+{
+  return mInner->HasAssertion(aSource, aProperty, aTarget, aTruthValue, hasAssertion);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::AddObserver(nsIRDFObserver* aObserver) 
+{
+  return mInner->AddObserver(aObserver);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::RemoveObserver(nsIRDFObserver* aObserver) 
+{
+  return mInner->RemoveObserver(aObserver);
+}
+   
+NS_IMETHODIMP 
+mozSqlService::HasArcIn(nsIRDFNode* aNode,
+                       nsIRDFResource* aArc,
+                       PRBool* _retval) 
+{
+  return mInner->HasArcIn(aNode, aArc, _retval);
+}
+
+NS_IMETHODIMP 
+mozSqlService::HasArcOut(nsIRDFResource* aSource,
+                         nsIRDFResource* aArc,
+                         PRBool* _retval) 
+{
+  return mInner->HasArcOut(aSource, aArc, _retval);
+}
+
+NS_IMETHODIMP 
+mozSqlService::ArcLabelsIn(nsIRDFNode* aNode,
+                           nsISimpleEnumerator** aLabels) 
+{
+  return mInner->ArcLabelsIn(aNode, aLabels);
+}
+
+NS_IMETHODIMP 
+mozSqlService::ArcLabelsOut(nsIRDFResource* aSource,
+                            nsISimpleEnumerator** aLabels) 
+{
+  return mInner->ArcLabelsIn(aSource, aLabels);
+}
+
+NS_IMETHODIMP 
+mozSqlService::GetAllResources(nsISimpleEnumerator** aResult) 
+{
+  return mInner->GetAllResources(aResult);
+}
+
+NS_IMETHODIMP 
+mozSqlService::GetAllCmds(nsIRDFResource* aSource,
+                          nsISimpleEnumerator** aCommands) 
+{
+  return mInner->GetAllCmds(aSource, aCommands);
+}
+
+NS_IMETHODIMP 
+mozSqlService::IsCommandEnabled(nsISupportsArray* aSources,
+                                nsIRDFResource* aCommand,
+                                nsISupportsArray* aArguments,
+                                PRBool* aResult) 
+{
+  return mInner->IsCommandEnabled(aSources, aCommand, aArguments, aResult);
+}
+
+NS_IMETHODIMP 
+mozSqlService::DoCommand(nsISupportsArray* aSources,
+                         nsIRDFResource* aCommand,
+                         nsISupportsArray* aArguments) 
+{
+  return mInner->DoCommand(aSources, aCommand, aArguments);
+}
+
+NS_IMETHODIMP 
+mozSqlService::BeginUpdateBatch()
+{
+  return mInner->BeginUpdateBatch();
+}
+
+NS_IMETHODIMP 
+mozSqlService::EndUpdateBatch()
+{
+  return mInner->EndUpdateBatch();
+}
+
+
+// nsIRDFRemoteDataSource
+NS_IMETHODIMP
+mozSqlService::GetLoaded(PRBool* aResult)
+{
+  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
+  return remote->GetLoaded(aResult);
+}
+
+NS_IMETHODIMP
+mozSqlService::Init(const char* aURI)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+mozSqlService::Refresh(PRBool aBlocking)
+{
+  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
+  return remote->Refresh(aBlocking);
+}
+
+NS_IMETHODIMP
+mozSqlService::Flush()
+{
+  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
+  return remote->Flush();
+}
+
+NS_IMETHODIMP
+mozSqlService::FlushTo(const char *aURI)
+{
+  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
+  return remote->FlushTo(aURI);
+}
+
+
+nsresult
+mozSqlService::EnsureAliasesContainer()
+{
+  if (! mAliasesContainer) {
+    PRBool isContainer;
+    nsresult rv = gRDFContainerUtils->IsContainer(mInner, kSQL_AliasesRoot, &isContainer);
+    if (NS_FAILED(rv)) return rv;
+
+    if (!isContainer) {
+      rv = gRDFContainerUtils->MakeSeq(mInner, kSQL_AliasesRoot, getter_AddRefs(mAliasesContainer));
+      if (NS_FAILED(rv)) return rv;
+    }
+    else {
+      mAliasesContainer = do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv);
+      if (NS_FAILED(rv)) return rv;
+      rv = mAliasesContainer->Init(mInner, kSQL_AliasesRoot);
+      if (NS_FAILED(rv)) return rv;
+    }
+  }
+
+  return NS_OK;
+}

mozilla/extensions/sql/base/src/mozSqlService.h

@@ -0,0 +1,87 @@
+/* ***** 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 ***** */
+
+#ifndef mozSqlService_h
+#define mozSqlService_h
+
+#include "nsHashtable.h"
+#include "nsIRDFDataSource.h"
+#include "nsIRDFRemoteDataSource.h"
+#include "nsIRDFService.h"
+#include "nsIRDFContainerUtils.h"
+#include "mozISqlService.h"
+
+#define MOZ_SQLSERVICE_CLASSNAME "SQL service"
+#define MOZ_SQLSERVICE_CID \
+{0x1ceb35b7, 0xdaa8, 0x4ce4, {0xac, 0x67, 0x12, 0x5f, 0xb1, 0x7c, 0xb0, 0x19}}
+#define MOZ_SQLSERVICE_CONTRACTID "@mozilla.org/sql/service;1"
+#define MOZ_SQLDATASOURCE_CONTRACTID "@mozilla.org/rdf/datasource;1?name=sql"
+
+class mozSqlService : public mozISqlService,
+                      public nsIRDFDataSource,
+                      public nsIRDFRemoteDataSource
+{
+  public:
+    mozSqlService();
+    virtual ~mozSqlService();
+    nsresult Init();
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_MOZISQLSERVICE
+    NS_DECL_NSIRDFDATASOURCE
+    NS_DECL_NSIRDFREMOTEDATASOURCE
+
+  protected:
+    nsresult EnsureAliasesContainer();
+
+  private:
+    static nsIRDFService*               gRDFService;
+    static nsIRDFContainerUtils*        gRDFContainerUtils;
+
+    static nsIRDFResource*              kSQL_AliasesRoot;
+    static nsIRDFResource*              kSQL_Name;
+    static nsIRDFResource*              kSQL_Type;
+    static nsIRDFResource*              kSQL_Hostname;
+    static nsIRDFResource*              kSQL_Port;
+    static nsIRDFResource*              kSQL_Database;
+	
+    nsString                            mErrorMessage;
+    nsCOMPtr<nsIRDFDataSource>          mInner;
+    nsCOMPtr<nsIRDFContainer>           mAliasesContainer;
+    nsSupportsHashtable*                mConnectionCache;
+
+};
+
+#endif /* mozSqlService_h */