Index: BUGS.txt
===================================================================
RCS file: /projects/pgadmin3/BUGS.txt,v
retrieving revision 1.58
retrieving revision 1.59
diff -LBUGS.txt -LBUGS.txt -u -w -r1.58 -r1.59
--- BUGS.txt
+++ BUGS.txt
@@ -19,7 +19,8 @@
Fixed issues
- - AP 2004-09-17 [new Database] Name/Owner not editable for 7.3/7.4 servers [Jona]
+
- AP 2004-09-18 [Server property] some changes not handled correctly [Ted Taylor]
+
- AP 2004-09-17 [new Database] Name/Owner not editable for 7.3/7.4 servers [Jona, Ted Taylor]
- DP 2004-09-16 [Server property] password visible when connecting to server [Ivan Nejgebauer]
- AP 2004-09-10 [all] internal types like varchar are quoted when used as type
- AP 2004-08-15 [Windows] Alt+Tab Icon is system default.
Index: dlgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDatabase.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lsrc/ui/dlgDatabase.cpp -Lsrc/ui/dlgDatabase.cpp -u -w -r1.33 -r1.34
--- src/ui/dlgDatabase.cpp
+++ src/ui/dlgDatabase.cpp
@@ -347,6 +347,7 @@
}
+ AppendOwnerChange(sql);
AppendComment(sql, wxT("DATABASE"), 0, database);
}
else
@@ -361,8 +362,6 @@
AppendIfFilled(sql, wxT("\n TABLESPACE="), qtIdent(cbTablespace->GetValue()));
sql += wxT(";\n");
-
- AppendOwnerNew(sql, wxT("DATABASE ") + qtIdent(name));
}
sql += GetGrant(wxT("CT"), wxT("DATABASE ") + qtIdent(name));
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.9 -r1.10
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -42,7 +42,7 @@
EVT_NOTEBOOK_PAGE_CHANGED(XRCID("nbNotebook"), dlgServer::OnPageSelect)
EVT_TEXT(XRCID("txtDescription"), dlgProperty::OnChange)
EVT_TEXT(XRCID("txtService"), dlgProperty::OnChange)
- EVT_TEXT(XRCID("txtDatabase"), dlgProperty::OnChange)
+ EVT_TEXT(XRCID("cbDatabase"), dlgProperty::OnChange)
EVT_TEXT(XRCID("txtPort") , dlgProperty::OnChange)
EVT_TEXT(XRCID("txtUsername"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbSSL"), dlgProperty::OnChange)
@@ -95,13 +95,19 @@
if (server)
{
server->iSetDescription(txtDescription->GetValue());
+ if (txtService->GetValue() != server->GetServiceID())
+ {
+ mainForm->StartMsg(_("Checking server status"));
server->iSetServiceID(txtService->GetValue());
+ mainForm->EndMsg();
+ }
server->iSetPort(StrToLong(txtPort->GetValue()));
server->iSetSSL(cbSSL->GetSelection());
server->iSetLastDatabase(cbDatabase->GetValue());
server->iSetUsername(txtUsername->GetValue());
server->iSetNeedPwd(chkNeedPwd->GetValue());
mainForm->execSelChange(server->GetId(), true);
+ mainForm->GetBrowser()->SetItemText(item, server->GetFullName());
}
if (IsModal())
@@ -239,6 +245,7 @@
|| txtDescription->GetValue() != server->GetDescription()
|| txtService->GetValue() != server->GetServiceID()
|| StrToLong(txtPort->GetValue()) != server->GetPort()
+ || cbDatabase->GetValue() != server->GetDatabaseName()
|| txtUsername->GetValue() != server->GetUsername()
|| chkNeedPwd->GetValue() != server->GetNeedPwd();
}