From 0968d07bf57edca338b3d4acf5e3d7c3f9e75348 Mon Sep 17 00:00:00 2001 From: dpage Date: Mon, 6 Apr 2009 08:50:06 +0000 Subject: [PATCH] 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 --- pgadmin/dlg/dlgDatabase.cpp | 4 ++-- pgadmin/schema/pgDatabase.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgadmin/dlg/dlgDatabase.cpp b/pgadmin/dlg/dlgDatabase.cpp index 98248c32a..147f517dc 100644 --- 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 1e7951d1e..ffa78d8e3 100644 --- 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)) { -- 2.39.5