From 69a6cafe9fd7736c9fd17009a1b8c6f80114c474 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 25 Feb 2003 20:14:21 +0000
Subject: [PATCH] fix sql extension (not enabled by default)

git-svn-id: svn://10.0.0.236/trunk@138469 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../extensions/sql/base/src/mozSqlResult.cpp  |  6 ++--
 .../extensions/sql/base/src/mozSqlService.cpp | 28 +++++++++++--------
 .../sql/pgsql/src/mozSqlResultPgsql.cpp       |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mozilla/extensions/sql/base/src/mozSqlResult.cpp b/mozilla/extensions/sql/base/src/mozSqlResult.cpp
index 3505baa3cb8..d7a74e37f09 100644
--- a/mozilla/extensions/sql/base/src/mozSqlResult.cpp
+++ b/mozilla/extensions/sql/base/src/mozSqlResult.cpp
@@ -50,9 +50,11 @@ mozSqlResult::Init()
                                             (void**) &gFormat);
     if (NS_FAILED(rv)) return rv;
 
-    rv = gRDFService->GetResource("SQL:ResultRoot", &kSQL_ResultRoot);
+    rv = gRDFService->GetResource(NS_LITERAL_CSTRING("SQL:ResultRoot"),
+                                  &kSQL_ResultRoot);
     if (NS_FAILED(rv)) return rv;
-    rv = gRDFService->GetResource(NC_NAMESPACE_URI "child", &kNC_Child);
+    rv = gRDFService->GetResource(NS_LITERAL_CSTRING(NC_NAMESPACE_URI "child"),
+                                  &kNC_Child);
     if (NS_FAILED(rv)) return rv;
 
     rv = gRDFService->GetLiteral(NS_LITERAL_STRING("null").get(), &kNullLiteral);
diff --git a/mozilla/extensions/sql/base/src/mozSqlService.cpp b/mozilla/extensions/sql/base/src/mozSqlService.cpp
index fa210bb6bad..e1b892bd916 100644
--- a/mozilla/extensions/sql/base/src/mozSqlService.cpp
+++ b/mozilla/extensions/sql/base/src/mozSqlService.cpp
@@ -82,12 +82,18 @@ mozSqlService::Init()
 
   if (NS_FAILED(rv)) return rv;
 
-  gRDFService->GetResource("SQL:AliasesRoot", &kSQL_AliasesRoot);
-  gRDFService->GetResource(SQL_NAMESPACE_URI "name", &kSQL_Name);
-  gRDFService->GetResource(SQL_NAMESPACE_URI "type", &kSQL_Type);
-  gRDFService->GetResource(SQL_NAMESPACE_URI "hostname", &kSQL_Hostname);
-  gRDFService->GetResource(SQL_NAMESPACE_URI "port", &kSQL_Port);
-  gRDFService->GetResource(SQL_NAMESPACE_URI "database", &kSQL_Database);
+  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));
@@ -118,7 +124,7 @@ mozSqlService::AddAlias(const nsACString& aURI,
                         const nsAString& aDatabase)
 {
   nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(PromiseFlatCString(aURI).get(), getter_AddRefs(resource));
+  gRDFService->GetResource(aURI, getter_AddRefs(resource));
 
   nsCOMPtr<nsIRDFLiteral> rdfLiteral;
   nsCOMPtr<nsIRDFInt> rdfInt;
@@ -152,7 +158,7 @@ NS_IMETHODIMP
 mozSqlService::HasAlias(const nsACString& aURI, PRBool* _retval)
 {
   nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(PromiseFlatCString(aURI).get(), getter_AddRefs(resource));
+  gRDFService->GetResource(aURI, getter_AddRefs(resource));
 
   nsresult rv = EnsureAliasesContainer();
   if (NS_FAILED(rv))
@@ -175,7 +181,7 @@ mozSqlService::GetAlias(const nsACString& aURI,
                         nsAString& aDatabase)
 {
   nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(PromiseFlatCString(aURI).get(), getter_AddRefs(resource));
+  gRDFService->GetResource(aURI, getter_AddRefs(resource));
 
   nsCOMPtr<nsIRDFNode> rdfNode;
   nsCOMPtr<nsIRDFLiteral> rdfLiteral;
@@ -228,7 +234,7 @@ mozSqlService::UpdateAlias(const nsACString& aURI,
                            const nsAString& aDatabase)
 {
   nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(PromiseFlatCString(aURI).get(), getter_AddRefs(resource));
+  gRDFService->GetResource(aURI, getter_AddRefs(resource));
 
   nsCOMPtr<nsIRDFNode> rdfNode;
   nsCOMPtr<nsIRDFLiteral> rdfLiteral;
@@ -263,7 +269,7 @@ NS_IMETHODIMP
 mozSqlService::RemoveAlias(const nsACString &aURI)
 {
   nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(PromiseFlatCString(aURI).get(), getter_AddRefs(resource));
+  gRDFService->GetResource(aURI, getter_AddRefs(resource));
 
   nsCOMPtr<nsIRDFNode> rdfNode;
 
diff --git a/mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp b/mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp
index 3a7901918d5..0b0617bca26 100644
--- a/mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp
+++ b/mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp
@@ -78,7 +78,7 @@ mozSqlResultPgsql::BuildColumnInfo()
     nsCAutoString uri(NS_LITERAL_CSTRING("http://www.mozilla.org/SQL-rdf#"));
     uri.Append(n);
     nsCOMPtr<nsIRDFResource> property;
-    gRDFService->GetResource(uri.get(), getter_AddRefs(property));
+    gRDFService->GetResource(uri, getter_AddRefs(property));
 
     ColumnInfo* columnInfo = ColumnInfo::Create(mAllocator, name, type, size, mod, property);
     mColumnInfo.AppendElement(columnInfo);