Rename the new CREATE DATABASE options to set collation and ctype into

LC_COLLATE and LC_CTYPE, per discussion on pgsql-hackers.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7798 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pgadmin/dlg/dlgDatabase.cpp b/pgadmin/dlg/dlgDatabase.cpp
index 98248c32a91734fd142befb715016833ecf93f93..147f517dc5b414c5e99ebfc6c0c9d94455380966 100644 (file)
--- a/pgadmin/dlg/dlgDatabase.cpp
+++ b/pgadmin/dlg/dlgDatabase.cpp
@@ -613,10 +613,10 @@ wxString dlgDatabase::GetSql()
         {
             wxString strCollate = cbCollate->GetValue();
             if (!strCollate.IsEmpty())
-                AppendIfFilled(sql, wxT("\n       COLLATE="), qtDbString(strCollate));
+                AppendIfFilled(sql, wxT("\n       LC_COLLATE="), qtDbString(strCollate));
             wxString strCType = cbCType->GetValue();
             if (!strCType.IsEmpty())
-                AppendIfFilled(sql, wxT("\n       CTYPE="), qtDbString(strCType));
+                AppendIfFilled(sql, wxT("\n       LC_CTYPE="), qtDbString(strCType));
         }
         if (connection->BackendMinimumVersion(8,1))
         {

diff --git a/pgadmin/schema/pgDatabase.cpp b/pgadmin/schema/pgDatabase.cpp
index 1e7951d1e30f4a378959d936958476a92b6af5e5..ffa78d8e34fa2aed0b5700c7f0d7511c54feeac5 100644 (file)
--- a/pgadmin/schema/pgDatabase.cpp
+++ b/pgadmin/schema/pgDatabase.cpp
@@ -352,8 +352,8 @@ wxString pgDatabase::GetSql(ctlTree *browser)
             sql += wxT("\n       TABLESPACE = ") + qtIdent(GetTablespace());
         if (myConn && myConn->BackendMinimumVersion(8, 4))
         {
-            sql += wxT("\n       COLLATE = ") + qtDbString(GetCollate());
-            sql += wxT("\n       CTYPE = ") + qtDbString(GetCType());
+            sql += wxT("\n       LC_COLLATE = ") + qtDbString(GetCollate());
+            sql += wxT("\n       LC_CTYPE = ") + qtDbString(GetCType());
         }
         if (myConn && myConn->BackendMinimumVersion(8, 1))
         {