From 1250c481c75afd4af1f29628d9eb528884618d3d Mon Sep 17 00:00:00 2001 From: Guillaume Lelarge Date: Tue, 22 Mar 2011 21:54:56 +0100 Subject: [PATCH] Support for Foreign Server object. --- pgadmin/dlg/dlgForeignServer.cpp | 353 +++++++++++++++++++++++++ pgadmin/dlg/module.mk | 1 + pgadmin/include/dlg/dlgForeignServer.h | 51 ++++ pgadmin/include/dlg/module.mk | 1 + pgadmin/include/images/foreignserver-sm.png | Bin 0 -> 423 bytes pgadmin/include/images/foreignserver.png | Bin 0 -> 465 bytes pgadmin/include/images/foreignservers.png | Bin 0 -> 477 bytes pgadmin/include/images/module.mk | 3 + pgadmin/include/precomp.h | 2 + pgadmin/include/schema/module.mk | 1 + pgadmin/include/schema/pgCollection.h | 6 + pgadmin/include/schema/pgForeignDataWrapper.h | 54 ++++ pgadmin/include/schema/pgForeignServer.h | 68 +++++ pgadmin/include/utils/misc.h | 1 + pgadmin/schema/module.mk | 1 + pgadmin/schema/pgCollection.cpp | 1 + pgadmin/schema/pgForeignDataWrapper.cpp | 107 ++++++++ pgadmin/schema/pgForeignServer.cpp | 229 ++++++++++++++++ pgadmin/schema/pgObject.cpp | 3 + pgadmin/ui/dlgForeignServer.xrc | 283 ++++++++++++++++++++ pgadmin/ui/module.mk | 1 + 21 files changed, 1166 insertions(+), 0 deletions(-) create mode 100644 pgadmin/dlg/dlgForeignServer.cpp create mode 100644 pgadmin/include/dlg/dlgForeignServer.h create mode 100644 pgadmin/include/images/foreignserver-sm.png create mode 100644 pgadmin/include/images/foreignserver.png create mode 100644 pgadmin/include/images/foreignservers.png create mode 100644 pgadmin/include/schema/pgForeignServer.h create mode 100644 pgadmin/schema/pgForeignServer.cpp create mode 100644 pgadmin/ui/dlgForeignServer.xrc diff --git a/pgadmin/dlg/dlgForeignServer.cpp b/pgadmin/dlg/dlgForeignServer.cpp new file mode 100644 index 0000000..06119f0 --- /dev/null +++ b/pgadmin/dlg/dlgForeignServer.cpp @@ -0,0 +1,353 @@ +////////////////////////////////////////////////////////////////////////// +// +// pgAdmin III - PostgreSQL Tools +// RCS-ID: $Id$ +// Copyright (C) 2002 - 2010, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +// dlgForeignServer.cpp - PostgreSQL Foreign Server Property +// +////////////////////////////////////////////////////////////////////////// + +// wxWindows headers +#include + +// App headers +#include "pgAdmin3.h" +#include "utils/misc.h" +#include "utils/pgDefs.h" + +#include "dlg/dlgForeignServer.h" +#include "schema/pgForeignServer.h" + + +// pointer to controls +#define cbForeignDataWrapper CTRL_COMBOBOX("cbForeignDataWrapper") +#define txtType CTRL_TEXT("txtType") +#define txtVersion CTRL_TEXT("txtVersion") +#define lstOptions CTRL_LISTVIEW("lstOptions") +#define txtOption CTRL_TEXT("txtOption") +#define txtValue CTRL_TEXT("txtValue") +#define btnAdd CTRL_BUTTON("wxID_ADD") +#define btnRemove CTRL_BUTTON("wxID_REMOVE") + + +dlgProperty *pgForeignServerFactory::CreateDialog(frmMain *frame, pgObject *node, pgObject *parent) +{ + return new dlgForeignServer(this, frame, (pgForeignServer*)node); +} + + +BEGIN_EVENT_TABLE(dlgForeignServer, dlgSecurityProperty) + EVT_TEXT(XRCID("cbForeignDataWrapper"), dlgForeignServer::OnChange) + EVT_COMBOBOX(XRCID("cbForeignDataWrapper"), dlgForeignServer::OnChange) + EVT_LIST_ITEM_SELECTED(XRCID("lstOptions"), dlgForeignServer::OnSelChangeOption) + EVT_TEXT(XRCID("txtOption"), dlgForeignServer::OnChangeOptionName) + EVT_BUTTON(wxID_ADD, dlgForeignServer::OnAddOption) + EVT_BUTTON(wxID_REMOVE, dlgForeignServer::OnRemoveOption) +END_EVENT_TABLE(); + + +dlgForeignServer::dlgForeignServer(pgaFactory *f, frmMain *frame, pgForeignServer *node) +: dlgSecurityProperty(f, frame, node, wxT("dlgForeignServer"), wxT("USAGE"), "U") +{ + foreignserver=node; +} + + +pgObject *dlgForeignServer::GetObject() +{ + return foreignserver; +} + + +int dlgForeignServer::Go(bool modal) +{ + if (!foreignserver) + cbOwner->Append(wxT("")); + + // Fill owner combobox + AddGroups(); + AddUsers(cbOwner); + + // Fill validator combobox + cbForeignDataWrapper->Append(wxT("")); + pgSet *set=connection->ExecuteSet( + wxT("SELECT fdwname\n") + wxT(" FROM pg_foreign_data_wrapper\n") + wxT(" ORDER BY fdwname")); + if (set) + { + while (!set->Eof()) + { + wxString fdwname = set->GetVal(wxT("fdwname")); + cbForeignDataWrapper->Append(fdwname); + set->MoveNext(); + } + delete set; + } + cbForeignDataWrapper->SetSelection(0); + + // Initialize options listview and buttons + lstOptions->AddColumn(_("Option"), 80); + lstOptions->AddColumn(_("Value"), 40); + txtOption->SetValue(wxT("")); + txtValue->SetValue(wxT("")); + btnAdd->Disable(); + btnRemove->Disable(); + + if (foreignserver) + { + // edit mode + txtName->Disable(); + txtType->Disable(); + + txtType->SetValue(foreignserver->GetType()); + txtVersion->SetValue(foreignserver->GetVersion()); + + wxString options = foreignserver->GetOptions(); + wxString option, optionname, optionvalue; + while (options.Length() > 0) + { + option = options.BeforeFirst(','); + optionname = option.BeforeFirst(wxT('=')).Trim(false).Trim(); + optionvalue = option.AfterFirst(wxT('=')).Trim(false).Trim(); + lstOptions->AppendItem(optionname, optionvalue); + options = options.AfterFirst(','); + } + } + else + { + // create mode + } + + return dlgSecurityProperty::Go(modal); +} + + +pgObject *dlgForeignServer::CreateObject(pgCollection *collection) +{ + wxString name=txtName->GetValue(); + + pgObject *obj=foreignServerFactory.CreateObjects(collection, 0, wxT("\n AND srvname ILIKE ") + qtDbString(name)); + return obj; +} + + +void dlgForeignServer::CheckChange() +{ + bool didChange=true; + wxString name=txtName->GetValue(); + if (foreignserver) + { + didChange = name != foreignserver->GetName() + || txtComment->GetValue() != foreignserver->GetComment() + || cbOwner->GetValue() != foreignserver->GetOwner() + || txtType->GetValue() != foreignserver->GetType() + || txtVersion->GetValue() != foreignserver->GetVersion() + || cbForeignDataWrapper->GetValue() != foreignserver->GetFdw(); + EnableOK(didChange); + } + else + { + bool enable=true; + + CheckValid(enable, !name.IsEmpty(), _("Please specify name.")); + CheckValid(enable, !cbForeignDataWrapper->GetValue().IsEmpty(), _("Please specify foreign data wrapper.")); + EnableOK(enable); + } +} + + + +void dlgForeignServer::OnChange(wxCommandEvent &ev) +{ + CheckChange(); +} + + +void dlgForeignServer::OnChangeOptionName(wxCommandEvent &ev) +{ + btnAdd->Enable(txtOption->GetValue().Length() > 0); +} + + +void dlgForeignServer::OnSelChangeOption(wxListEvent &ev) +{ + int row=lstOptions->GetSelection(); + if (row >= 0) + { + txtOption->SetValue(lstOptions->GetText(row, 0)); + txtValue->SetValue(lstOptions->GetText(row, 1)); + } + + btnRemove->Enable(row >= 0); +} + + +void dlgForeignServer::OnAddOption(wxCommandEvent &ev) +{ + bool found = false; + + for (int pos = 0 ; pos < lstOptions->GetItemCount() ; pos++) + { + if (lstOptions->GetText(pos).IsSameAs(txtOption->GetValue(), false)) + { + lstOptions->SetItem(pos, 1, txtValue->GetValue()); + found = true; + break; + } + } + + if (!found) + { + lstOptions->AppendItem(txtOption->GetValue(), txtValue->GetValue()); + } + + txtOption->SetValue(wxT("")); + txtValue->SetValue(wxT("")); + btnAdd->Disable(); + + CheckChange(); +} + + +void dlgForeignServer::OnRemoveOption(wxCommandEvent &ev) +{ + int sel=lstOptions->GetSelection(); + lstOptions->DeleteItem(sel); + + txtOption->SetValue(wxT("")); + txtValue->SetValue(wxT("")); + btnRemove->Disable(); + + CheckChange(); +} + + +wxString dlgForeignServer::GetOptionsSql() +{ + wxString options = foreignserver->GetOptions(); + wxString option, optionname, optionvalue, sqloptions; + bool found; + int pos; + + while (options.Length() > 0) + { + option = options.BeforeFirst(','); + optionname = option.BeforeFirst(wxT('=')).Trim(false).Trim(); + optionvalue = option.AfterFirst(wxT('=')).Trim(false).Trim(); + + // check for options + found = false; + for (pos=0 ; pos < lstOptions->GetItemCount() && !found; pos++) + { + found = lstOptions->GetText(pos, 0).Cmp(optionname) == 0; + if (found) break; + } + + if (found) + { + if (lstOptions->GetText(pos, 1).Cmp(optionvalue) != 0) + { + if (sqloptions.Length() > 0) + sqloptions += wxT(", "); + sqloptions += wxT("SET ") + optionname + wxT(" '") + lstOptions->GetText(pos, 1) + wxT("'"); + } + } + else + { + if (sqloptions.Length() > 0) + sqloptions += wxT(", "); + sqloptions += wxT("DROP ") + optionname; + } + + options = options.AfterFirst(','); + } + + for (pos=0 ; pos < lstOptions->GetItemCount() ; pos++) + { + options = foreignserver->GetOptions(); + found = false; + + while (options.Length() > 0 && !found) + { + option = options.BeforeFirst(','); + optionname = option.BeforeFirst(wxT('=')).Trim(false).Trim(); + found = lstOptions->GetText(pos, 0).Cmp(optionname) == 0; + options = options.AfterFirst(','); + } + + if (!found) + { + optionvalue = option.AfterFirst(wxT('=')).Trim(false).Trim(); + + if (sqloptions.Length() > 0) + sqloptions += wxT(", "); + sqloptions += wxT("ADD ") + lstOptions->GetText(pos, 0) + wxT(" '") + lstOptions->GetText(pos, 1) + wxT("'"); + } + } + + return sqloptions; +} + + +wxString dlgForeignServer::GetSql() +{ + wxString sql, name; + name=txtName->GetValue(); + + if (foreignserver) + { + // edit mode + if (txtVersion->GetValue() != foreignserver->GetVersion()) + { + sql = wxT("ALTER SERVER ") + qtIdent(name) + + wxT(" VERSION ") + qtDbString(txtVersion->GetValue()) + wxT(";\n"); + } + + wxString sqloptions = GetOptionsSql(); + if (sqloptions.Length() > 0) + { + sql += wxT("ALTER SERVER ") + name + + wxT(" OPTIONS (") + sqloptions + wxT(");\n"); + } + + AppendOwnerChange(sql, wxT("SERVER ") + qtIdent(name)); + } + else + { + // create mode + sql = wxT("CREATE SERVER ") + qtIdent(name); + if (!(txtType->GetValue()).IsEmpty()) + sql += wxT("\n TYPE ") + qtDbString(txtType->GetValue()); + if (!(txtVersion->GetValue()).IsEmpty()) + sql += wxT("\n VERSION ") + qtDbString(txtVersion->GetValue()); + sql += wxT("\n FOREIGN DATA WRAPPER ") + qtIdent(cbForeignDataWrapper->GetValue()); + + // check for options + if (lstOptions->GetItemCount() > 0) + { + wxString options = wxEmptyString; + for (int pos=0 ; pos < lstOptions->GetItemCount() ; pos++) + { + if (options.Length() > 0) + options += wxT(", "); + + options += lstOptions->GetText(pos, 0) + + wxT(" '") + lstOptions->GetText(pos, 1) + wxT("' "); + } + sql += wxT("\n OPTIONS (") + options + wxT(")"); + } + + sql += wxT(";\n"); + AppendOwnerNew(sql, wxT("SERVER ") + qtIdent(name)); + } + + sql += GetGrant(wxT("U"), wxT("SERVER ") + qtIdent(name)); + + return sql; +} + + + diff --git a/pgadmin/dlg/module.mk b/pgadmin/dlg/module.mk index a107d5b..2252957 100644 --- a/pgadmin/dlg/module.mk +++ b/pgadmin/dlg/module.mk @@ -24,6 +24,7 @@ pgadmin3_SOURCES += \ $(srcdir)/dlg/dlgFindReplace.cpp \ $(srcdir)/dlg/dlgForeignDataWrapper.cpp \ $(srcdir)/dlg/dlgForeignKey.cpp \ + $(srcdir)/dlg/dlgForeignServer.cpp \ $(srcdir)/dlg/dlgFunction.cpp \ $(srcdir)/dlg/dlgGroup.cpp \ $(srcdir)/dlg/dlgHbaConfig.cpp \ diff --git a/pgadmin/include/dlg/dlgForeignServer.h b/pgadmin/include/dlg/dlgForeignServer.h new file mode 100644 index 0000000..20d54c0 --- /dev/null +++ b/pgadmin/include/dlg/dlgForeignServer.h @@ -0,0 +1,51 @@ +////////////////////////////////////////////////////////////////////////// +// +// pgAdmin III - PostgreSQL Tools +// RCS-ID: $Id$ +// Copyright (C) 2002 - 2010, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +// dlgForeignServer.h - Foreign Server property +// +////////////////////////////////////////////////////////////////////////// + + +#ifndef __DLG_FOREIGNSERVERPROP +#define __DLG_FOREIGNSERVERPROP + +#include "dlg/dlgProperty.h" + +class pgForeignServer; + +class dlgForeignServer : public dlgSecurityProperty +{ +public: + dlgForeignServer(pgaFactory *factory, frmMain *frame, pgForeignServer *_foreignserver); + int Go(bool modal); + + void CheckChange(); + wxString GetSql(); + pgObject *CreateObject(pgCollection *collection); + pgObject *GetObject(); + +private: + pgForeignServer *foreignserver; + +#ifdef __WXMAC__ + void OnChangeSize(wxSizeEvent &ev); +#endif + + void OnSelChangeOption(wxListEvent &ev); + void OnChange(wxCommandEvent &ev); + void OnChangeOptionName(wxCommandEvent &ev); + void OnAddOption(wxCommandEvent &ev); + void OnChangeOption(wxCommandEvent &ev); + void OnRemoveOption(wxCommandEvent &ev); + + wxString GetOptionsSql(); + + DECLARE_EVENT_TABLE() +}; + + +#endif diff --git a/pgadmin/include/dlg/module.mk b/pgadmin/include/dlg/module.mk index 07f2ec7..4bf7cd1 100644 --- a/pgadmin/include/dlg/module.mk +++ b/pgadmin/include/dlg/module.mk @@ -24,6 +24,7 @@ pgadmin3_SOURCES += \ $(srcdir)/include/dlg/dlgFindReplace.h \ $(srcdir)/include/dlg/dlgForeignDataWrapper.h \ $(srcdir)/include/dlg/dlgForeignKey.h \ + $(srcdir)/include/dlg/dlgForeignServer.h \ $(srcdir)/include/dlg/dlgFunction.h \ $(srcdir)/include/dlg/dlgGroup.h \ $(srcdir)/include/dlg/dlgHbaConfig.h \ diff --git a/pgadmin/include/images/foreignserver-sm.png b/pgadmin/include/images/foreignserver-sm.png new file mode 100644 index 0000000000000000000000000000000000000000..2467ccf1422a59a7218fd0bb19c2a42bdf52e5d7 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~E0BJDv+cp5$Qv6qzrVk7 zW3&9@vzBik`G5Ho|K-)uTicc2-1GkNGyU0x%oo?3fBedPak1gnHlr`^;(z|izO~Kb z%lm|1zjI$+bN~H2|Mm{mcMpR9{3*J*S>f3^`;Si}e|^pQ`={jETDdE$#Qyy)dv><$ z|KAGswyocQwlbCk`2{mLJiCzwvL>2>S4={E+nQaGTe!Vz zahdU=*X&ESFOpJE*&;e)`qd3*DpaT5u9JDLS%3P((k)@7VQ?e2h_me>FVdQ&MBb@04%Yw7ytkO literal 0 HcmV?d00001 diff --git a/pgadmin/include/images/foreignserver.png b/pgadmin/include/images/foreignserver.png new file mode 100644 index 0000000000000000000000000000000000000000..acc1d95747a4202889d290c09723ad256b3ade99 GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}dw@@fE0BJ4H1XC}ldG$x-rk;b zbBn^`(-vB3jHJ%0Ymyt&2b z>xaajzp}r6O#1aZ_swnZ-@o(j?brSKHsR0jg12|(Jv?Ik>3Q^@KSejUDm^`G_u*04 zkB=FDei#4!Q*vdM*uTG}&(4%Q`v(SXV-scH!NM%y4?8OPq~)XwXYQue#$XVWA*#P5bMk*{PSFAAJ8$X zC9V-ADTyViR>?)FK#IZ0z|c_Fz*yJ7BE-nC}Q!>*k Wacfw#Ti_m01B0ilpUXO@geCx4-OoAz literal 0 HcmV?d00001 diff --git a/pgadmin/include/images/foreignservers.png b/pgadmin/include/images/foreignservers.png new file mode 100644 index 0000000000000000000000000000000000000000..b8b5104a55e51fc1c5d3da2cb371ec755296e5bf GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}SAb85E0BJ3YvzMPkvBGK-q7T!{zq~y1>v!(&-}&zz1poO{baS)9 zvvc+zpGN-rn)CNh$+fj|S5}Gr`&;(xY}x<66?UsN(t)mFED7=pW^j0RBMr#mEbxdd z2GSm2>~=ES4#?>8ba4!kxE$JlQ>@8=hxKsWg{al8YedCe4mSP&U)?4&{ap03GlzK@ z90c3~B@Rrt@Z7B9o8(p=r!%ca^+?p2?N4UEU0&!k)p~#6)qD9%>~3b?Sv8x#U^17aMMww)MOF^{=(Rt2quWmu2Jr-}CJ$w~6ur zX+A&R+4(bNJ_B8)TH+c}l9E`GYL#4+3Zxi}3=9o*4UBaSEJ6&8tPIVq3@o(`%&ZIy jERemoveDummyChild(this); + + // Log + wxLogInfo(wxT("Adding child object to foreign data wrapper %s"), GetIdentifier().c_str()); + + browser->AppendCollection(this, foreignServerFactory); + } + if (properties) { CreateListColumns(properties); @@ -85,6 +98,17 @@ pgObject *pgForeignDataWrapper::Refresh(ctlTree *browser, const wxTreeItemId ite +wxMenu *pgForeignDataWrapper::GetNewMenu() +{ + wxMenu *menu = pgObject::GetNewMenu(); + if (database->GetCreatePrivilege()) + { + foreignServerFactory.AppendMenu(menu); + } + return menu; +} + + pgObject *pgForeignDataWrapperFactory::CreateObjects(pgCollection *collection, ctlTree *browser, const wxString &restriction) { wxString sql; @@ -153,6 +177,89 @@ wxString pgForeignDataWrapper::GetCreateOptions() } +/////////////////////////////////////////////////////////////// + +void pgForeignDataWrapperObject::SetForeignDataWrapper(pgForeignDataWrapper *newForeignDataWrapper) +{ + fdw = newForeignDataWrapper; + database = fdw->GetDatabase(); +} + +bool pgForeignDataWrapperObject::CanDrop() +{ + return true; //fdw->GetCreatePrivilege(); +} + + +bool pgForeignDataWrapperObject::CanCreate() +{ + return true; //fdw->GetCreatePrivilege(); +} + + +void pgForeignDataWrapperObject::SetContextInfo(frmMain *form) +{ +} + + +pgSet *pgForeignDataWrapperObject::ExecuteSet(const wxString &sql) +{ + return fdw->GetDatabase()->ExecuteSet(sql); +} + +wxString pgForeignDataWrapperObject::ExecuteScalar(const wxString &sql) +{ + return fdw->GetDatabase()->ExecuteScalar(sql); +} + + +bool pgForeignDataWrapperObject::ExecuteVoid(const wxString &sql) +{ + return fdw->GetDatabase()->ExecuteVoid(sql); +} + + +///////////////////////////////////////////////////// + +pgForeignDataWrapperObjCollection::pgForeignDataWrapperObjCollection(pgaFactory *factory, pgForeignDataWrapper *newfdw) + : pgCollection(factory) +{ + fdw = newfdw; + database = fdw->GetDatabase(); + server = database->GetServer(); + iSetOid(fdw->GetOid()); +} + + +wxString pgForeignDataWrapperObjCollection::GetTranslatedMessage(int kindOfMessage) const +{ + wxString message = wxEmptyString; + + switch (kindOfMessage) + { + case RETRIEVINGDETAILS: + message = _("Retrieving details on foreign data wrappers"); + break; + case REFRESHINGDETAILS: + message = _("Refreshing foreign data wrappers"); + break; + } + + return message; +} + +bool pgForeignDataWrapperObjCollection::CanCreate() +{ + return GetDatabase()->GetCreatePrivilege(); +} + + +pgCollection *pgForeignDataWrapperObjFactory::CreateCollection(pgObject *obj) +{ + return new pgForeignDataWrapperObjCollection(GetCollectionFactory(), (pgForeignDataWrapper *)obj); +} + + /////////////////////////////////////////////////// #include "images/foreigndatawrapper.pngc" diff --git a/pgadmin/schema/pgForeignServer.cpp b/pgadmin/schema/pgForeignServer.cpp new file mode 100644 index 0000000..aca3000 --- /dev/null +++ b/pgadmin/schema/pgForeignServer.cpp @@ -0,0 +1,229 @@ +////////////////////////////////////////////////////////////////////////// +// +// pgAdmin III - PostgreSQL Tools +// RCS-ID: $Id$ +// Copyright (C) 2002 - 2010, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +// pgForeignServer.cpp - Foreign Server class +// +////////////////////////////////////////////////////////////////////////// + +// wxWindows headers +#include + +// App headers +#include "pgAdmin3.h" +#include "utils/misc.h" +#include "schema/pgForeignServer.h" +#include "schema/pgDatatype.h" + + +pgForeignServer::pgForeignServer(pgForeignDataWrapper *newForeignDataWrapper, const wxString& newName) +: pgForeignDataWrapperObject(newForeignDataWrapper, foreignServerFactory, newName) +{ +} + + +wxString pgForeignServer::GetTranslatedMessage(int kindOfMessage) const +{ + wxString message = wxEmptyString; + + switch (kindOfMessage) + { + case RETRIEVINGDETAILS: + message = _("Retrieving details on foreign server"); + message += wxT(" ") + GetName(); + break; + case REFRESHINGDETAILS: + message = _("Refreshing foreign server"); + message += wxT(" ") + GetName(); + break; + case DROPINCLUDINGDEPS: + message = wxString::Format(_("Are you sure you wish to drop foreign server \"%s\" including all objects that depend on it?"), + GetFullIdentifier().c_str()); + break; + case DROPEXCLUDINGDEPS: + message = wxString::Format(_("Are you sure you wish to drop foreign server \"%s?\""), + GetFullIdentifier().c_str()); + break; + case DROPCASCADETITLE: + message = _("Drop foreign server cascaded?"); + break; + case DROPTITLE: + message = _("Drop foreign server?"); + break; + } + + return message; +} + + +bool pgForeignServer::DropObject(wxFrame *frame, ctlTree *browser, bool cascaded) +{ + wxString sql=wxT("DROP SERVER ") + GetQuotedFullIdentifier(); + if (cascaded) + sql += wxT(" CASCADE"); + return GetDatabase()->ExecuteVoid(sql); +} + + +wxString pgForeignServer::GetSql(ctlTree *browser) +{ + if (sql.IsNull()) + { + sql = wxT("-- Server: ") + GetQuotedFullIdentifier() + wxT("\n\n") + + wxT("-- DROP SERVER ") + GetQuotedFullIdentifier() + wxT(";") + + wxT("\n\nCREATE SERVER ") + GetName(); + + if (!GetType().IsEmpty()) + sql += wxT("\n TYPE ") + qtDbString(GetType()); + + if (!GetVersion().IsEmpty()) + sql += wxT("\n VERSION ") + qtDbString(GetVersion()); + + if (!GetOptions().IsEmpty()) + sql += wxT("\n OPTIONS (") + GetCreateOptions() + wxT(")"); + + sql += wxT(";\n") + + GetOwnerSql(8, 4, wxT("SERVER ") + GetName()) + + GetGrant(wxT("U"), wxT("FOREIGN SERVER ") + GetQuotedFullIdentifier()); + } + return sql; +} + + +void pgForeignServer::ShowTreeDetail(ctlTree *browser, frmMain *form, ctlListView *properties, ctlSQLBox *sqlPane) +{ + if (properties) + { + CreateListColumns(properties); + + properties->AppendItem(_("Name"), GetName()); + properties->AppendItem(_("OID"), GetOid()); + properties->AppendItem(_("Owner"), GetOwner()); + properties->AppendItem(_("ACL"), GetAcl()); + properties->AppendItem(_("Foreign Data Wrapper"), GetFdw()); + properties->AppendItem(_("Type"), GetType()); + properties->AppendItem(_("Version"), GetVersion()); + properties->AppendItem(_("Options"), GetOptions()); + } +} + + + +pgObject *pgForeignServer::Refresh(ctlTree *browser, const wxTreeItemId item) +{ + pgObject *fs=0; + pgCollection *coll=browser->GetParentCollection(item); + if (coll) + fs = foreignServerFactory.CreateObjects(coll, 0, wxT("\n WHERE srv.oid=") + GetOidStr()); + + return fs; +} + + +//////////////////////////////////////////////////// + + +pgObject *pgForeignServerFactory::CreateObjects(pgCollection *collection, ctlTree *browser, const wxString &restriction) +{ + wxString sql; + pgForeignServer *fs=0; + + sql = wxT("SELECT srv.oid, srvname, srvtype, srvversion, srvacl, fdw.fdwname as fdwname, description, ") + wxT("array_to_string(srvoptions, ',') AS srvoptions, ") + wxT("pg_get_userbyid(srvowner) as srvowner\n") + wxT(" FROM pg_foreign_server srv\n") + wxT(" LEFT OUTER JOIN pg_foreign_data_wrapper fdw on fdw.oid=srvfdw\n") + wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=srv.oid AND des.objsubid=0\n") + + restriction + wxT("\n") + wxT(" ORDER BY srvname"); + pgSet *foreignservers = collection->GetDatabase()->ExecuteSet(sql); + if (foreignservers) + { + while (!foreignservers->Eof()) + { + fs = new pgForeignServer(collection->GetForeignDataWrapper(), foreignservers->GetVal(wxT("srvname"))); + fs->iSetOid(foreignservers->GetOid(wxT("oid"))); + fs->iSetOwner(foreignservers->GetVal(wxT("srvowner"))); + fs->iSetFdw(foreignservers->GetVal(wxT("fdwname"))); + fs->iSetAcl(foreignservers->GetVal(wxT("srvacl"))); + fs->iSetComment(foreignservers->GetVal(wxT("description"))); + fs->iSetType(foreignservers->GetVal(wxT("srvtype"))); + fs->iSetVersion(foreignservers->GetVal(wxT("srvversion"))); + fs->iSetOptions(foreignservers->GetVal(wxT("srvoptions"))); + + if (browser) + { + browser->AppendObject(collection, fs); + foreignservers->MoveNext(); + } + else + break; + } + + delete foreignservers; + } + + return fs; +} + + +wxString pgForeignServer::GetCreateOptions() +{ + wxString options_create = wxEmptyString; + wxString opt; + wxString val; + + wxStringTokenizer tkz_options(options, wxT(",")); + while (tkz_options.HasMoreTokens()) + { + wxStringTokenizer tkz_option(tkz_options.GetNextToken(), wxT("=")); + opt = tkz_option.GetNextToken(); + val = tkz_option.GetNextToken(); + + if (!options_create.IsEmpty()) + options_create += wxT(","); + + options_create += opt + wxT(" '") + val + wxT("'"); + } + + return options_create; +} + + +///////////////////////////// + +wxString pgForeignServerCollection::GetTranslatedMessage(int kindOfMessage) const +{ + wxString message = wxEmptyString; + + switch (kindOfMessage) + { + case RETRIEVINGDETAILS: + message = _("Retrieving details on foreign servers"); + break; + case REFRESHINGDETAILS: + message = _("Refreshing foreign servers"); + break; + } + + return message; +} + +/////////////////////////////////////////////////// + +#include "images/foreignserver.pngc" +#include "images/foreignserver-sm.pngc" +#include "images/foreignservers.pngc" + +pgForeignServerFactory::pgForeignServerFactory() +: pgForeignDataWrapperObjFactory(__("Foreign Server"), __("New Foreign Server..."), +__("Create a new Foreign Server."), foreignserver_png_img, foreignserver_sm_png_img) +{ +} + + +pgForeignServerFactory foreignServerFactory; +static pgaCollectionFactory cf(&foreignServerFactory, __("Foreign Servers"), foreignservers_png_img); diff --git a/pgadmin/schema/pgObject.cpp b/pgadmin/schema/pgObject.cpp index 4c9e7c5..0d008cf 100644 --- a/pgadmin/schema/pgObject.cpp +++ b/pgadmin/schema/pgObject.cpp @@ -40,6 +40,7 @@ #include "schema/pgCheck.h" #include "schema/pgIndexConstraint.h" #include "schema/pgForeignKey.h" +#include "schema/pgForeignServer.h" #include "schema/pgRule.h" #include "schema/pgRole.h" #include "schema/pgCast.h" @@ -118,6 +119,8 @@ wxString pgObject::GetTranslatedMessage(int kindOfMessage) const message = ((gpExtTable *)this)->GetTranslatedMessage(kindOfMessage); else if (type == wxT("ForeignKey")) message = ((pgForeignKey *)this)->GetTranslatedMessage(kindOfMessage); + else if (type == wxT("ForeignServer")) + message = ((pgForeignServer *)this)->GetTranslatedMessage(kindOfMessage); else if (type == wxT("FTS Configuration")) message = ((pgTextSearchConfiguration *)this)->GetTranslatedMessage(kindOfMessage); else if (type == wxT("FTS Dictionary")) diff --git a/pgadmin/ui/dlgForeignServer.xrc b/pgadmin/ui/dlgForeignServer.xrc new file mode 100644 index 0000000..9aea897 --- /dev/null +++ b/pgadmin/ui/dlgForeignServer.xrc @@ -0,0 +1,283 @@ + + + + + 220,250d + + + 1 + 0 + 0 + + + 216,225d + 0 + + + + + 2 + 8 + 5 + 5 + 6 + 1 + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 135,-1d + + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + + + wxALIGN_CENTRE_VERTICAL|wxALL + 4 + + + + + 135,-1d + + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + 4 + + + + + + + + + 1 + 3 + 0 + 0 + + + 70,15d + + + + wxALL|wxEXPAND + 5 + + + + 2 + 2 + 5 + 5 + 1 + + + + + wxALIGN_CENTRE_VERTICAL + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + wxEXPAND|wxALIGN_CENTRE_VERTICAL + + + + + + wxALIGN_CENTRE_VERTICAL + + + + 135,-1d + + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + wxEXPAND|wxALIGN_CENTRE_VERTICAL + + + wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL + 5 + + + + 2 + 1 + + + + 13,58d + + wxALL|wxALIGN_RIGHT + 2 + + + + + 13,78d + + wxALL|wxALIGN_RIGHT + 2 + + + wxALIGN_RIGHT + + + + + + wxALL|wxGROW|wxALIGN_CENTRE + 3 + + + 2,2d + + + + 7 + 2 + + 3,3d + + + + + + + + 3,3d + + + + + 1 + + + + 3,3d + + + + + + + + 3,3d + + + wxTOP|wxLEFT|wxRIGHT|wxGROW + + + 3,3d + + + + + + wxGROW|wxALIGN_CENTRE + 3 + + + + diff --git a/pgadmin/ui/module.mk b/pgadmin/ui/module.mk index 9e2e3d9..79da290 100644 --- a/pgadmin/ui/module.mk +++ b/pgadmin/ui/module.mk @@ -28,6 +28,7 @@ TMP_ui += \ $(srcdir)/ui/dlgFindReplace.xrc \ $(srcdir)/ui/dlgForeignDataWrapper.xrc \ $(srcdir)/ui/dlgForeignKey.xrc \ + $(srcdir)/ui/dlgForeignServer.xrc \ $(srcdir)/ui/dlgFunction.xrc \ $(srcdir)/ui/dlgGroup.xrc \ $(srcdir)/ui/dlgHbaConfig.xrc \ -- 1.7.1