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/pgsql/src/Makefile.in

@@ -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):
+#
+# 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	= sqlpgsql_s
+REQUIRES	= xpcom \
+		  string \
+		  locale \
+		  rdf \
+		  $(NULL)
+
+CPPSRCS		= \
+		mozSqlConnectionPgsql.cpp \
+		mozSqlResultPgsql.cpp
+
+EXPORTS		= \
+		mozSqlConnectionPgsql.h \
+		mozSqlResultPgsql.h
+
+FORCE_STATIC_LIB=1
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(MOZ_PGSQL_INCLUDES)

mozilla/extensions/sql/pgsql/src/mozSqlConnectionPgsql.cpp

@@ -0,0 +1,276 @@
+/* ***** 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 "prprf.h"
+#include "mozSqlConnectionPgsql.h"
+#include "mozSqlResultPgsql.h"
+
+mozSqlConnectionPgsql::mozSqlConnectionPgsql()
+  : mConnection(nsnull)
+{
+}
+
+mozSqlConnectionPgsql::~mozSqlConnectionPgsql()
+{
+  if (mConnection)
+    PQfinish(mConnection);
+}
+
+NS_IMPL_ADDREF_INHERITED(mozSqlConnectionPgsql, mozSqlConnection)
+NS_IMPL_RELEASE_INHERITED(mozSqlConnectionPgsql, mozSqlConnection)
+
+// QueryInterface
+NS_INTERFACE_MAP_BEGIN(mozSqlConnectionPgsql)
+  NS_INTERFACE_MAP_ENTRY(mozISqlConnectionPgsql)
+NS_INTERFACE_MAP_END_INHERITING(mozSqlConnection)
+
+NS_IMETHODIMP
+mozSqlConnectionPgsql::Init(const nsAString & aHost, PRInt32 aPort,
+                            const nsAString & aDatabase, const nsAString & aUsername,
+                            const nsAString & aPassword)
+{
+  if (mConnection)
+    return NS_OK;
+
+  if (aPort == -1)
+    aPort = 5432;
+  char port[11];
+  char options[] = "";
+  char tty[] = "";
+  PR_snprintf(port, 11, "%d", aPort);
+
+  mConnection = PQsetdbLogin(NS_ConvertUCS2toUTF8(aHost).get(),
+                             port, options, tty,
+                             NS_ConvertUCS2toUTF8(aDatabase).get(),
+                             NS_ConvertUCS2toUTF8(aUsername).get(),
+                             NS_ConvertUCS2toUTF8(aPassword).get());
+
+  return Setup();
+}
+
+NS_IMETHODIMP
+mozSqlConnectionPgsql::GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval)
+{
+  nsAutoString select;
+  nsAutoString from;
+  nsAutoString where;
+  if (mVersion >= SERVER_VERSION(7,3,0)) {
+    select = NS_LITERAL_STRING("SELECT n.nspname AS TABLE_SCHEM, ");
+    from = NS_LITERAL_STRING(" FROM pg_catalog.pg_namespace n, pg_catalog.pg_class ct, pg_catalog.pg_class ci, pg_catalog.pg_attribute a, pg_catalog.pg_index i");
+    where = NS_LITERAL_STRING(" AND ct.relnamespace = n.oid ");
+    if (!aSchema.IsEmpty()) {
+      where.Append(NS_LITERAL_STRING(" AND n.nspname = '") + aSchema);
+      where.Append(PRUnichar('\''));
+    }
+  }
+  else {
+    select = NS_LITERAL_STRING("SELECT NULL AS TABLE_SCHEM, ");
+    from = NS_LITERAL_STRING(" FROM pg_class ct, pg_class ci, pg_attribute a, pg_index i ");
+  }
+
+  if (!aTable.IsEmpty()) {
+    where.Append(NS_LITERAL_STRING(" AND ct.relname = '") + aTable);
+    where.Append(PRUnichar('\''));
+  }
+
+  NS_NAMED_LITERAL_STRING(select2, " ct.relname AS TABLE_NAME, a.attname AS COLUMN_NAME, a.attnum AS KEY_SEQ, ci.relname AS PK_NAME ");
+  NS_NAMED_LITERAL_STRING(where2, " WHERE ct.oid=i.indrelid AND ci.oid=i.indexrelid AND a.attrelid=ci.oid AND i.indisprimary ");
+  NS_NAMED_LITERAL_STRING(order2, " ORDER BY table_name, pk_name, key_seq");
+
+  return RealExec(select + select2 + from + where2 + where + order2, _retval, nsnull);
+}
+
+nsresult
+mozSqlConnectionPgsql::Setup()
+{
+  if (PQstatus(mConnection) == CONNECTION_BAD) {
+    CopyUTF8toUTF16(PQerrorMessage(mConnection), mErrorMessage);
+    mConnection = nsnull;
+    return NS_ERROR_FAILURE;
+  }
+
+  PQsetClientEncoding(mConnection, "UNICODE");
+
+/*
+  PGresult* result = PQexec(mConnection, "SET DATESTYLE TO US");
+  PRInt32 stat = PQresultStatus(result);
+  if (stat != PGRES_COMMAND_OK) {
+    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(result)));
+    CopyUTF8toUTF16(PQresultErrorMessage(result), mErrorMessage);
+    PQfinish(mConnection);
+    mConnection = nsnull;
+    return NS_ERROR_FAILURE;
+  }
+*/
+
+  PGresult* result = PQexec(mConnection, "select version()");
+  PRInt32 stat = PQresultStatus(result);
+  if (stat != PGRES_TUPLES_OK) {
+    CopyUTF8toUTF16(PQresultErrorMessage(result), mErrorMessage);
+    return NS_ERROR_FAILURE;
+  }
+  char* version = PQgetvalue(result, 0, 0);
+  NS_ConvertUTF8toUCS2 buffer(version);
+  nsAString::const_iterator start, end, iter;
+  buffer.BeginReading(iter);
+  buffer.EndReading(end);
+  while (iter != end && !nsCRT::IsAsciiSpace(*iter))
+    ++iter;
+  while (iter != end && nsCRT::IsAsciiSpace(*iter))
+    ++iter;
+  start = iter;
+  while (iter != end && !nsCRT::IsAsciiSpace(*iter))
+    ++iter;
+  mServerVersion = Substring(start,iter);
+
+  PRInt32 numbers[3] = {0,0,0};
+  mServerVersion.BeginReading(iter);
+  mServerVersion.EndReading(end);
+  for (PRInt32 i = 0; i < 3; i++) {
+    start = iter;
+    while (iter != end && *iter != PRUnichar('.'))
+      ++iter;
+    nsAutoString v(Substring(start,iter));
+    PRInt32 err;
+    numbers[i] = v.ToInteger(&err);
+    while (iter != end && *iter == PRUnichar('.'))
+      ++iter;
+  }
+  mVersion = SERVER_VERSION(numbers[0], numbers[1], numbers[2]);
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlConnectionPgsql::RealExec(const nsAString& aQuery,
+                                mozISqlResult** aResult, PRInt32* aAffectedRows)
+{
+  if (! mConnection)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  PGresult* r;
+  r = PQexec(mConnection, NS_ConvertUCS2toUTF8(aQuery).get());
+  PRInt32 stat = PQresultStatus(r);
+
+  if (PQstatus(mConnection) == CONNECTION_BAD) {
+    PQreset(mConnection);
+    nsresult rv = Setup();
+    if (NS_FAILED(rv))
+      return rv;
+    r = PQexec(mConnection, NS_ConvertUCS2toUTF8(aQuery).get());
+    stat = PQresultStatus(r);
+  }
+
+  if (stat == PGRES_TUPLES_OK) {
+    if (!aResult)
+      return NS_ERROR_NULL_POINTER;
+
+    static char select1[] = "select t.oid, case when t.typbasetype = 0 then t.typname else (select t2.typname from pg_type t2 where t2.oid=t.typbasetype) end as typname from pg_type t where t.oid in (";
+    static char select2[] = "select oid, typname from pg_type where oid in (";
+    char* select;
+    if (mVersion >= SERVER_VERSION(7,3,0))
+      select = select1;
+    else
+      select = select2;
+    PRInt32 columnCount = PQnfields(r);
+    char* query = (char*)malloc(strlen(select) + columnCount * 11 + 2);
+    strcpy(query, select);
+    for (PRInt32 i = 0; i < columnCount; i++) {
+      PRInt32 oid = PQftype(r, i);
+      char oidStr[11];
+      if (i)
+        sprintf(oidStr, ",%d", oid);
+      else
+        sprintf(oidStr, "%d", oid);
+      strcat(query, oidStr);
+    }
+    strcat(query, ")");
+    PGresult* types = PQexec(mConnection, query);
+    free(query);
+    stat = PQresultStatus(types);
+    if (stat != PGRES_TUPLES_OK) {
+      CopyUTF8toUTF16(PQresultErrorMessage(types), mErrorMessage);
+      return NS_ERROR_FAILURE;
+    }
+
+    if (*aResult) {
+      ((mozSqlResultPgsql*)*aResult)->SetResult(r, types);
+      nsresult rv = ((mozSqlResult*)*aResult)->Rebuild();
+      if (NS_FAILED(rv))
+        return rv;
+      NS_ADDREF(*aResult);
+    }
+    else {
+      mozSqlResult* result = new mozSqlResultPgsql(this, aQuery);
+      if (! result)
+        return NS_ERROR_OUT_OF_MEMORY;
+      ((mozSqlResultPgsql*)result)->SetResult(r, types);
+      nsresult rv = result->Init();
+      if (NS_FAILED(rv))
+        return rv;
+      NS_ADDREF(*aResult = result);
+    }
+  }
+  else if (stat == PGRES_COMMAND_OK) {
+    if (!aAffectedRows)
+      return NS_ERROR_NULL_POINTER;
+    PR_sscanf(PQcmdTuples(r), "%d", aAffectedRows);
+    mLastID = PQoidValue(r);
+  }
+  else {
+    CopyUTF8toUTF16(PQresultErrorMessage(r), mErrorMessage);
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlConnectionPgsql::CancelExec()
+{
+  if (!PQrequestCancel(mConnection)) {
+    CopyUTF8toUTF16(PQerrorMessage(mConnection), mErrorMessage);
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlConnectionPgsql::GetIDName(nsAString& aIDName)
+{
+  aIDName = NS_LITERAL_STRING("OID");
+  return NS_OK;
+}

mozilla/extensions/sql/pgsql/src/mozSqlConnectionPgsql.h

@@ -0,0 +1,82 @@
+/* ***** 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 mozSqlConnectionPgsql_h
+#define mozSqlConnectionPgsql_h                                                  
+
+#include "libpq-fe.h"
+#include "mozSqlConnection.h"
+#include "mozISqlConnectionPgsql.h"
+
+#define MOZ_SQLCONNECTIONPGSQL_CLASSNAME "PosgreSQL SQL Connection"
+#define MOZ_SQLCONNECTIONPGSQL_CID \
+{0x0cf1eefe, 0x611d, 0x48fa, {0xae, 0x27, 0x0a, 0x6f, 0x40, 0xd6, 0xa3, 0x3e }}
+#define MOZ_SQLCONNECTIONPGSQL_CONTRACTID "@mozilla.org/sql/connection;1?type=pgsql"
+
+#define SERVER_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
+class mozSqlConnectionPgsql : public mozSqlConnection,
+                              public mozISqlConnectionPgsql
+{
+  public:
+    mozSqlConnectionPgsql();
+    virtual ~mozSqlConnectionPgsql();
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD Init(const nsAString& aHost, PRInt32 aPort,
+                    const nsAString& aDatabase, const nsAString& aUsername,
+		    const nsAString& aPassword);
+
+    NS_IMETHOD GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval);
+
+    NS_DECL_MOZISQLCONNECTIONPGSQL
+
+  protected:
+    nsresult Setup();
+
+    virtual nsresult RealExec(const nsAString& aQuery,
+                              mozISqlResult** aResult, PRInt32* aAffectedRows);
+
+    virtual nsresult CancelExec();
+
+    virtual nsresult GetIDName(nsAString& aIDName);
+
+  private:
+    PGconn*             mConnection;
+    PRInt32             mVersion;
+};
+
+#endif // mozSqlConnectionPgsql_h

mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp

@@ -0,0 +1,269 @@
+/* ***** 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 "prprf.h"
+#include "nsReadableUtils.h"
+#include "mozSqlResultPgsql.h"
+
+mozSqlResultPgsql::mozSqlResultPgsql(mozISqlConnection* aConnection,
+                                     const nsAString& aQuery)
+  : mozSqlResult(aConnection, aQuery),
+    mResult(nsnull),
+    mTypes(nsnull)
+{
+}
+
+void
+mozSqlResultPgsql::SetResult(PGresult* aResult,
+                             PGresult* aTypes)
+{
+  mResult = aResult;
+  mTypes = aTypes;
+}
+
+mozSqlResultPgsql::~mozSqlResultPgsql()
+{
+  ClearNativeResult();
+}
+
+NS_IMPL_ADDREF_INHERITED(mozSqlResultPgsql, mozSqlResult)
+NS_IMPL_RELEASE_INHERITED(mozSqlResultPgsql, mozSqlResult)
+
+// QueryInterface
+NS_INTERFACE_MAP_BEGIN(mozSqlResultPgsql)
+  NS_INTERFACE_MAP_ENTRY(mozISqlResultPgsql)
+NS_INTERFACE_MAP_END_INHERITING(mozSqlResult)
+
+PRInt32
+mozSqlResultPgsql::GetColType(PRInt32 aColumnIndex)
+{
+  PRInt32 oid = PQftype(mResult, aColumnIndex);
+
+  for (PRInt32 i = 0; i < PQntuples(mTypes); i++) {
+    char* value = PQgetvalue(mTypes, i, 0);
+    PRInt32 o;
+    PR_sscanf(value, "%d", &o);
+    if (o == oid) {
+      char* type = PQgetvalue(mTypes, i, 1);
+      if (! strcmp(type, "int2"))
+        return mozISqlResult::TYPE_INT;
+      else if (! strcmp(type, "int4"))
+        return mozISqlResult::TYPE_INT;
+      else if (! strcmp(type, "float4"))
+        return mozISqlResult::TYPE_STRING;
+      else if (! strcmp(type, "numeric"))
+        return mozISqlResult::TYPE_STRING;
+      else if (! strcmp(type, "date"))
+        return mozISqlResult::TYPE_STRING;
+      else if (! strcmp(type, "time"))
+        return mozISqlResult::TYPE_STRING;
+      else if (! strcmp(type, "timestamp"))
+        return mozISqlResult::TYPE_STRING;
+      else if (! strcmp(type, "bool"))
+        return mozISqlResult::TYPE_BOOL;
+      else
+        return mozISqlResult::TYPE_STRING;
+    }
+  }
+
+  return mozISqlResult::TYPE_STRING;
+}
+
+nsresult
+mozSqlResultPgsql::BuildColumnInfo()
+{
+  for (PRInt32 i = 0; i < PQnfields(mResult); i++) {
+    char* n = PQfname(mResult, i);
+    PRUnichar* name = UTF8ToNewUnicode(n);
+    PRInt32 type = GetColType(i);
+    PRInt32 size = PQfsize(mResult, i);
+    PRInt32 mod = PQfmod(mResult, i);
+
+    nsCAutoString uri(NS_LITERAL_CSTRING("http://www.mozilla.org/SQL-rdf#"));
+    uri.Append(n);
+    nsCOMPtr<nsIRDFResource> property;
+    gRDFService->GetResource(uri, getter_AddRefs(property));
+
+    ColumnInfo* columnInfo = ColumnInfo::Create(mAllocator, name, type, size, mod, property);
+    mColumnInfo.AppendElement(columnInfo); 
+  }
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlResultPgsql::BuildRows()
+{
+  for(PRInt32 i = 0; i < PQntuples(mResult); i++) {
+    nsCOMPtr<nsIRDFResource> resource;
+    nsresult rv = gRDFService->GetAnonymousResource(getter_AddRefs(resource));
+    if (NS_FAILED(rv)) return rv;
+
+    Row* row = Row::Create(mAllocator, resource, mColumnInfo);
+
+    for (PRInt32 j = 0; j < mColumnInfo.Count(); j++) {
+      if (! PQgetisnull(mResult, i, j)) {
+        char* value = PQgetvalue(mResult, i, j);
+        Cell* cell = row->mCells[j];
+        cell->SetNull(PR_FALSE);
+        PRInt32 type = cell->GetType();
+        if (type == mozISqlResult::TYPE_STRING)
+          cell->SetString(UTF8ToNewUnicode(value));
+        else if (type == mozISqlResult::TYPE_INT)
+          PR_sscanf(value, "%d", &cell->mInt);
+        else if (type == mozISqlResult::TYPE_FLOAT)
+          PR_sscanf(value, "%f", &cell->mFloat);
+        else if (type == mozISqlResult::TYPE_DECIMAL)
+          PR_sscanf(value, "%f", &cell->mFloat);
+        else if (type == mozISqlResult::TYPE_DATE ||
+                 type == mozISqlResult::TYPE_TIME ||
+                 type == mozISqlResult::TYPE_DATETIME)
+          PR_ParseTimeString(value, PR_FALSE, &cell->mDate);
+        else if (type == mozISqlResult::TYPE_BOOL)
+          cell->mBool = !strcmp(value, "t");
+      }
+    }
+
+    mRows.AppendElement(row);
+    nsVoidKey key(resource);
+    mSources.Put(&key, row);
+  }
+
+  return NS_OK;
+}
+
+void
+mozSqlResultPgsql::ClearNativeResult()
+{
+  if (mResult) {
+    PQclear(mResult);
+    mResult = nsnull;
+  }
+  if (mTypes) {
+    PQclear(mTypes);
+    mTypes = nsnull;
+  }
+}
+
+nsresult
+mozSqlResultPgsql::EnsureTablePrivileges()
+{
+  nsresult rv = EnsureTableName();
+  if (NS_FAILED(rv))
+    return rv;
+
+  NS_NAMED_LITERAL_STRING(select, "select ");
+  NS_NAMED_LITERAL_STRING(func, "has_table_privilege(SESSION_USER, '");
+  NS_NAMED_LITERAL_STRING(comma, ", ");
+  NS_NAMED_LITERAL_STRING(ins, "', 'INSERT')");
+  NS_NAMED_LITERAL_STRING(upd, "', 'UPDATE')");
+  NS_NAMED_LITERAL_STRING(del, "','DELETE')");
+
+  nsCOMPtr<mozISqlResult> result;
+  rv = mConnection->ExecuteQuery(
+    select + func + mTableName + ins +
+    comma + func + mTableName + upd +
+    comma + func + mTableName + del,
+    getter_AddRefs(result));
+  if (NS_FAILED(rv)) {
+    mConnection->GetErrorMessage(mErrorMessage);
+    return rv;
+  }
+
+  nsCOMPtr<mozISqlResultEnumerator> enumerator;
+  rv = result->Enumerate(getter_AddRefs(enumerator));
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = enumerator->First();
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = enumerator->GetBool(0, &mCanInsert);
+  if (NS_FAILED(rv))
+    return rv;
+  rv = enumerator->GetBool(1, &mCanUpdate);
+  if (NS_FAILED(rv))
+    return rv;
+  return enumerator->GetBool(2, &mCanDelete);
+}
+
+nsresult
+mozSqlResultPgsql::CanInsert(PRBool* _retval)
+{
+  if (mCanInsert >= 0) {
+    *_retval = mCanInsert;
+    return NS_OK;
+  }
+
+  nsresult rv = EnsureTablePrivileges();
+  if (NS_FAILED(rv))
+    return rv;
+  *_retval = mCanInsert;
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlResultPgsql::CanUpdate(PRBool* _retval)
+{
+  if (mCanUpdate >= 0) {
+    *_retval = mCanUpdate;
+    return NS_OK;
+  }
+
+  nsresult rv = EnsureTablePrivileges();
+  if (NS_FAILED(rv))
+    return rv;
+  *_retval = mCanUpdate;
+
+  return NS_OK;
+}
+
+nsresult
+mozSqlResultPgsql::CanDelete(PRBool* _retval)
+{
+  if (mCanDelete >= 0) {
+    *_retval = mCanDelete;
+    return NS_OK;
+  }
+
+  nsresult rv = EnsureTablePrivileges();
+  if (NS_FAILED(rv))
+    return rv;
+  *_retval = mCanDelete;
+
+  return NS_OK;
+}

mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.h

@@ -0,0 +1,74 @@
+/* ***** 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 mozSqlResultPgsql_h
+#define mozSqlResultPgsql_h                                                  
+
+#include "libpq-fe.h"
+#include "mozSqlResult.h"
+#include "mozISqlResultPgsql.h"
+
+class mozSqlResultPgsql : public mozSqlResult,
+                          public mozISqlResultPgsql
+{
+  public:
+    mozSqlResultPgsql(mozISqlConnection* aConnection,
+                      const nsAString& aQuery);
+    void SetResult(PGresult* aResult,
+                   PGresult* aTypes);
+    virtual ~mozSqlResultPgsql();
+
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_MOZISQLRESULTPGSQL 
+
+  protected:
+    PRInt32 GetColType(PRInt32 aColumnIndex);
+
+    virtual nsresult BuildColumnInfo();
+    virtual nsresult BuildRows();
+    virtual void ClearNativeResult();
+
+    nsresult EnsureTablePrivileges();
+    virtual nsresult CanInsert(PRBool* _retval);
+    virtual nsresult CanUpdate(PRBool* _retval);
+    virtual nsresult CanDelete(PRBool* _retval);
+
+  private:
+    PGresult*   mResult;
+    PGresult*   mTypes;
+};
+
+#endif // mozSqlResultPgsql_h