[pgadmin-hackers] CVS Commit by dpage: Okay, so I got pgAdmin3 to build on Panther with
Log Message: --- Okay, so I got pgAdmin3 to build on Panther with only two patches, both of which are attached. [Adam H Pendleton] Modified Files: -- pgadmin3/src/include: utffile.h (r1.3 -> r1.4) Index: utffile.h === RCS file: /projects/pgadmin3/src/include/utffile.h,v retrieving revision 1.3 retrieving revision 1.4 diff -Lsrc/include/utffile.h -Lsrc/include/utffile.h -u -w -r1.3 -r1.4 --- src/include/utffile.h +++ src/include/utffile.h @@ -13,6 +13,8 @@ #ifndef _WX_UTFFILEH__ #define _WX_UTFFILEH__ +#include "wx/wx.h" +#include "wx/font.h" #include "wx/file.h" class wxUtfFile : public wxFile ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by dpage: Okay, so I got pgAdmin3 to build on Panther with
Log Message: --- Okay, so I got pgAdmin3 to build on Panther with only two patches, both of which are attached. [Adam H Pendleton] Modified Files: -- pgadmin3: configure.ac (r1.21 -> r1.22) Index: configure.ac === RCS file: /projects/pgadmin3/configure.ac,v retrieving revision 1.21 retrieving revision 1.22 diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.21 -r1.22 --- configure.ac +++ configure.ac @@ -4,7 +4,7 @@ AC_INIT(pgadmin3, 1.1.0, [EMAIL PROTECTED]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([src/pgAdmin3.cpp]) -AC_CONFIG_HEADER([config.h]) +AM_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT([/usr/local/pgadmin3]) ---(end of broadcast)--- TIP 6: Have you searched our list archives? http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by andreas: catch 2.5.1 assert
Log Message:
---
catch 2.5.1 assert
Modified Files:
--
pgadmin3/src/ui:
frmMain.cpp (r1.85 -> r1.86)
Index: frmMain.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.85 -r1.86
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -434,6 +434,8 @@
void frmMain::OnPageChange(wxNotebookEvent& event)
{
wxTreeItemId item=browser->GetSelection();
+ if (!item)
+ return;
pgObject *data = (pgObject*)browser->GetItemData(item);
if (!data)
---(end of broadcast)---
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: Fix duplicate Destroy() on Connect Server (is
Log Message:
---
Fix duplicate Destroy() on Connect Server (is already done by dtor)
Modified Files:
--
pgadmin3/src/ui:
frmConnect.cpp (r1.21 -> r1.22)
Index: frmConnect.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmConnect.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/frmConnect.cpp -Lsrc/ui/frmConnect.cpp -u -w -r1.21 -r1.22
--- src/ui/frmConnect.cpp
+++ src/ui/frmConnect.cpp
@@ -110,14 +110,12 @@
{
TransferDataFromWindow();
EndModal(wxID_OK);
-Destroy();
}
void frmConnect::OnCancel(wxCommandEvent& ev)
{
EndModal(wxID_CANCEL);
-Destroy();
}
int frmConnect::Go()
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: changed font handling to accept exotic weights
Log Message:
---
changed font handling to accept exotic weights
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.94 -> r1.95)
pgadmin3/src/include:
sysSettings.h (r1.30 -> r1.31)
pgadmin3/src/ui:
frmOptions.cpp (r1.40 -> r1.41)
pgadmin3/src/utils:
sysSettings.cpp (r1.58 -> r1.59)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.94
retrieving revision 1.95
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.94 -r1.95
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-03-24 APchanged font handling to accept exotic weights
2004-03-17 APUpdated sources for wx 2.5.1
2004-03-17 APAdded Font Option
2004-03-06 AP *** Fixed missing qtIdent for CREATE DATABASE TEMPLATE option
Index: sysSettings.h
===
RCS file: /projects/pgadmin3/src/include/sysSettings.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lsrc/include/sysSettings.h -Lsrc/include/sysSettings.h -u -w -r1.30 -r1.31
--- src/include/sysSettings.h
+++ src/include/sysSettings.h
@@ -101,10 +101,10 @@
bool GetUnicodeFile() const { return unicodeFile; }
void SetUnicodeFile(const bool b) {unicodeFile = b; }
-wxFont GetSQLFont() const { return wxFont(sqlFontPointSize, sqlFontFamily,
sqlFontStyle, sqlFontWeight, false, sqlFontFace); }
+wxFont GetSQLFont() const { return sqlFont; }
wxFont GetSystemFont() const { return systemFont; }
-void SetFont(const wxFont &font);
-void SetSQLFont(const wxFont &font);
+void SetFont(const wxFont &font) { systemFont = font; }
+void SetSQLFont(const wxFont &font) { sqlFont = font; }
wxString GetCanonicalLanguage() const { return canonicalLanguage; }
bool Write(const wxString &key, const wxString &value) { return
wxConfig::Write(key, value); }
@@ -129,12 +129,13 @@
wxPoint Read(const wxString& key, const wxPoint &defaultVal) const;
wxSize Read(const wxString& key, const wxSize &defaultVal) const;
+ void Save();
private:
-wxFont systemFont;
+wxFont systemFont, sqlFont;
// Tip Of The Day
bool showTipOfTheDay;
@@ -166,11 +167,6 @@
bool doubleClickProperties;
wxString searchPath;
-
-int fontPointSize, fontFamily, fontStyle, fontWeight;
-wxString fontFace;
-int sqlFontPointSize, sqlFontFamily, sqlFontStyle, sqlFontWeight;
-wxString sqlFontFace;
};
#endif
Index: frmOptions.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmOptions.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lsrc/ui/frmOptions.cpp -Lsrc/ui/frmOptions.cpp -u -w -r1.40 -r1.41
--- src/ui/frmOptions.cpp
+++ src/ui/frmOptions.cpp
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
// App headers
#include "frmOptions.h"
@@ -122,9 +123,9 @@
cbLanguage->SetSelection(sel);
currentFont=settings->GetSystemFont();
-txtFont->SetValue(currentFont.GetFaceName() + wxT(".") +
NumToStr((long)currentFont.GetPointSize()));
+txtFont->SetValue(currentFont.GetNativeFontInfoUserDesc());
currentSqlFont=settings->GetSQLFont();
-txtSqlFont->SetValue(currentSqlFont.GetFaceName() + wxT(".") +
NumToStr((long)currentSqlFont.GetPointSize()));
+txtSqlFont->SetValue(currentSqlFont.GetNativeFontInfoUserDesc());
}
@@ -233,6 +234,7 @@
}
+settings->Save();
Destroy();
}
@@ -247,7 +249,7 @@
if (dlg.ShowModal() == wxID_OK)
{
currentSqlFont=dlg.GetFontData().GetChosenFont();
-txtSqlFont->SetValue(currentSqlFont.GetFaceName() + wxT(".") +
NumToStr((long)currentSqlFont.GetPointSize()));
+txtSqlFont->SetValue(currentSqlFont.GetNativeFontInfoUserDesc());
}
}
@@ -261,7 +263,7 @@
if (dlg.ShowModal() == wxID_OK)
{
currentFont=dlg.GetFontData().GetChosenFont();
-txtFont->SetValue(currentFont.GetFaceName() + wxT(".") +
NumToStr((long)currentFont.GetPointSize()));
+txtFont->SetValue(currentFont.GetNativeFontInfoUserDesc());
}
}
void frmOptions::OnCancel(wxCommandEvent &ev)
Index: sysSettings.cpp
===
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.58 -r1.59
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -83,28 +83,20 @@
if (langInfo)
canonicalLanguage=langInfo->CanonicalName;
-Read(wxT("FontPointSize"), &fontPointSize, 0);
-Read(wxT("FontFace"), &fontFace, wxEmptyString);
-Read(wxT("FontFamily"), &fontFamily, 0);
-Read(wxT("FontStyle"), &fontStyle, 0);
-Read(wxT("FontWeight"), &fontWeight, 0);
+ wxString fon
[pgadmin-hackers] CVS Commit by andreas: changed font handling to accept exotic weights
Log Message:
---
changed font handling to accept exotic weights
Modified Files:
--
pgadmin3/src/utils:
sysSettings.cpp (r1.59 -> r1.60)
Index: sysSettings.cpp
===
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.59 -r1.60
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -32,11 +32,6 @@
sysSettings::sysSettings(const wxString& name) : wxConfig(name)
{
- // Keith 2003.03.05
- // Can't do this because the logger is set up *after* syssettings
- // so nothing will be logged, and it causes a memory leak
-// wxLogInfo(wxT("Creating sSettings object and loading settings"));
-
// Tip Of The Day
Read(wxT("ShowTipOfTheDay"), &showTipOfTheDay, TRUE);
Read(wxT("NextTipOfTheDay"), &nextTipOfTheDay, 0);
@@ -181,7 +176,7 @@
void sysSettings::SetShowTipOfTheDay(const bool newval)
{
showTipOfTheDay = newval;
-Write(wxT("NextTipOfTheDay"), nextTipOfTheDay);
+Write(wxT("NextTipOfTheDay"), showTipOfTheDay);
}
void sysSettings::SetNextTipOfTheDay(const int newval)
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: changed font handling to accept exotic weights
Log Message:
---
changed font handling to accept exotic weights
Modified Files:
--
pgadmin3/src/utils:
sysSettings.cpp (r1.60 -> r1.61)
Index: sysSettings.cpp
===
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.60 -r1.61
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -176,7 +176,7 @@
void sysSettings::SetShowTipOfTheDay(const bool newval)
{
showTipOfTheDay = newval;
-Write(wxT("NextTipOfTheDay"), showTipOfTheDay);
+Write(wxT("ShowTipOfTheDay"), showTipOfTheDay);
}
void sysSettings::SetNextTipOfTheDay(const int newval)
---(end of broadcast)---
TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: Allow initial selection of language "Default"
Log Message:
---
Allow initial selection of language "Default"
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.95 -> r1.96)
pgadmin3/src:
pgAdmin3.cpp (r1.92 -> r1.93)
pgadmin3/src/schema:
pgObject.cpp (r1.60 -> r1.61)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.95
retrieving revision 1.96
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.95 -r1.96
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-03-25 AP *** Allow initial selection of language "Default"
2004-03-24 APchanged font handling to accept exotic weights
2004-03-17 APUpdated sources for wx 2.5.1
2004-03-17 APAdded Font Option
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.92 -r1.93
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -240,6 +240,8 @@
langCount+1, langNames);
if (langNo > 0)
langId =
(wxLanguage)wxLocale::GetLanguageInfo(existingLangs.Item(langNo-1))->Language;
+else if (langNo == 0)
+langId = wxLANGUAGE_DEFAULT;
delete[] langNames;
}
Index: pgObject.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgObject.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lsrc/schema/pgObject.cpp -Lsrc/schema/pgObject.cpp -u -w -r1.60 -r1.61
--- src/schema/pgObject.cpp
+++ src/schema/pgObject.cpp
@@ -172,8 +172,6 @@
if (set)
{
-long pos=0;
-
while (!set->Eof())
{
wxString refname;
---(end of broadcast)---
TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: Allow initial selection of language "Default"
Log Message: --- Allow initial selection of language "Default" Tags: REL-1_0_0_PATCHES Modified Files: -- pgadmin3/src: pgAdmin3.cpp (r1.81 -> r1.81.2.1) Index: pgAdmin3.cpp === RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v retrieving revision 1.81 retrieving revision 1.81.2.1 diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.81 -r1.81.2.1 --- src/pgAdmin3.cpp +++ src/pgAdmin3.cpp @@ -202,6 +202,8 @@ langCount+1, langNames); if (langNo > 0) langId = (wxLanguage)wxLocale::GetLanguageInfo(existingLangs.Item(langNo-1))->Language; +else if (langNo == 0) +langId = wxLANGUAGE_DEFAULT; delete[] langNames; } ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by jmpoure: Confirming Tucows
Log Message: --- Confirming Tucows Modified Files: -- www/pgadmin3/cnt: cnt_advocacy.php (r1.197 -> r1.198) Index: cnt_advocacy.php === RCS file: /projects/www/pgadmin3/cnt/cnt_advocacy.php,v retrieving revision 1.197 retrieving revision 1.198 diff -Lpgadmin3/cnt/cnt_advocacy.php -Lpgadmin3/cnt/cnt_advocacy.php -u -w -r1.197 -r1.198 --- pgadmin3/cnt/cnt_advocacy.php +++ pgadmin3/cnt/cnt_advocacy.php @@ -162,7 +162,7 @@ The Software bank Top Downloads Net TopShareware -Tucows (pending) +Tucows WinPick WorldSSP Zend ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by jmpoure: Confirming PC World download
Log Message: --- Confirming PC World download Modified Files: -- www/pgadmin3/cnt: cnt_advocacy.php (r1.198 -> r1.199) Index: cnt_advocacy.php === RCS file: /projects/www/pgadmin3/cnt/cnt_advocacy.php,v retrieving revision 1.198 retrieving revision 1.199 diff -Lpgadmin3/cnt/cnt_advocacy.php -Lpgadmin3/cnt/cnt_advocacy.php -u -w -r1.198 -r1.199 --- pgadmin3/cnt/cnt_advocacy.php +++ pgadmin3/cnt/cnt_advocacy.php @@ -147,7 +147,7 @@ Nonags (update pending) OSDir OReilly (pending) Pad Ring (pending) -PC World Download (pending) +PC World Download Perfect Downloads ProgramFiles.com Programmers Heaven ---(end of broadcast)--- TIP 5: Have you checked our extensive FAQ? http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by jmpoure: Confirming www.shareware.de on the advocacy page.
Log Message: --- Confirming www.shareware.de on the advocacy page. Modified Files: -- www/pgadmin3/cnt: cnt_advocacy.php (r1.199 -> r1.200) Index: cnt_advocacy.php === RCS file: /projects/www/pgadmin3/cnt/cnt_advocacy.php,v retrieving revision 1.199 retrieving revision 1.200 diff -Lpgadmin3/cnt/cnt_advocacy.php -Lpgadmin3/cnt/cnt_advocacy.php -u -w -r1.199 -r1.200 --- pgadmin3/cnt/cnt_advocacy.php +++ pgadmin3/cnt/cnt_advocacy.php @@ -119,7 +119,7 @@ Apps4Linux DMOZ links2linux.de -Shareware.de (pending) +Shareware.de ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by jmpoure: Publishing Finnish (fi_FI)
Log Message: --- Publishing Finnish (fi_FI) Modified Files: -- pgadmin3/src: Makefile.am (r1.78 -> r1.79) Index: Makefile.am === RCS file: /projects/pgadmin3/src/Makefile.am,v retrieving revision 1.78 retrieving revision 1.79 diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.78 -r1.79 --- src/Makefile.am +++ src/Makefile.am @@ -104,6 +104,7 @@ ui/el_GR/pgadmin3.po \ ui/es_ES/pgadmin3.po \ ui/fa_IR/pgadmin3.po \ +ui/fi_FI/pgadmin3.po \ ui/fr_FR/pgadmin3.po \ ui/gl_ES/pgadmin3.po \ ui/hr_HR/pgadmin3.po \ @@ -145,6 +146,7 @@ ui/el_GR/pgadmin3.mo \ ui/es_ES/pgadmin3.mo \ ui/fa_IR/pgadmin3.mo \ +ui/fi_FI/pgadmin3.mo \ ui/fr_FR/pgadmin3.mo \ ui/hr_HR/pgadmin3.mo \ ui/gl_ES/pgadmin3.mo \ ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by jmpoure: Updating translation statistics
Log Message:
---
Updating translation statistics
Modified Files:
--
www/pgadmin3/cnt:
cnt_translation_status.php (r1.61 -> r1.62)
Index: cnt_translation_status.php
===
RCS file: /projects/www/pgadmin3/cnt/cnt_translation_status.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lpgadmin3/cnt/cnt_translation_status.php
-Lpgadmin3/cnt/cnt_translation_status.php -u -w -r1.61 -r1.62
--- pgadmin3/cnt/cnt_translation_status.php
+++ pgadmin3/cnt/cnt_translation_status.php
@@ -23,6 +23,7 @@
$translated->addLanguage ("el_GR", "Greek", "Γιάννης Παΐλας (Yiannis
Pailas)", "[EMAIL PROTECTED]", "pgadmin3.po","src/ui/el_GR/pgadmin3.po",
"pgadmin3.pot", "pgadmin3.pot");
$translated->addLanguage ("es_ES", "Spanish", "Karim Mribti", "[EMAIL PROTECTED]",
"pgadmin3.po","src/ui/es_ES/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
$translated->addLanguage ("fa_IR", "Farsi", "Abbas Izad", "[EMAIL PROTECTED]",
"pgadmin3.po", "src/ui/fa_IR/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
+$pending->addLanguage ("fi_FI", "Finnish", "Jori Luoto", "[EMAIL PROTECTED]",
"pgadmin3.po","src/ui/fi_FI/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
$translated->addLanguage ("fr_FR", "French", "Jean-Michel Pouré", "[EMAIL
PROTECTED]", "pgadmin3.po","src/ui/fr_FR/pgadmin3.po", "pgadmin3.pot",
"pgadmin3.pot");
$translated->addLanguage ("gl_ES", "Galician", "Antonio Ricoy", "[EMAIL
PROTECTED]", "pgadmin3.po","src/ui/gl_ES/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
$translated->addLanguage ("hr_HR", "Croatian", "Finteh d.o.o.", "[EMAIL
PROTECTED]", "pgadmin3.po", "src/ui/hr_HR/pgadmin3.po", "pgadmin3.pot",
"pgadmin3.pot");
@@ -46,7 +47,6 @@
$translated->addLanguage ("zh_CN", "Chinese simplified", "何伟平 (Weiping He)",
"[EMAIL PROTECTED]", "pgadmin3.po", "src/ui/zh_CN/pgadmin3.po", "pgadmin3.pot",
"pgadmin3.pot");
$translated->addLanguage ("zh_TW", "Chinese traditional", "李枝新 (Chih-Hsin
Lee)", "[EMAIL PROTECTED]", "pgadmin3.po", "src/ui/zh_TW/pgadmin3.po", "pgadmin3.pot",
"pgadmin3.pot");
- $pending->addLanguage ("fi_FI", "Finnish", "Jori Luoto", "[EMAIL PROTECTED]",
"pgadmin3.po","src/ui/fi_FI/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
$pending->addLanguage ("is_IS", "Icelandic", "Þórhallur Hálfdánarson", "[EMAIL
PROTECTED]", "pgadmin3.po","src/ui/is_IS/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
$pending->addLanguage ("lt_LT", "Lithuanian", "Linas Jankauskas", "[EMAIL
PROTECTED]", "pgadmin3.po", "src/ui/lt_LT/pgadmin3.po", "pgadmin3.pot",
"pgadmin3.pot");
$pending->addLanguage ("tl_PH", "Filipino/Tagalog", "Howard Bagcat", "[EMAIL
PROTECTED]", "pgadmin3.po","src/ui/tl_PH/pgadmin3.po", "pgadmin3.pot", "pgadmin3.pot");
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by jmpoure: Updating translation statistics
Log Message:
---
Updating translation statistics
Modified Files:
--
www/pgadmin3/cache:
cache_pending.txt (r1.58 -> r1.59)
cache_translated.txt (r1.68 -> r1.69)
www/pgadmin3/cnt:
cnt_translation_status.php (r1.62 -> r1.63)
Index: cache_pending.txt
===
RCS file: /projects/www/pgadmin3/cache/cache_pending.txt,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lpgadmin3/cache/cache_pending.txt -Lpgadmin3/cache/cache_pending.txt -u -w
-r1.58 -r1.59
--- pgadmin3/cache/cache_pending.txt
+++ pgadmin3/cache/cache_pending.txt
@@ -1 +1 @@
-a:13:{s:6:"locale";a:6:{i:0;s:5:"fi_FI";i:1;s:5:"is_IS";i:2;s:5:"lt_LT";i:3;s:5:"tl_PH";i:4;s:5:"uk_UA";i:5;s:5:"vi_VN";}s:8:"language";a:6:{i:0;s:7:"Finnish";i:1;s:9:"Icelandic";i:2;s:10:"Lithuanian";i:3;s:16:"Filipino/Tagalog";i:4;s:9:"Ukrainian";i:5;s:10:"Vietnamese";}s:15:"translator_name";a:6:{i:0;s:10:"Jori
Luoto";i:1;s:26:"Þórhallur Hálfdánarson";i:2;s:16:"Linas
Jankauskas";i:3;s:13:"Howard Bagcat";i:4;s:59:"Алексей Поторжинский
(Alex Potorzhinsky)";i:5;s:18:"Victor Ngoc Duc
Vu";}s:16:"translator_email";a:6:{i:0;s:14:"[EMAIL PROTECTED]";i:1;s:12:"[EMAIL
PROTECTED]";i:2;s:25:"[EMAIL PROTECTED]";i:3;s:16:"[EMAIL PROTECTED]";i:4;s:12:"[EMAIL
PROTECTED]";i:5;s:21:"[EMAIL
PROTECTED]";}s:8:"pot_name";a:6:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";i:5;s:6:"unused";}s:8:"pot_path";a:6:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";i:5;s:6:"unused";}s:9:"pot_total";a:6:{i:0;!
i:765;i:1;i:765;i:2;i:765;i:3;i:765;i:4;i:765;i:5;i:765;}s:7:"po_name";a:6:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";i:5;s:6:"unused";}s:7:"po_path";a:6:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";i:5;s:6:"unused";}s:8:"po_total";a:6:{i:0;i:765;i:1;i:765;i:2;i:764;i:3;i:765;i:4;i:765;i:5;i:765;}s:13:"po_translated";a:6:{i:0;i:752;i:1;i:0;i:2;i:430;i:3;i:404;i:4;i:0;i:5;i:0;}s:15:"po_untranslated";a:6:{i:0;i:13;i:1;i:765;i:2;i:334;i:3;i:361;i:4;i:765;i:5;i:765;}s:9:"po_status";a:6:{i:0;d:98;i:1;d:0;i:2;d:56.00710542735760100185871124267578125;i:3;d:53;i:4;d:0;i:5;d:0;}}
\ No newline at end of file
+a:13:{s:6:"locale";a:5:{i:0;s:5:"is_IS";i:1;s:5:"lt_LT";i:2;s:5:"tl_PH";i:3;s:5:"uk_UA";i:4;s:5:"vi_VN";}s:8:"language";a:5:{i:0;s:9:"Icelandic";i:1;s:10:"Lithuanian";i:2;s:16:"Filipino/Tagalog";i:3;s:9:"Ukrainian";i:4;s:10:"Vietnamese";}s:15:"translator_name";a:5:{i:0;s:26:"Þórhallur
Hálfdánarson";i:1;s:16:"Linas Jankauskas";i:2;s:13:"Howard
Bagcat";i:3;s:59:"Алексей Поторжинский (Alex
Potorzhinsky)";i:4;s:18:"Victor Ngoc Duc
Vu";}s:16:"translator_email";a:5:{i:0;s:12:"[EMAIL PROTECTED]";i:1;s:25:"[EMAIL
PROTECTED]";i:2;s:16:"[EMAIL PROTECTED]";i:3;s:12:"[EMAIL PROTECTED]";i:4;s:21:"[EMAIL
PROTECTED]";}s:8:"pot_name";a:5:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";}s:8:"pot_path";a:5:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";}s:9:"pot_total";a:5:{i:0;i:765;i:1;i:765;i:2;i:765;i:3;i:765;i:4;i:765;}s:7:"po_name";a:5:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused"!
;i:3;s:6:"unused";i:4;s:6:"unused";}s:7:"po_path";a:5:{i:0;s:6:"unused";i:1;s:6:"unused";i:2;s:6:"unused";i:3;s:6:"unused";i:4;s:6:"unused";}s:8:"po_total";a:5:{i:0;i:765;i:1;i:764;i:2;i:765;i:3;i:765;i:4;i:765;}s:13:"po_translated";a:5:{i:0;i:0;i:1;i:430;i:2;i:404;i:3;i:0;i:4;i:0;}s:15:"po_untranslated";a:5:{i:0;i:765;i:1;i:334;i:2;i:361;i:3;i:765;i:4;i:765;}s:9:"po_status";a:5:{i:0;d:0;i:1;d:56.00710542735760100185871124267578125;i:2;d:53;i:3;d:0;i:4;d:0;}}
\ No newline at end of file
Index: cache_translated.txt
===
RCS file: /projects/www/pgadmin3/cache/cache_translated.txt,v
retrieving revision 1.68
retrieving revision 1.69
diff -Lpgadmin3/cache/cache_translated.txt -Lpgadmin3/cache/cache_translated.txt -u -w
-r1.68 -r1.69
--- pgadmin3/cache/cache_translated.txt
+++ pgadmin3/cache/cache_translated.txt
@@ -1 +1 @@
-a:13:{s:6:"locale";a:32:{i:0;s:5:"af_ZA";i:1;s:5:"ar_SA";i:2;s:5:"bg_BG";i:3;s:5:"ca_ES";i:4;s:5:"cs_CZ";i:5;s:5:"da_DK";i:6;s:5:"de_DE";i:7;s:5:"el_GR";i:8;s:5:"es_ES";i:9;s:5:"fa_IR";i:10;s:5:"fr_FR";i:11;s:5:"gl_ES";i:12;s:5:"hr_HR";i:13;s:5:"hu_HU";i:14;s:5:"id_ID";i:15;s:5:"it_IT";i:16;s:5:"ja_JP";i:17;s:5:"lv_LV";i:18;s:5:"nb_NO";i:19;s:5:"nl_NL";i:20;s:5:"pl_PL";i:21;s:5:"pt_BR";i:22;s:5:"pt_PT";i:23;s:5:"ro_RO";i:24;s:5:"ru_RU";i:25;s:5:"sr_YU";i:26;s:5:"sk_SK";i:27;s:5:"sl_SI";i:28;s:5:"sv_SE";i:29;s:5:"tr_TR";i:30;s:5:"zh_CN";i:31;s:5:"zh_TW";}s:8:"language";a:32:{i:0;s:9:"Afrikaans";i:1;s:6:"Arabic";i:2;s:9:"Bulgarian";i:3;s:7:"Catalan";i:4;s:5:"Czech";i:5;s:6:"Danish";i:6;s:6:"German";i:7;s:5:"Greek";i:8;s:7:"Spanish";i:9;s:5:"Farsi";i:10;s:6:"French";i
[pgadmin-hackers] CVS Commit by andreas: fix default font for MSW
Log Message: --- fix default font for MSW Modified Files: -- pgadmin3/src/utils: sysSettings.cpp (r1.62 -> r1.63) ---(end of broadcast)--- TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: fix default font for MSW
Log Message:
---
fix default font for MSW
Modified Files:
--
pgadmin3/src/utils:
sysSettings.cpp (r1.61 -> r1.62)
Index: sysSettings.cpp
===
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.61 -r1.62
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -86,11 +86,17 @@
else
systemFont = wxFont(fontName);
+Read(wxT("frmQuery/Font"), &fontName, wxEmptyString);
+
+if (fontName.IsEmpty())
+{
#ifdef __WXMSW__
-Read(wxT("frmQuery/FontFace"), &fontName, wxT("Courier New.9"));
+sqlFont = wxFont(9, wxTELETYPE, wxNORMAL, wxNORMAL);
#else
-Read(wxT("frmQuery/Font"), &fontName, wxT("monospace 12"));
+sqlFont = wxFont(12, wxTELETYPE, wxNORMAL, wxNORMAL);
#endif
+}
+else
sqlFont = wxFont(fontName);
}
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by jmpoure: Removes/added sites on the Advocacy page
Log Message: --- Removes/added sites on the Advocacy page Modified Files: -- www/pgadmin3/cnt: cnt_advocacy.php (r1.200 -> r1.201) Index: cnt_advocacy.php === RCS file: /projects/www/pgadmin3/cnt/cnt_advocacy.php,v retrieving revision 1.200 retrieving revision 1.201 diff -Lpgadmin3/cnt/cnt_advocacy.php -Lpgadmin3/cnt/cnt_advocacy.php -u -w -r1.200 -r1.201 --- pgadmin3/cnt/cnt_advocacy.php +++ pgadmin3/cnt/cnt_advocacy.php @@ -107,9 +107,9 @@ cs (Czech) +Linux software (pending) PostgreSQL CZ Prospector -Stahuj (reminder to register) @@ -145,7 +145,6 @@ Linux Downloads (pending) Linux Links Nonags (update pending) -OSDir OReilly (pending) Pad Ring (pending) PC World Download Perfect Downloads @@ -155,7 +154,7 @@ Shareware Island Scriptz Sofotex -Soft 411 (pending) +Soft 411 Soft Empire Softpile The Open CD (pending) ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by jmpoure: Updated language script in order to extract text
Log Message: --- Updated language script in order to extract text only from specific pages. Modified Files: -- www/pgadmin3/locale: extract.sh (r1.1 -> r1.2) Index: extract.sh === RCS file: /projects/www/pgadmin3/locale/extract.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -Lpgadmin3/locale/extract.sh -Lpgadmin3/locale/extract.sh -u -w -r1.1 -r1.2 --- pgadmin3/locale/extract.sh +++ pgadmin3/locale/extract.sh @@ -1,7 +1,14 @@ -xgettext-s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_*.php +xgettext-s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_advocacy.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_development.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_download.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_index.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_mirrors.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_screenshots.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_support.php +xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../cnt/cnt_translation.php + xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../tpl/menu.php xgettext -j -s --keyword=_ --language=C --output=pgadmin3_website.pot ../class/pgadmin_po.php recode latin1..u8 pgadmin3_website.pot sed -e "s/=CHARSET/=UTF-8/g" pgadmin3_website.pot > temp.pot mv -f temp.pot pgadmin3_website.pot - ---(end of broadcast)--- TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: no initial language selection (using system
Log Message:
---
no initial language selection (using system default)
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.96 -> r1.97)
pgadmin3/src:
pgAdmin3.cpp (r1.93 -> r1.94)
pgAdmin3.dsp (r1.96 -> r1.97)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.96
retrieving revision 1.97
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.96 -r1.97
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-03-30 AP *** no initial language selection (using system default)
2004-03-25 AP *** Allow initial selection of language "Default"
2004-03-24 APchanged font handling to accept exotic weights
2004-03-17 APUpdated sources for wx 2.5.1
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.93 -r1.94
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -169,6 +169,20 @@
locale = new wxLocale();
locale->AddCatalogLookupPathPrefix(uiPath);
+wxLanguage langId = (wxLanguage)settings->Read(wxT("LanguageId"),
wxLANGUAGE_DEFAULT);
+if (locale->Init(langId))
+{
+#ifdef __LINUX__
+{
+wxLogNull noLog;
+locale->AddCatalog(wxT("fileutils"));
+}
+#endif
+locale->AddCatalog(wxT("pgadmin3"));
+}
+
+
+#if 0 // old language selection on first app start
long langCount=0;
const wxLanguageInfo *langInfo;
int langNo;
@@ -263,6 +277,8 @@
settings->Write(wxT("LanguageId"), (long)langId);
}
}
+#endif
+
// Show the splash screen
frmSplash* winSplash = new frmSplash((wxFrame *)NULL);
Index: pgAdmin3.dsp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.96
retrieving revision 1.97
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.96 -r1.97
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -1613,5 +1613,89 @@
SOURCE=..\TODO.txt
# End Source File
# End Group
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\blank.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\bullseye.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\cdrom.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\computer.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\drive.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\file1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\floppy.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\folder1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\folder2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\hand.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\magnif1.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\noentry.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pbrush.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pencil.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pntleft.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\pntright.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\query.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\removble.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\rightarr.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\roller.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\ui\wx\msw\watch1.cur
+# End Source File
# End Target
# End Project
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: no initial language selection (using system
Log Message:
---
no initial language selection (using system default)
Tags:
REL-1_0_0_PATCHES
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.81.2.1 -> r1.81.2.2)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.81.2.1
retrieving revision 1.81.2.2
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.81.2.1 -r1.81.2.2
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -130,7 +130,19 @@
#endif
locale.AddCatalogLookupPathPrefix(uiPath);
+wxLanguage langId = (wxLanguage)settings->Read(wxT("LanguageId"),
wxLANGUAGE_DEFAULT);
+if (locale.Init(langId))
+{
+#ifdef __LINUX__
+{
+wxLogNull noLog;
+locale.AddCatalog(wxT("fileutils"));
+}
+#endif
+locale.AddCatalog(wxT("pgadmin3"));
+}
+#if 0 // old language selection on first app start
long langCount=0;
const wxLanguageInfo *langInfo;
int langNo;
@@ -223,6 +235,8 @@
settings->Write(wxT("LanguageId"), (long)langId);
}
}
+#endif
+
// Show the splash screen
frmSplash* winSplash = new frmSplash((wxFrame *)NULL);
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: some more languages for 1.0.3
Log Message: --- some more languages for 1.0.3 Tags: REL-1_0_0_PATCHES Modified Files: -- pgadmin3/src/ui: pgadmin3.lng (r1.33.2.1 -> r1.33.2.2) Index: pgadmin3.lng === RCS file: /projects/pgadmin3/src/ui/pgadmin3.lng,v retrieving revision 1.33.2.1 retrieving revision 1.33.2.2 diff -Lsrc/ui/pgadmin3.lng -Lsrc/ui/pgadmin3.lng -u -w -r1.33.2.1 -r1.33.2.2 --- src/ui/pgadmin3.lng +++ src/ui/pgadmin3.lng @@ -1,13 +1,18 @@ - -# Language names for language selection +## +# +# pgAdmin III - PostgreSQL Tools +# Copyright (C) 2002 - 2004, The pgAdmin Development Team +# This software is released under the Artistic Licence +# +# pgadmin3.lng - Language names for language selection # # - first column contains precise name to match wxWindow's name # - second column contains translated name in the native language # - separated by Comma # - surrounding spaces are removed # - this file is interpreted UTF-8 - - +# +## Afrikaans, Afrikaans Arabic (Saudi Arabia), العربية @@ -16,13 +21,14 @@ Chinese (Simplified), 中文 (简体) Chinese (Taiwan), 中文 (台灣) Chinese (Traditional), 中文 (正體) -Catalan, Catalan +Catalan, Català Czech, Czech Croatian, Hrvatski Danish, Dansk Dutch, Nederlands English (U.S.), English Farsi, فارسی +Finnish, Suomi French, Français Galician, Galego German, Deutsch ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by andreas: bugs update
Log Message: --- bugs update Modified Files: -- pgadmin3: BUGS.txt (r1.43 -> r1.44) Index: BUGS.txt === RCS file: /projects/pgadmin3/BUGS.txt,v retrieving revision 1.43 retrieving revision 1.44 diff -LBUGS.txt -LBUGS.txt -u -w -r1.43 -r1.44 --- BUGS.txt +++ BUGS.txt @@ -2,6 +2,7 @@ Known issues [Object Tree] missing schema for function return type if table type (are there more cases?) +[gtk] cursor problem with wxSTC (disappears every second focus change) [Query Builder] Menu item 'Query Browser' causes Segfault under unix - crash after qbForm->Show() in frmQueryBuilder::OnSize() at layout.LayoutMDIFrame(this). QB currently disabled. [Object Tree] Adding an unnamed constraint isn't reflected immediately in the tree. [Windows] Alt+Tab Icon is system default. ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by jmpoure: Added information about Debian SID
Log Message: --- Added information about Debian SID Modified Files: -- www/pgadmin3/cnt: cnt_download.php (r1.63 -> r1.64) Index: cnt_download.php === RCS file: /projects/www/pgadmin3/cnt/cnt_download.php,v retrieving revision 1.63 retrieving revision 1.64 diff -Lpgadmin3/cnt/cnt_download.php -Lpgadmin3/cnt/cnt_download.php -u -w -r1.63 -r1.64 --- pgadmin3/cnt/cnt_download.php +++ pgadmin3/cnt/cnt_download.php @@ -26,10 +26,14 @@ GNU/Linux Debian stable, testing and unstable distributions."), "http://www.debian.org";);?> Knoppix and other Debian based distributions."), "http://www.knoppix.net";);?> - + + + + + mirrors."), "#mirrors");?> @@ -46,61 +50,53 @@ - - - - - - - - deb [MIRROR URL]/pgadmin3/release/debian woody pgadmin - - - - - + -deb [MIRROR URL]/pgadmin3/release/debian testing pgadmin + deb ftp://ftp2.fr.postgresql.org/postgresql/pgadmin3/release/debian woody pgadmin - + - - -deb [MIRROR URL]/pgadmin3/release/debian unstable pgadmin - + + mirrors."), "#mirrors");?> + + + + + + + + + + + + [MIRROR URL]/pgadmin3/release/debian + + + - - - - - - + - deb ftp://ftp2.fr.postgresql.org/postgresql/pgadmin3/release/debian woody pgadmin + deb [MIRROR URL]/pgadmin3/release/debian testing pgadmin - - - - - + deb ftp://ftp2.fr.postgresql.org/postgresql/pgadmin3/release/debian testing pgadmin @@ -111,14 +107,9 @@ - - - deb ftp://ftp2.fr.postgresql.org/postgresql/pgadmin3/release/debian unstable pgadmin - - - + + - ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by jmpoure: Added information about Debian SID
Log Message: --- Added information about Debian SID Modified Files: -- www/pgadmin3/locale: pgadmin3_website.pot (r1.44 -> r1.45) Index: pgadmin3_website.pot === RCS file: /projects/www/pgadmin3/locale/pgadmin3_website.pot,v retrieving revision 1.44 retrieving revision 1.45 diff -Lpgadmin3/locale/pgadmin3_website.pot -Lpgadmin3/locale/pgadmin3_website.pot -u -w -r1.44 -r1.45 --- pgadmin3/locale/pgadmin3_website.pot +++ pgadmin3/locale/pgadmin3_website.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-03-28 14:38+0200\n" +"POT-Creation-Date: 2004-03-31 11:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -83,7 +83,7 @@ msgid "A query tool with colour syntax highlight allows to run custom queries." msgstr "" -#: ../cnt/cnt_download.php:334 +#: ../cnt/cnt_download.php:325 msgid "A recent development environment." msgstr "" @@ -101,7 +101,7 @@ msgid "Access to all PostgreSQL objects" msgstr "" -#: ../cnt/cnt_download.php:11 ../cnt/cnt_download.php:486 +#: ../cnt/cnt_download.php:11 ../cnt/cnt_download.php:477 msgid "Additional languages" msgstr "" @@ -134,7 +134,7 @@ msgid "As usual your feedback is highly appreciated and required." msgstr "" -#: ../cnt/cnt_download.php:428 +#: ../cnt/cnt_download.php:419 #, c-format msgid "Authenticate source code using Dave Page's PGP key." msgstr "" @@ -150,20 +150,20 @@ "we recommand installing binary packages." msgstr "" -#: ../cnt/cnt_download.php:456 +#: ../cnt/cnt_download.php:447 msgid "" "Because compiling from source requires technical knowledge, we recommand " "using binary packages." msgstr "" -#: ../cnt/cnt_download.php:33 +#: ../cnt/cnt_download.php:37 ../cnt/cnt_download.php:74 #, c-format msgid "" "Before you start installation, please choose a mirror in the list of our mirrors." msgstr "" -#: ../cnt/cnt_download.php:454 +#: ../cnt/cnt_download.php:445 #, c-format msgid "" "Binary snapshots are packages compiled from CVS nearly " @@ -193,7 +193,7 @@ msgid "Change log" msgstr "" -#: ../cnt/cnt_download.php:283 +#: ../cnt/cnt_download.php:274 msgid "Check that pgAdmin III executable is in the path." msgstr "" @@ -213,7 +213,7 @@ msgid "Columns can be dropped." msgstr "" -#: ../cnt/cnt_download.php:439 +#: ../cnt/cnt_download.php:430 msgid "Compile pgAdmin III." msgstr "" @@ -237,7 +237,7 @@ msgid "Could not connect to the mirror table." msgstr "" -#: ../cnt/cnt_download.php:274 +#: ../cnt/cnt_download.php:265 msgid "Create a symlink to pgAdmin III binary." msgstr "" @@ -258,9 +258,9 @@ msgid "Debian packages" msgstr "" -#: ../cnt/cnt_download.php:41 ../cnt/cnt_download.php:157 -#: ../cnt/cnt_download.php:218 ../cnt/cnt_download.php:254 -#: ../cnt/cnt_download.php:313 +#: ../cnt/cnt_download.php:45 ../cnt/cnt_download.php:82 +#: ../cnt/cnt_download.php:148 ../cnt/cnt_download.php:209 +#: ../cnt/cnt_download.php:245 ../cnt/cnt_download.php:304 msgid "Description" msgstr "" @@ -292,7 +292,7 @@ msgid "Domains" msgstr "" -#: ../cnt/cnt_download.php:325 +#: ../cnt/cnt_download.php:316 msgid "Double-click on the installer and follow the instructions." msgstr "" @@ -308,29 +308,29 @@ msgid "Download Translation" msgstr "" -#: ../cnt/cnt_download.php:10 ../cnt/cnt_download.php:474 +#: ../cnt/cnt_download.php:10 ../cnt/cnt_download.php:465 msgid "Download mirrors" msgstr "" -#: ../cnt/cnt_download.php:358 +#: ../cnt/cnt_download.php:349 msgid "Download our supported wxWindows 2.5 CVS version." msgstr "" -#: ../cnt/cnt_download.php:209 ../cnt/cnt_download.php:245 -#: ../cnt/cnt_download.php:304 +#: ../cnt/cnt_download.php:200 ../cnt/cnt_download.php:236 +#: ../cnt/cnt_download.php:295 #, c-format msgid "Download pgAdmin III package from our mirrors." msgstr "" -#: ../cnt/cnt_download.php:457 +#: ../cnt/cnt_download.php:448 msgid "Download pgAdmin III snapshots here:" msgstr "" -#: ../cnt/cnt_download.php:425 +#: ../cnt/cnt_download.php:416 msgid "Download pgAdmin III source code from a mirror." msgstr "" -#: ../cnt/cnt_download.php:149 +#: ..
[pgadmin-hackers] CVS Commit by andreas: fixed empty language selection
Log Message:
---
fixed empty language selection
Tags:
REL-1_0_0_PATCHES
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.81.2.2 -> r1.81.2.3)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.81.2.2
retrieving revision 1.81.2.3
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.81.2.2 -r1.81.2.3
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -142,7 +142,6 @@
locale.AddCatalog(wxT("pgadmin3"));
}
-#if 0 // old language selection on first app start
long langCount=0;
const wxLanguageInfo *langInfo;
int langNo;
@@ -184,6 +183,7 @@
}
}
+#if 0 // old language selection on first app start
wxLanguage langId = (wxLanguage)settings->Read(wxT("LanguageId"),
wxLANGUAGE_UNKNOWN);
if (langId == wxLANGUAGE_UNKNOWN)
---(end of broadcast)---
TIP 2: you can get off all lists at once with the unregister command
(send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])
[pgadmin-hackers] CVS Commit by andreas: fixed empty language selection
Log Message:
---
fixed empty language selection
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.94 -> r1.95)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.94 -r1.95
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -182,7 +182,6 @@
}
-#if 0 // old language selection on first app start
long langCount=0;
const wxLanguageInfo *langInfo;
int langNo;
@@ -224,6 +223,7 @@
}
}
+#if 0 // old language selection on first app start
wxLanguage langId = (wxLanguage)settings->Read(wxT("LanguageId"),
wxLANGUAGE_UNKNOWN);
if (langId == wxLANGUAGE_UNKNOWN)
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: Automatic selection of output tab when running
Log Message:
---
Automatic selection of output tab when running
Modified Files:
--
pgadmin3/src/ui:
frmMaintenance.cpp (r1.7 -> r1.8)
Index: frmMaintenance.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMaintenance.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ui/frmMaintenance.cpp -Lsrc/ui/frmMaintenance.cpp -u -w -r1.7 -r1.8
--- src/ui/frmMaintenance.cpp
+++ src/ui/frmMaintenance.cpp
@@ -32,6 +32,7 @@
EVT_CLOSE( frmMaintenance::OnClose)
END_EVENT_TABLE()
+#define nbNotebook CTRL_NOTEBOOK("nbNotebook")
#define rbxAction CTRL_RADIOBOX("rbxAction")
#define sbxOptions CTRL_STATICBOX("sbxOptions")
#define chkFull CTRL_CHECKBOX("chkFull")
@@ -197,6 +198,8 @@
wxLongLong startTime=wxGetLocalTimeMillis();
thread->Run();
+nbNotebook->SetSelection(1);
+
while (thread && thread->IsRunning())
{
wxUsleep(10);
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by jmpoure: Typo
Log Message: --- Typo Modified Files: -- pgadmin3/src/ui/fr_FR: pgadmin3.mo (r1.43 -> r1.44) pgadmin3.po (r1.51 -> r1.52) Index: pgadmin3.po === RCS file: /projects/pgadmin3/src/ui/fr_FR/pgadmin3.po,v retrieving revision 1.51 retrieving revision 1.52 diff -Lsrc/ui/fr_FR/pgadmin3.po -Lsrc/ui/fr_FR/pgadmin3.po -u -w -r1.51 -r1.52 --- src/ui/fr_FR/pgadmin3.po +++ src/ui/fr_FR/pgadmin3.po @@ -1,18 +1,19 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# pgAdmin translation of pgAdmin3. +# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR. +# Jean-Michel Pouré <[EMAIL PROTECTED]>, 2004. # msgid "" msgstr "" "Project-Id-Version: pgAdmin3\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2003-09-09 16:16+0200\n" -"PO-Revision-Date: 2003-10-27 11:15+0100\n" +"PO-Revision-Date: 2004-04-05 15:01+0200\n" "Last-Translator: Jean-Michel Pouré <[EMAIL PROTECTED]>\n" "Language-Team: pgAdmin <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" #: src/ui/frmMaintenance.cpp:221 msgid "" @@ -3664,7 +3665,7 @@ #: src/ui/frmQuery.cpp:825 #, c-format msgid "Query returned successfully with no result in %s ms." -msgstr "La requête a été exécutée en %s ms, mais ne retourne aucun résultat." +msgstr "La requête a été exécutée en %s ms, mais ne renvoie aucun résultat." # standard #: src/ui/frmMain.cpp:221 ---(end of broadcast)--- TIP 2: you can get off all lists at once with the unregister command (send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])
[pgadmin-hackers] CVS Commit by jmpoure: Adding MacShareware which contacted us to
Log Message: --- Adding MacShareware which contacted us to register pgAdmin in the Win32 section. Modified Files: -- www/pgadmin3/cnt: cnt_advocacy.php (r1.201 -> r1.202) Index: cnt_advocacy.php === RCS file: /projects/www/pgadmin3/cnt/cnt_advocacy.php,v retrieving revision 1.201 retrieving revision 1.202 diff -Lpgadmin3/cnt/cnt_advocacy.php -Lpgadmin3/cnt/cnt_advocacy.php -u -w -r1.201 -r1.202 --- pgadmin3/cnt/cnt_advocacy.php +++ pgadmin3/cnt/cnt_advocacy.php @@ -144,6 +144,7 @@ IceWalkers Linux Downloads (pending) Linux Links +Mac shareware (pending) Nonags (update pending) Pad Ring (pending) PC World Download ---(end of broadcast)--- TIP 9: the planner will ignore your desire to choose an index scan if your joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by jmpoure: Russian translation update for pgAdmin III
Log Message: --- Russian translation update for pgAdmin III Modified Files: -- pgadmin3/src/ui/ru_RU: pgadmin3.mo (r1.11 -> r1.12) pgadmin3.po (r1.11 -> r1.12) Index: pgadmin3.po === RCS file: /projects/pgadmin3/src/ui/ru_RU/pgadmin3.po,v retrieving revision 1.11 retrieving revision 1.12 diff -Lsrc/ui/ru_RU/pgadmin3.po -Lsrc/ui/ru_RU/pgadmin3.po -u -w -r1.11 -r1.12 --- src/ui/ru_RU/pgadmin3.po +++ src/ui/ru_RU/pgadmin3.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgAdmin3\n" "POT-Creation-Date: 2003-07-09 01:27+0200\n" -"PO-Revision-Date: 2003-09-15 10:25+0100\n" -"Last-Translator: Jean-Michel POURE <[EMAIL PROTECTED]>\n" +"PO-Revision-Date: 2004-04-11 20:29-0500\n" +"Last-Translator: Serguei A. Mokhov <[EMAIL PROTECTED]>\n" "Language-Team: pgAdmin Developers <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -3572,7 +3572,7 @@ #: src/schema/pgIndex.cpp:198 #: src/schema/pgIndexConstraint.cpp:96 msgid "Primary?" -msgstr "Ключевой?" +msgstr "Первичный?" #: src/ui/dlgProperty.cpp:894 #: src/ui/dlgProperty.cpp:897 @@ -4314,7 +4314,7 @@ #: src/ui/frmMain.cpp:140 msgid "Start the query builder." -msgstr "Запустить конструктор запросов" +msgstr "Запустить конструктор запросов." # standard input:7 # standard ---(end of broadcast)--- TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: column type change dependency problem
Log Message: --- column type change dependency problem Modified Files: -- pgadmin3: BUGS.txt (r1.44 -> r1.45) Index: BUGS.txt === RCS file: /projects/pgadmin3/BUGS.txt,v retrieving revision 1.44 retrieving revision 1.45 diff -LBUGS.txt -LBUGS.txt -u -w -r1.44 -r1.45 --- BUGS.txt +++ BUGS.txt @@ -1,6 +1,7 @@ Known issues +[Object Tree/Columns]check for dependencies on column type change, FAQ for older versions [Object Tree] missing schema for function return type if table type (are there more cases?) [gtk] cursor problem with wxSTC (disappears every second focus change) [Query Builder] Menu item 'Query Browser' causes Segfault under unix - crash after qbForm->Show() in frmQueryBuilder::OnSize() at layout.LayoutMDIFrame(this). QB currently disabled. ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by dpage: Generate function SQL correctly when the return
Log Message:
---
Generate function SQL correctly when the return type needs a schema specification
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.98 -> r1.99)
pgadmin3/pkg/win32:
pgadmin3.wsi (r1.14 -> r1.15)
pgadmin3/src/include:
frmQuery.h (r1.20 -> r1.21)
pgadmin3/src/schema:
pgFunction.cpp (r1.33 -> r1.34)
pgadmin3/src/ui:
frmQuery.cpp (r1.65 -> r1.66)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.98
retrieving revision 1.99
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.98 -r1.99
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-05-10 DPGenerate function SQL correctly when the return type
needs a schema specification
2004-05-04 DPPrevent duplication of functional indexes
2004-03-30 AP *** no initial language selection (using system default)
2004-03-25 AP *** Allow initial selection of language "Default"
Index: frmQuery.h
===
RCS file: /projects/pgadmin3/src/include/frmQuery.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/include/frmQuery.h -Lsrc/include/frmQuery.h -u -w -r1.20 -r1.21
--- src/include/frmQuery.h
+++ src/include/frmQuery.h
@@ -78,7 +78,7 @@
wxString title;
wxString lastFilename, lastDir, lastPath;
-bool changed, aborted;
+bool changed, loaded, aborted;
bool lastFileFormat;
DECLARE_EVENT_TABLE()
Index: pgFunction.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgFunction.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lsrc/schema/pgFunction.cpp -Lsrc/schema/pgFunction.cpp -u -w -r1.33 -r1.34
--- src/schema/pgFunction.cpp
+++ src/schema/pgFunction.cpp
@@ -140,9 +140,10 @@
pgFunction *function=0;
pgSet *functions = obj->GetDatabase()->ExecuteSet(
-wxT("SELECT pr.oid, pr.*, TYP.typname, lanname, pg_get_userbyid(proowner)
as funcowner, description\n")
+wxT("SELECT pr.oid, pr.*, TYP.typname, TYPNS.nspname AS typnsp, lanname,
pg_get_userbyid(proowner) as funcowner, description\n")
wxT(" FROM pg_proc pr\n")
wxT(" JOIN pg_type TYP ON TYP.oid=prorettype\n")
+wxT(" JOIN pg_namespace TYPNS ON TYPNS.oid=TYP.typnamespace\n")
wxT(" JOIN pg_language LNG ON LNG.oid=prolang\n")
wxT(" LEFT OUTER JOIN pg_description des ON des.objoid=pr.oid\n")
+ restriction +
@@ -164,7 +165,7 @@
function->iSetOwner(functions->GetVal(wxT("funcowner")));
function->iSetAcl(functions->GetVal(wxT("proacl")));
function->iSetArgCount(functions->GetLong(wxT("pronargs")));
-function->iSetReturnType(functions->GetVal(wxT("typname")));
+
function->iSetReturnType(obj->GetDatabase()->GetSchemaPrefix(functions->GetVal(wxT("typnsp")))
+ functions->GetVal(wxT("typname")));
function->iSetComment(functions->GetVal(wxT("description")));
wxString oids=functions->GetVal(wxT("proargtypes"));
function->iSetArgTypeOids(oids);
Index: frmQuery.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmQuery.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -Lsrc/ui/frmQuery.cpp -Lsrc/ui/frmQuery.cpp -u -w -r1.65 -r1.66
--- src/ui/frmQuery.cpp
+++ src/ui/frmQuery.cpp
@@ -91,6 +91,7 @@
mainForm=form;
title = _title;
conn=_conn;
+ loaded = false;
SetIcon(wxIcon(sql_xpm));
wxWindowBase::SetFont(settings->GetSystemFont());
@@ -219,9 +220,8 @@
horizontal->SplitHorizontally(sqlQuery, output, splitpos);
sqlQuery->SetText(query);
-changed = !query.IsNull() && settings->GetStickySql();
-if (changed)
-setExtendedTitle();
+ changed = false;
+
updateMenu();
queryMenu->Enable(MNU_SAVEHISTORY, false);
queryMenu->Enable(MNU_CLEARHISTORY, false);
@@ -333,6 +333,7 @@
{
Show(TRUE);
sqlQuery->SetFocus();
+ loaded = true;
}
@@ -545,6 +546,7 @@
void frmQuery::setExtendedTitle()
{
wxString chgStr;
+
if (changed)
chgStr = wxT(" *");
@@ -621,6 +623,9 @@
void frmQuery::OnChangeStc(wxStyledTextEvent& event)
{
+ if (!loaded)
+ return;
+
if (!changed)
{
changed=true;
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by dpage: Rollback unintentional commit.
Log Message:
---
Rollback unintentional commit.
Modified Files:
--
pgadmin3/src/ui:
frmQuery.cpp (r1.66 -> r1.67)
Index: frmQuery.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmQuery.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -Lsrc/ui/frmQuery.cpp -Lsrc/ui/frmQuery.cpp -u -w -r1.66 -r1.67
--- src/ui/frmQuery.cpp
+++ src/ui/frmQuery.cpp
@@ -91,7 +91,6 @@
mainForm=form;
title = _title;
conn=_conn;
- loaded = false;
SetIcon(wxIcon(sql_xpm));
wxWindowBase::SetFont(settings->GetSystemFont());
@@ -220,8 +219,9 @@
horizontal->SplitHorizontally(sqlQuery, output, splitpos);
sqlQuery->SetText(query);
- changed = false;
-
+changed = !query.IsNull() && settings->GetStickySql();
+if (changed)
+setExtendedTitle();
updateMenu();
queryMenu->Enable(MNU_SAVEHISTORY, false);
queryMenu->Enable(MNU_CLEARHISTORY, false);
@@ -333,7 +333,6 @@
{
Show(TRUE);
sqlQuery->SetFocus();
- loaded = true;
}
@@ -546,7 +545,6 @@
void frmQuery::setExtendedTitle()
{
wxString chgStr;
-
if (changed)
chgStr = wxT(" *");
@@ -623,9 +621,6 @@
void frmQuery::OnChangeStc(wxStyledTextEvent& event)
{
- if (!loaded)
- return;
-
if (!changed)
{
changed=true;
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by dpage: Rollback unintentional commit.
Log Message: --- Rollback unintentional commit. Modified Files: -- pgadmin3/src/include: frmQuery.h (r1.21 -> r1.22) Index: frmQuery.h === RCS file: /projects/pgadmin3/src/include/frmQuery.h,v retrieving revision 1.21 retrieving revision 1.22 diff -Lsrc/include/frmQuery.h -Lsrc/include/frmQuery.h -u -w -r1.21 -r1.22 --- src/include/frmQuery.h +++ src/include/frmQuery.h @@ -78,7 +78,7 @@ wxString title; wxString lastFilename, lastDir, lastPath; -bool changed, loaded, aborted; +bool changed, aborted; bool lastFileFormat; DECLARE_EVENT_TABLE() ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by dpage: Prevent duplication of functional indexes
Log Message:
---
Prevent duplication of functional indexes
Modified Files:
--
pgadmin3/src/schema:
pgIndex.cpp (r1.29 -> r1.30)
Index: pgIndex.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgIndex.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lsrc/schema/pgIndex.cpp -Lsrc/schema/pgIndex.cpp -u -w -r1.29 -r1.30
--- src/schema/pgIndex.cpp
+++ src/schema/pgIndex.cpp
@@ -237,7 +237,7 @@
wxT(" LEFT OUTER JOIN pg_namespace pn ON
pn.oid=pr.pronamespace\n");
}
pgSet *indexes= collection->GetDatabase()->ExecuteSet(
-wxT("SELECT cls.oid, cls.relname as idxname, indrelid, indkey,
indisclustered, indisunique, indisprimary, n.nspname,\n")
+wxT("SELECT DISTINCT ON(cls.oid) cls.oid, cls.relname as idxname, indrelid,
indkey, indisclustered, indisunique, indisprimary, n.nspname,\n")
wxT(" ") + proname + wxT("tab.relname as tabname, indclass, CASE
contype WHEN 'p' THEN desp.description ELSE des.description END AS description,\n")
wxT(" pg_get_expr(indpred, indrelid") +
collection->GetDatabase()->GetPrettyOption() + wxT(") as indconstraint, contype,
condeferrable, condeferred, amname\n")
wxT(" FROM pg_index idx\n")
@@ -252,7 +252,7 @@
wxT(" LEFT OUTER JOIN pg_description desp ON (desp.objoid=con.oid AND
desp.objsubid = 0)\n")
wxT(" WHERE indrelid = ") + collection->GetOidStr()
+ restriction + wxT("\n")
-wxT(" ORDER BY cls.relname"));
+wxT(" ORDER BY cls.oid, cls.relname"));
if (indexes)
{
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by dpage: Prevent duplication of functional indexes
Log Message: --- Prevent duplication of functional indexes Modified Files: -- pgadmin3: CHANGELOG.txt (r1.97 -> r1.98) Index: CHANGELOG.txt === RCS file: /projects/pgadmin3/CHANGELOG.txt,v retrieving revision 1.97 retrieving revision 1.98 diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.97 -r1.98 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -16,6 +16,7 @@ +2004-05-04 DPPrevent duplication of functional indexes 2004-03-30 AP *** no initial language selection (using system default) 2004-03-25 AP *** Allow initial selection of language "Default" 2004-03-24 APchanged font handling to accept exotic weights ---(end of broadcast)--- TIP 5: Have you checked our extensive FAQ? http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by dpage: Fix the sorting of index names I broke earlier.
Log Message:
---
Fix the sorting of index names I broke earlier.
Modified Files:
--
pgadmin3/src/schema:
pgIndex.cpp (r1.30 -> r1.31)
Index: pgIndex.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgIndex.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lsrc/schema/pgIndex.cpp -Lsrc/schema/pgIndex.cpp -u -w -r1.30 -r1.31
--- src/schema/pgIndex.cpp
+++ src/schema/pgIndex.cpp
@@ -237,7 +237,7 @@
wxT(" LEFT OUTER JOIN pg_namespace pn ON
pn.oid=pr.pronamespace\n");
}
pgSet *indexes= collection->GetDatabase()->ExecuteSet(
-wxT("SELECT DISTINCT ON(cls.oid) cls.oid, cls.relname as idxname, indrelid,
indkey, indisclustered, indisunique, indisprimary, n.nspname,\n")
+wxT("SELECT DISTINCT ON(cls.relname) cls.oid, cls.relname as idxname,
indrelid, indkey, indisclustered, indisunique, indisprimary, n.nspname,\n")
wxT(" ") + proname + wxT("tab.relname as tabname, indclass, CASE
contype WHEN 'p' THEN desp.description ELSE des.description END AS description,\n")
wxT(" pg_get_expr(indpred, indrelid") +
collection->GetDatabase()->GetPrettyOption() + wxT(") as indconstraint, contype,
condeferrable, condeferred, amname\n")
wxT(" FROM pg_index idx\n")
@@ -252,7 +252,7 @@
wxT(" LEFT OUTER JOIN pg_description desp ON (desp.objoid=con.oid AND
desp.objsubid = 0)\n")
wxT(" WHERE indrelid = ") + collection->GetOidStr()
+ restriction + wxT("\n")
-wxT(" ORDER BY cls.oid, cls.relname"));
+wxT(" ORDER BY cls.relname"));
if (indexes)
{
---(end of broadcast)---
TIP 6: Have you searched our list archives?
http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by dpage: Added todo for creating pg doc htmlhelp files
Log Message: --- Added todo for creating pg doc htmlhelp files automatically. Modified Files: -- pgadmin3: TODO.txt (r1.88 -> r1.89) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.88 retrieving revision 1.89 diff -LTODO.txt -LTODO.txt -u -w -r1.88 -r1.89 --- TODO.txt +++ TODO.txt @@ -28,6 +28,7 @@ EditGrid: try to show freshly inserted row with 'serial' pk Allow table/view row counting to be completely disabled (to allow treeview refreshing). Allow copying of rows from the SQL Grid. +Generate PostgreSQL document indexes using docbook (http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html";>http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html). Major Projects ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: todo update
Log Message: --- todo update Modified Files: -- pgadmin3: TODO.txt (r1.89 -> r1.90) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.89 retrieving revision 1.90 diff -LTODO.txt -LTODO.txt -u -w -r1.89 -r1.90 --- TODO.txt +++ TODO.txt @@ -29,6 +29,7 @@ Allow table/view row counting to be completely disabled (to allow treeview refreshing). Allow copying of rows from the SQL Grid. Generate PostgreSQL document indexes using docbook (http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html";>http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html). + SQL Window: Try to preserve result column width Major Projects ---(end of broadcast)--- TIP 5: Have you checked our extensive FAQ? http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: urdu
Log Message: --- urdu Modified Files: -- pgadmin3/src/ui: pgadmin3.lng (r1.41 -> r1.42) Index: pgadmin3.lng === RCS file: /projects/pgadmin3/src/ui/pgadmin3.lng,v retrieving revision 1.41 retrieving revision 1.42 diff -Lsrc/ui/pgadmin3.lng -Lsrc/ui/pgadmin3.lng -u -w -r1.41 -r1.42 --- src/ui/pgadmin3.lng +++ src/ui/pgadmin3.lng @@ -59,5 +59,5 @@ Telugu, Telugu Turkish, Türkçe Ukrainian, Українська -Urdu, Urdu +Urdu (Pakistan), Urdu Vietnamese, tiếng Việt ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: warn deleting superuser privilege
Log Message: --- warn deleting superuser privilege Modified Files: -- pgadmin3: TODO.txt (r1.90 -> r1.91) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.90 retrieving revision 1.91 diff -LTODO.txt -LTODO.txt -u -w -r1.90 -r1.91 --- TODO.txt +++ TODO.txt @@ -9,6 +9,7 @@ Enhancements + warn when deleting superuser privilege Display server log Keyboard navigation (wx issue) function property: show line number ---(end of broadcast)--- TIP 2: you can get off all lists at once with the unregister command (send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])
[pgadmin-hackers] CVS Commit by dpage: Added STC find bug.
Log Message: --- Added STC find bug. Modified Files: -- pgadmin3: BUGS.txt (r1.45 -> r1.46) Index: BUGS.txt === RCS file: /projects/pgadmin3/BUGS.txt,v retrieving revision 1.45 retrieving revision 1.46 diff -LBUGS.txt -LBUGS.txt -u -w -r1.45 -r1.46 --- BUGS.txt +++ BUGS.txt @@ -19,6 +19,7 @@ [Main listview] Background behind the tabs doesn't redraw on Win XP and 2003. [Edit Grid] several platform-dependent misbehaviours when starting editing a cell (F2 or any key): waiting for new wxGrid implementation +[ctlSQLBox] STC hangs when searching (ctrl-F) for (non-existing?) strings Known issues, but might stay unfixed ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: line numbers in function definition
Log Message: --- line numbers in function definition Modified Files: -- pgadmin3/src/ui: dlgFunction.cpp (r1.26 -> r1.27) Index: dlgFunction.cpp === RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.26 -r1.27 --- src/ui/dlgFunction.cpp +++ src/ui/dlgFunction.cpp @@ -84,6 +84,9 @@ btnAdd->Disable(); btnRemove->Disable(); +txtSqlBox->SetMarginType(1, wxSTC_MARGIN_NUMBER); +txtSqlBox->SetMarginWidth(1, ConvertDialogToPixels(wxPoint(16, 0)).x); + libcSizer = stObjectFile->GetContainingSizer(); } ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: some cleanups
Log Message:
---
some cleanups
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.99 -> r1.100)
TODO.txt (r1.91 -> r1.92)
pgadmin3/src/ui:
ctlSQLBox.cpp (r1.22 -> r1.23)
dlgEditGridOptions.cpp (r1.14 -> r1.15)
frmMain.cpp (r1.86 -> r1.87)
frmQuery.cpp (r1.67 -> r1.68)
pgadmin3/src/include:
frmMain.h (r1.40 -> r1.41)
misc.h (r1.36 -> r1.37)
pgServer.h (r1.28 -> r1.29)
pgSet.h (r1.27 -> r1.28)
pgadmin3/src/utils:
misc.cpp (r1.47 -> r1.48)
pgadmin3/src:
pgAdmin3.dsp (r1.97 -> r1.98)
pgadmin3/src/schema:
pgObject.cpp (r1.61 -> r1.62)
pgServer.cpp (r1.39 -> r1.40)
pgadmin3/src/db:
pgSet.cpp (r1.42 -> r1.43)
Index: TODO.txt
===
RCS file: /projects/pgadmin3/TODO.txt,v
retrieving revision 1.91
retrieving revision 1.92
diff -LTODO.txt -LTODO.txt -u -w -r1.91 -r1.92
--- TODO.txt
+++ TODO.txt
@@ -9,7 +9,6 @@
Enhancements
- warn when deleting superuser privilege
Display server log
Keyboard navigation (wx issue)
function property: show line number
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.99
retrieving revision 1.100
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.99 -r1.100
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-05-26 APwarn when deleting superuser privilege
2004-05-10 DPGenerate function SQL correctly when the return type
needs a schema specification
2004-05-04 DPPrevent duplication of functional indexes
2004-03-30 AP *** no initial language selection (using system default)
Index: ctlSQLBox.cpp
===
RCS file: /projects/pgadmin3/src/ui/ctlSQLBox.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/ui/ctlSQLBox.cpp -Lsrc/ui/ctlSQLBox.cpp -u -w -r1.22 -r1.23
--- src/ui/ctlSQLBox.cpp
+++ src/ui/ctlSQLBox.cpp
@@ -346,6 +346,8 @@
StyleSetFont(10, fntSQLBox);
StyleSetFont(11, fntSQLBox);
+SetMarginWidth(1, 0);
+
// Setup the different highlight colurs
StyleSetForeground(0, wxColour(0x80, 0x80, 0x80));
Index: dlgEditGridOptions.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgEditGridOptions.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ui/dlgEditGridOptions.cpp -Lsrc/ui/dlgEditGridOptions.cpp -u -w -r1.14
-r1.15
--- src/ui/dlgEditGridOptions.cpp
+++ src/ui/dlgEditGridOptions.cpp
@@ -268,10 +268,11 @@
bool dlgEditGridOptions::Validate()
{
-StartMsg(_("Validating filter string"));
+extern frmMain *winMain;
+winMain->StartMsg(_("Validating filter string"));
filter->MarkerDeleteAll(0);
if (!filter->GetText().Trim().Length()) {
-EndMsg();
+winMain->EndMsg();
return true;
}
@@ -288,7 +289,7 @@
res == PGRES_COMMAND_OK)
{
// No errors, all OK!
-EndMsg();
+winMain->EndMsg();
return true;
}
@@ -323,6 +324,6 @@
// Cleanup
PQclear(qryRes);
-EndMsg();
+winMain->EndMsg();
return false;
}
Index: frmQuery.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmQuery.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -Lsrc/ui/frmQuery.cpp -Lsrc/ui/frmQuery.cpp -u -w -r1.67 -r1.68
--- src/ui/frmQuery.cpp
+++ src/ui/frmQuery.cpp
@@ -201,6 +201,7 @@
horizontal->SetMinimumPaneSize(50);
sqlQuery = new ctlSQLBox(horizontal, CTL_SQLQUERY, wxDefaultPosition,
wxDefaultSize, wxTE_MULTILINE | wxSIMPLE_BORDER | wxTE_RICH2);
+sqlQuery->SetMarginWidth(1, 16);
output = new wxNotebook(horizontal, -1, wxDefaultPosition, wxDefaultSize,
wxNB_BOTTOM);
sqlResult = new ctlSQLResult(output, conn, CTL_SQLRESULT, wxDefaultPosition,
wxDefaultSize);
@@ -672,7 +673,8 @@
}
wxFileDialog dlg(this, _("Open query file"), lastDir, wxT(""),
-_("Query files (*.sql)|*.sql|UTF-8 query files (*.usql)|*.usql|All files
(*.*)|*.*"), wxOPEN|wxHIDE_READONLY);
+_("Query files (*.sql)|*.sql|UTF-8 query files (*.usql)|*.usql|All files
(*.*)|*.*"), wxOPEN);
+//_("Query files (*.sql)|*.sql|UTF-8 query files (*.usql)|*.usql|All files
(*.*)|*.*"), wxOPEN|wxHIDE_READONLY);
if (dlg.ShowModal() == wxID_OK)
{
lastFilename=dlg.GetFilename();
Index: frmMain.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.86 -r1.87
--- src/ui/frmMain.cpp
+++ src/ui/
[pgadmin-hackers] CVS Commit by andreas: preliminary connection interrupt code
Log Message:
---
preliminary connection interrupt code
Modified Files:
--
pgadmin3/src/db:
pgConn.cpp (r1.45 -> r1.46)
pgadmin3/src/include:
pgConn.h (r1.22 -> r1.23)
pgDatabase.h (r1.31 -> r1.32)
pgadmin3/src/schema:
pgDatabase.cpp (r1.51 -> r1.52)
Index: pgConn.cpp
===
RCS file: /projects/pgadmin3/src/db/pgConn.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lsrc/db/pgConn.cpp -Lsrc/db/pgConn.cpp -u -w -r1.45 -r1.46
--- src/db/pgConn.cpp
+++ src/db/pgConn.cpp
@@ -191,7 +191,7 @@
bool pgConn::IsSSLconnected()
{
-return (PQstatus(conn) == CONNECTION_OK && PQgetssl(conn) != NULL);
+return (conn && PQstatus(conn) == CONNECTION_OK && PQgetssl(conn) != NULL);
}
#endif
@@ -225,6 +225,9 @@
bool pgConn::ExecuteVoid(const wxString& sql)
{
+if (GetStatus() != PGCONN_OK)
+return false;
+
// Execute the query and get the status.
PGresult *qryRes;
@@ -236,7 +239,7 @@
if (res != PGRES_TUPLES_OK &&
res != PGRES_COMMAND_OK)
{
-wxLogError(wxT("%s"), wxString(PQerrorMessage(conn), *conv).c_str());
+LogError();
}
// Cleanup & exit
@@ -258,6 +261,10 @@
wxString pgConn::ExecuteScalar(const wxString& sql)
{
+wxString result;
+
+if (GetStatus() == PGCONN_OK)
+{
// Execute the query and get the status.
PGresult *qryRes;
wxLogSql(wxT("Scalar query (%s:%d): %s"), this->GetHost().c_str(),
this->GetPort(), sql.c_str());
@@ -266,7 +273,7 @@
// Check for errors
if (PQresultStatus(qryRes) != PGRES_TUPLES_OK)
{
-wxLogError(wxT("%s"), wxString(PQerrorMessage(conn), *conv).c_str());
+LogError();
PQclear(qryRes);
return wxEmptyString;
}
@@ -280,19 +287,22 @@
}
// Retrieve the query result and return it.
-wxString result;
result=wxString(PQgetvalue(qryRes, 0, 0), *conv);
wxLogSql(wxT("Query result: %s"), result.c_str());
// Cleanup & exit
PQclear(qryRes);
+}
+
return result;
}
pgSet *pgConn::ExecuteSet(const wxString& sql)
{
// Execute the query and get the status.
+if (GetStatus() == PGCONN_OK)
+{
PGresult *qryRes;
wxLogSql(wxT("Set query (%s:%d): %s"), this->GetHost().c_str(), this->GetPort(),
sql.c_str());
qryRes = PQexec(conn, sql.mb_str(*conv));
@@ -301,7 +311,7 @@
if (status == PGRES_TUPLES_OK || status == PGRES_COMMAND_OK)
{
-pgSet *set = new pgSet(qryRes, conn, *conv, needColQuoting);
+pgSet *set = new pgSet(qryRes, this, *conv, needColQuoting);
if (!set)
{
wxLogError(__("Couldn't create a pgSet object!"));
@@ -311,10 +321,10 @@
}
else
{
-wxLogError(wxT("%s"), wxString(PQerrorMessage(conn), *conv).c_str());
+LogError();
PQclear(qryRes);
}
-
+}
return 0;
}
@@ -322,13 +332,32 @@
// Info
//
+
+void pgConn::LogError()
+{
+if (conn)
+{
+wxLogError(wxT("%s"), wxString(PQerrorMessage(conn), *conv).c_str());
+
+ConnStatusType status = PQstatus(conn);
+if (status == CONNECTION_BAD)
+{
+PQfinish(conn);
+conn=0;
+}
+}
+}
+
+
int pgConn::GetStatus() const
{
-if(resolvedIP) {
- return PQstatus(conn);
-} else {
+if(!resolvedIP)
return PGCONN_DNSERR;
-}
+
+if (!conn)
+return PGCONN_BAD;
+else
+return PQstatus(conn);
}
Index: pgConn.h
===
RCS file: /projects/pgadmin3/src/include/pgConn.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/include/pgConn.h -Lsrc/include/pgConn.h -u -w -r1.22 -r1.23
--- src/include/pgConn.h
+++ src/include/pgConn.h
@@ -69,6 +69,9 @@
bool BackendMinimumVersion(int major, int minor);
void RegisterNoticeProcessor(PQnoticeProcessor proc, void *arg);
wxString SystemNamespaceRestriction(const wxString &nsp);
+
+void LogError();
+
#ifdef SSL
bool IsSSLconnected();
#endif
Index: pgDatabase.h
===
RCS file: /projects/pgadmin3/src/include/pgDatabase.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/include/pgDatabase.h -Lsrc/include/pgDatabase.h -u -w -r1.31 -r1.32
--- src/include/pgDatabase.h
+++ src/include/pgDatabase.h
@@ -36,9 +36,9 @@
static pgObject *ReadObjects(pgCollection *collection, wxTreeCtrl *browser, const
wxString &restriction=wxT(""));
static void ShowStatistics(pgCollection *collection, ctlListView *statistics);
-pgSet *ExecuteSet(const wxString& sql) { return conn->ExecuteSet(sql); }
-wxString ExecuteScalar(const wxString& sql) { return conn->ExecuteScalar(
[pgadmin-hackers] CVS Commit by andreas: warn superuser deletion
Log Message:
---
warn superuser deletion
Modified Files:
--
pgadmin3/src/ui:
dlgUser.cpp (r1.24 -> r1.25)
pgadmin3/src/include:
dlgUser.h (r1.10 -> r1.11)
pgadmin3/src/schema:
pgUser.cpp (r1.31 -> r1.32)
Index: dlgUser.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgUser.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/ui/dlgUser.cpp -Lsrc/ui/dlgUser.cpp -u -w -r1.24 -r1.25
--- src/ui/dlgUser.cpp
+++ src/ui/dlgUser.cpp
@@ -53,7 +53,7 @@
EVT_LISTBOX_DCLICK(XRCID("lbGroupsIn"), dlgUser::OnGroupRemove)
EVT_TEXT(XRCID("txtPasswd"),dlgUser::OnChange)
EVT_CHECKBOX(XRCID("chkCreateDB"), dlgUser::OnChange)
-EVT_CHECKBOX(XRCID("chkCreateUser"),dlgUser::OnChange)
+EVT_CHECKBOX(XRCID("chkCreateUser"),dlgUser::OnChangeSuperuser)
EVT_BUTTON(XRCID("btnAddGroup"),dlgUser::OnGroupAdd)
EVT_BUTTON(XRCID("btnDelGroup"),dlgUser::OnGroupRemove)
@@ -184,6 +184,24 @@
}
+void dlgUser::OnChangeSuperuser(wxCommandEvent &ev)
+{
+if (user && user->GetSuperuser() && !chkCreateUser->GetValue())
+{
+wxMessageDialog dlg(this,
+_("Deleting a superuser might result in unwanted behaviour (e.g. when
restoring the database).\nAre you sure?"),
+_("Confirm superuser deletion"),
+ wxICON_EXCLAMATION | wxYES_NO |wxNO_DEFAULT);
+if (dlg.ShowModal() != wxID_YES)
+{
+chkCreateUser->SetValue(true);
+return;
+}
+}
+OnChange(ev);
+}
+
+
void dlgUser::OnChange(wxCommandEvent &ev)
{
bool timEn=datValidUntil->GetDate().IsValid();
Index: dlgUser.h
===
RCS file: /projects/pgadmin3/src/include/dlgUser.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/include/dlgUser.h -Lsrc/include/dlgUser.h -u -w -r1.10 -r1.11
--- src/include/dlgUser.h
+++ src/include/dlgUser.h
@@ -34,6 +34,7 @@
wxArrayString varInfo;
void OnChange(wxCommandEvent &ev);
+void OnChangeSuperuser(wxCommandEvent &ev);
void OnChangeSpin(wxSpinEvent &ev);
void OnChangeCal(wxCalendarEvent &ev);
void OnGroupAdd(wxCommandEvent &ev);
Index: pgUser.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgUser.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/schema/pgUser.cpp -Lsrc/schema/pgUser.cpp -u -w -r1.31 -r1.32
--- src/schema/pgUser.cpp
+++ src/schema/pgUser.cpp
@@ -35,6 +35,15 @@
bool pgUser::DropObject(wxFrame *frame, wxTreeCtrl *browser)
{
+if (GetUpdateCatalog())
+{
+wxMessageDialog dlg(frame,
+_("Deleting a superuser might result in unwanted behaviour (e.g. when
restoring the database).\nAre you sure?"),
+_("Confirm superuser deletion"),
+ wxICON_EXCLAMATION | wxYES_NO |wxNO_DEFAULT);
+if (dlg.ShowModal() != wxID_YES)
+return false;
+}
return server->ExecuteVoid(wxT("DROP USER ") + GetQuotedFullIdentifier() +
wxT(";"));
}
---(end of broadcast)---
TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: xrc updates
Log Message:
---
xrc updates
Modified Files:
--
pgadmin3/src/ui/common:
dlgFunction.xrc (r1.10 -> r1.11)
dlgUser.xrc (r1.10 -> r1.11)
xrcDialogs.cpp (r1.19 -> r1.20)
Index: dlgFunction.xrc
===
RCS file: /projects/pgadmin3/src/ui/common/dlgFunction.xrc,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/common/dlgFunction.xrc -Lsrc/ui/common/dlgFunction.xrc -u -w -r1.10
-r1.11
--- src/ui/common/dlgFunction.xrc
+++ src/ui/common/dlgFunction.xrc
@@ -161,7 +161,7 @@
70,80d
-136,120d
+136,-1d
wxCB_READONLY|wxCB_DROPDOWN
wxTOP|wxBOTTOM|wxRIGHT
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.19 -r1.20
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -1622,7 +1622,7 @@
47,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,
117,114,99,101,62,10};
-static size_t xml_res_size_9 = 12061;
+static size_t xml_res_size_9 = 12060;
static unsigned char xml_res_file_9[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -1938,13 +1938,13 @@
32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
32,60,112,111,115,62,55,48,44,56,48,100,60,47,112,111,115,62,10,32,32,32,
32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,60,115,105,122,101,62,49,51,54,44,49,50,48,100,60,47,115,105,122,101,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,67,66,95,82,69,65,68,
-79,78,76,89,124,119,120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,
-121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,
+32,60,115,105,122,101,62,49,51,54,44,45,49,100,60,47,115,105,122,101,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,60,115,116,121,108,101,62,119,120,67,66,95,82,69,65,68,79,
+78,76,89,124,119,120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,121,
+108,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,
97,103,62,119,120,84,79,80,124,119,120,66,79,84,84,79,77,124,119,120,82,
73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,
32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,
@@ -5170,7 +5170,7 @@
47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,
10};
-static size_t xml_res_size_24 = 5498;
+static size_t xml_res_size_24 = 5505;
static unsigned char xml_res_file_24[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -5264,169 +5264,169 @@
32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
120,67,104,101,99,107,66,111,120,34,32,110,97,109,101,61,34,99,104,107,
67,114,101,97,116,101,85,115,101,114,34,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,108,97,98,101,108,62,85,115,101,114,32,99,97,110,32,99,114,
-101,97,116,101,32,117,115,101,114,115,60,47,108,97,98,101,108,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,49,54,44,57,49,100,60,
-47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,
-101,62,49,54,54,44,49,50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,
+32,32,32,60,108,97,98,101,108,62,83,117,112,101,114,117,115,101,114,32,
+40,99,97,110,32,99,114,101,97,116,101,32,117,115,101,114,115,41,60,47,108,
+97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,49,54,44,57,49,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,115,105,122,101,62,49,54,54,44,49,50,100,60,47,115,105,122,
+101,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
+10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
+32,32,32,32,60,115,101,108,101,99,116,101,100,62,49,60,47,115,101,108,101,
+99,116,101,100,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,
+32,32,32,32,32,32,60,112,111,115,62,50,44,50,100,60,47,112,111,115,62,10,
+32,32,32,32,32,32,60,115,105,122,101,62,50,49,52,44,50,49,53,100,60,47,
+115,105,122,101,62,10,32,32,32,32,32,32,
[pgadmin-hackers] CVS Commit by andreas: fix status not cleaning old connections
Log Message:
---
fix status not cleaning old connections
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.19 -> r1.20)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.19 -r1.20
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -155,19 +155,20 @@
void frmStatus::OnRefresh(wxCommandEvent &event)
{
+long pid=0;
// To avoid hammering the lock manager (and the network for that matter),
// only query for the required tab.
- if (nbStatus->GetSelection() == 0) {
-
+ if (nbStatus->GetSelection() == 0)
+{
// Status
+ long row=0;
pgSet *dataSet1=connection->ExecuteSet(wxT("SELECT * FROM
pg_stat_activity ORDER BY procpid"));
if (dataSet1)
{
- long row=0;
while (!dataSet1->Eof())
{
- long pid=dataSet1->GetLong(wxT("procpid"));
+ pid=dataSet1->GetLong(wxT("procpid"));
if (pid != backend_pid)
{
@@ -193,8 +194,8 @@
if (connection->BackendMinimumVersion(7, 4))
{
if (qry.IsEmpty()) {
- statusList->SetItem(row, 3,
wxT(""));
- statusList->SetItem(row, 4,
wxT(""));
+ statusList->SetItem(row, 3,
wxEmptyString);
+ statusList->SetItem(row, 4,
wxEmptyString);
} else {
statusList->SetItem(row, 3,
dataSet1->GetVal(wxT("query_start")));
statusList->SetItem(row, 4,
qry.Left(250));
@@ -207,11 +208,22 @@
}
dataSet1->MoveNext();
}
- }
-
- } else {
+ }
+row=0;
+ while (row < statusList->GetItemCount())
+ {
+ long itempid=StrToLong(statusList->GetItemText(row));
+ if (itempid && itempid > pid)
+ statusList->DeleteItem(row);
+else
+row++;
+ }
+ }
+else
+{
// Locks
+ long row=0;
wxString sql;
if (connection->BackendMinimumVersion(7, 4)) {
sql = wxT("SELECT ")
@@ -235,10 +247,9 @@
pgSet *dataSet2=connection->ExecuteSet(sql);
if (dataSet2)
{
- long row=0;
while (!dataSet2->Eof())
{
- long pid=dataSet2->GetLong(wxT("pid"));
+ pid=dataSet2->GetLong(wxT("pid"));
if (pid != backend_pid)
{
@@ -272,8 +283,8 @@
if (connection->BackendMinimumVersion(7, 4))
{
if (qry.IsEmpty()) {
- lockList->SetItem(row, 7,
wxT(""));
- lockList->SetItem(row, 8,
wxT(""));
+ lockList->SetItem(row, 7,
wxEmptyString);
+ lockList->SetItem(row, 8,
wxEmptyString);
} else {
lockList->SetItem(row, 7,
dataSet2->GetVal(wxT("query_start")));
lockList->SetItem(row, 8,
qry.Left(250));
@@ -287,5 +298,14 @@
dataSet2->MoveNext();
}
}
+row=0;
+ while (row < lockList->GetItemCount())
+ {
+ long itempid=StrToLong(lockList->GetItemText(row));
+ if (itempid && itempid > pid)
+ lockList->DeleteItem(row);
+else
+row++;
+ }
}
}
---(end of broadcast)---
TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: handle server connection losses
Log Message:
---
handle server connection losses
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.100 -> r1.101)
TODO.txt (r1.92 -> r1.93)
pgadmin3/src/ui:
events.cpp (r1.88 -> r1.89)
pgadmin3/src/include:
frmMain.h (r1.41 -> r1.42)
menu.h (r1.13 -> r1.14)
pgConn.h (r1.23 -> r1.24)
pgDatabase.h (r1.32 -> r1.33)
pgServer.h (r1.29 -> r1.30)
pgadmin3/src/db:
pgConn.cpp (r1.46 -> r1.47)
pgadmin3/src/schema:
pgDatabase.cpp (r1.52 -> r1.53)
pgServer.cpp (r1.40 -> r1.41)
Index: TODO.txt
===
RCS file: /projects/pgadmin3/TODO.txt,v
retrieving revision 1.92
retrieving revision 1.93
diff -LTODO.txt -LTODO.txt -u -w -r1.92 -r1.93
--- TODO.txt
+++ TODO.txt
@@ -4,14 +4,12 @@
pgDatatype to encapsulate all typmod handling, rewrite all other
classes to use it
Use latest wxWindows snapshot when wxChmHelpController for gtk is
included
Improve database connection docs for newbies.
- Handle unexpected server disconnection cleanly.
Enhancements
Display server log
Keyboard navigation (wx issue)
- function property: show line number
EditGrid: refresh row after insert to show default values
columns of Views: show properties
Most property dlgs: check for readOnly if no sufficient rights are
available
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.100
retrieving revision 1.101
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.100 -r1.101
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,9 @@
+2004-05-28 APhandle lost connections safely
+2004-05-28 APfix server status not cleaning old connections
+2004-05-28 APline numbers in function definition property dialog
2004-05-26 APwarn when deleting superuser privilege
2004-05-10 DPGenerate function SQL correctly when the return type
needs a schema specification
2004-05-04 DPPrevent duplication of functional indexes
Index: events.cpp
===
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.88 -r1.89
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -109,6 +109,7 @@
EVT_MENU(MNU_NEW+PGA_JOB, frmMain::OnNew)
EVT_MENU(MNU_NEW+PGA_STEP, frmMain::OnNew)
EVT_MENU(MNU_NEW+PGA_SCHEDULE, frmMain::OnNew)
+EVT_MENU(MNU_CHECKALIVE,frmMain::OnCheckAlive)
EVT_MENU(MNU_CONTEXTMENU, frmMain::OnContextMenu)
EVT_NOTEBOOK_PAGE_CHANGED(CTL_NOTEBOOK, frmMain::OnPageChange)
EVT_LIST_ITEM_SELECTED(CTL_PROPVIEW,frmMain::OnPropSelChanged)
@@ -334,6 +335,87 @@
}
}
+
+void frmMain::OnCheckAlive(wxCommandEvent &event)
+{
+bool userInformed = false;
+bool closeIt;
+
+wxCookieType cookie;
+wxTreeItemId item=browser->GetFirstChild(servers, cookie);
+while (item)
+{
+pgServer *server=(pgServer*)browser->GetItemData(item);
+if (server && server->GetType() == PG_SERVER && server->connection())
+{
+if (server->connection()->IsAlive())
+{
+wxCookieType cookie2;
+item = browser->GetFirstChild(server->GetId(), cookie2);
+while (item)
+{
+pgObject *obj=(pgObject*)browser->GetItemData(item);
+if (obj && obj->GetType() == PG_DATABASES)
+{
+wxCookieType cookie3;
+item = browser->GetFirstChild(obj->GetId(), cookie3);
+while (item)
+{
+pgDatabase *db=(pgDatabase*)browser->GetItemData(item);
+if (db && db->GetType() == PG_DATABASE &&
db->GetConnected() && db->connection())
+{
+if (!db->connection()->IsAlive())
+{
+if (!userInformed)
+{
+wxMessageDialog dlg(this, _("Close database
browser? If you abort, the object browser will not show accurate data."),
+wxString::Format(_("Connection to database %s
lost."), db->GetName().c_str()),
+
wxICON_EXCLAMATION|wxYES_NO|wxYES_DEFAULT);
+
+closeIt = (dlg.ShowModal() == wxID_YES);
+
[pgadmin-hackers] CVS Commit by andreas: 7.5 stuff
Log Message:
---
7.5 stuff
Modified Files:
--
pgadmin3/src/ui/common:
xrcDialogs.cpp (r1.20 -> r1.21)
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.20 -r1.21
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -2866,7 +2866,7 @@
32,32,32,32,60,115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,
99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
-static size_t xml_res_size_14 = 2518;
+static size_t xml_res_size_14 = 2799;
static unsigned char xml_res_file_14[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -2955,18 +2955,31 @@
101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
119,120,67,66,95,82,69,65,68,79,78,76,89,124,119,120,67,66,95,68,82,79,
80,68,79,87,78,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,
-32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,
-98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,101,99,116,
-101,100,62,49,60,47,115,101,108,101,99,116,101,100,62,10,32,32,32,32,32,
-32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,115,62,
-50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,
-62,50,49,52,44,50,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,60,
-47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,32,
-99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,
-101,61,34,98,116,110,72,101,108,112,34,62,10,32,32,32,32,32,32,60,108,97,
-98,101,108,62,72,101,108,112,60,47,108,97,98,101,108,62,10,32,32,32,32,
-32,32,60,112,111,115,62,50,44,50,50,48,100,60,47,112,111,115,62,10,32,32,
-32,32,32,32,60,115,105,122,101,62,53,48,44,49,53,100,60,47,115,105,122,
+32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,
+111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,
+105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,67,111,109,109,
+101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
+108,62,67,111,109,109,101,110,116,60,47,108,97,98,101,108,62,10,32,32,32,
+32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,56,50,100,60,47,112,
+111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,
+97,115,115,61,34,119,120,84,101,120,116,67,116,114,108,34,32,110,97,109,
+101,61,34,116,120,116,67,111,109,109,101,110,116,34,62,10,32,32,32,32,32,
+32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,56,48,100,60,47,112,111,
+115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,
+51,53,44,49,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,
+32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,
+111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,101,
+99,116,101,100,62,49,60,47,115,101,108,101,99,116,101,100,62,10,32,32,32,
+32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,112,111,
+115,62,50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,
+122,101,62,50,49,52,44,50,49,53,100,60,47,115,105,122,101,62,10,32,32,32,
+32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,111,98,106,101,99,116,
+32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,
+109,101,61,34,98,116,110,72,101,108,112,34,62,10,32,32,32,32,32,32,60,108,
+97,98,101,108,62,72,101,108,112,60,47,108,97,98,101,108,62,10,32,32,32,
+32,32,32,60,112,111,115,62,50,44,50,50,48,100,60,47,112,111,115,62,10,32,
+32,32,32,32,32,60,115,105,122,101,62,53,48,44,49,53,100,60,47,115,105,122,
101,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,
111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,
111,110,34,32,110,97,109,101,61,34,98,116,110,79,75,34,62,10,32,32,32,32,
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: GRANT wizard
Log Message:
---
GRANT wizard
Added Files:
---
pgadmin3/src/include:
ctlSecurityPanel.h (r1.1)
dlgClasses.h (r1.1)
frmGrantWizard.h (r1.1)
pgadmin3/src/ui:
ctlSecurityPanel.cpp (r1.1)
dlgClasses.cpp (r1.1)
frmGrantWizard.cpp (r1.1)
--- /dev/null
+++ src/include/frmGrantWizard.h
@@ -0,0 +1,54 @@
+//
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID: $Id: frmGrantWizard.h,v 1.1 2004/06/06 19:42:00 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// frmGrantWizard.h - Grant Wizard Dialogue
+//
+//
+
+#ifndef FRMGRANTWIZARD_H
+#define FRMGRANTWIZARD_H
+
+// wxWindows headers
+#include
+
+
+// App headers
+#include "pgAdmin3.h"
+#include "frmMain.h"
+#include "dlgClasses.h"
+
+
+class ctlSecurityPanel;
+
+
+class frmGrantWizard : public ExecutionDialog
+{
+public:
+frmGrantWizard(frmMain *form, pgObject *_object);
+~frmGrantWizard();
+
+void Go();
+wxString GetSql();
+wxString GetHelpPage() const;
+
+private:
+
+void OnPageSelect(wxNotebookEvent& event);
+void OnCheckAll(wxCommandEvent &event);
+void OnUncheckAll(wxCommandEvent &event);
+
+void AddObjects(pgCollection *collection);
+
+wxArrayPtrVoid objectArray;
+ctlSQLBox *sqlPane;
+wxNotebook *nbNotebook;
+ctlSecurityPanel *securityPage;
+
+DECLARE_EVENT_TABLE()
+};
+
+#endif
--- /dev/null
+++ src/include/dlgClasses.h
@@ -0,0 +1,60 @@
+//
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID: $Id: dlgClasses.h,v 1.1 2004/06/06 19:42:00 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// dlgClasses.h - Some dialogue base classes
+//
+//
+
+#ifndef DLGCLASSES_H
+#define DLGCLASSES_H
+
+#include
+
+
+#define btnOK CTRL_BUTTON("btnOK")
+#define btnCancel CTRL_BUTTON("btnCancel")
+
+
+
+class frmMain;
+
+class DialogWithHelp : public wxDialog
+{
+public:
+DialogWithHelp(frmMain *frame);
+
+protected:
+frmMain *mainForm;
+void OnHelp(wxCommandEvent& ev);
+
+
+private:
+virtual wxString GetHelpPage() const = 0;
+DECLARE_EVENT_TABLE();
+};
+
+class ExecutionDialog : public DialogWithHelp
+{
+public:
+ExecutionDialog(frmMain *frame, pgObject *_object);
+virtual wxString GetSql()=0;
+
+void OnOK(wxCommandEvent& ev);
+void OnCancel(wxCommandEvent& ev);
+void OnClose(wxCloseEvent& event);
+
+void Abort();
+
+protected:
+pgObject *object;
+pgQueryThread *thread;
+wxTextCtrl *txtMessages;
+
+private:
+DECLARE_EVENT_TABLE();
+};
+#endif
--- /dev/null
+++ src/include/ctlSecurityPanel.h
@@ -0,0 +1,75 @@
+//
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID: $Id: ctlSecurityPanel.h,v 1.1 2004/06/06 19:42:00 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// ctlSecurityPanel.h - Panel with security information
+//
+//
+
+
+#ifndef CTL_SECPANEL_H
+#define CTL_SECPANEL_H
+
+#include
+#include
+
+enum
+{
+CTL_PROPSQL=250,
+CTL_MSG,
+CTL_LBPRIV,
+CTL_STATICGROUP,
+CTL_CBGROUP,
+CTL_ADDPRIV,
+CTL_DELPRIV,
+CTL_ALLPRIV,
+CTL_ALLPRIVGRANT,
+CTL_PRIVCB // base for all privilege checkboxes, must be last
+};
+
+
+class pgConn;
+
+class ctlSecurityPanel : public wxPanel
+{
+
+public:
+
+ctlSecurityPanel(wxNotebook *nb, const wxString &privList, char *privChars,
wxImageList *imgList);
+~ctlSecurityPanel();
+
+ctlListView *lbPrivileges;
+wxComboBox *cbGroups;
+wxStaticText *stGroup;
+void SetConnection(pgConn *conn) { connection=conn; }
+wxString GetGrant(const wxString &allPattern, const wxString &grantObject,
wxArrayString *currentAcl=0);
+protected:
+wxNotebook *nbNotebook;
+pgConn *connection;
+
+wxButton *btnAddPriv, *btnDelPriv;
+int privilegeCount;
+char *privilegeChars;
+wxCheckBox **privCheckboxes;
+wxCheckBox *allPrivileges, *allPrivilegesGrant;
+
+void OnPrivSelChange(wxListEvent &ev);
+void OnAddPriv(wxCommandEvent& ev);
+void OnDelPriv(wxCommandEvent& ev);
+void OnPrivCheck(wxCommandEvent& ev);
+void OnPrivCheckAll(wxCommandEvent& ev);
+void OnPrivCheckAllGrant(wxCommandEvent& ev);
+
+void CheckGrantOpt(int index);
+bool GrantAllowed() const;
+
+
+DECLARE_EVENT_TABLE();
+};
+
+
+
+#endif
\ No newline at end of file
---
[pgadmin-hackers] CVS Commit by andreas: GRANT wizard
Log Message: --- GRANT wizard Added Files: --- pgadmin3/src/ui/common: frmGrantWizard.xrc (r1.1) --- /dev/null +++ src/ui/common/frmGrantWizard.xrc @@ -0,0 +1,49 @@ + + + +Grant Wizard +200,303d +wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxSYSTEM_MENU + + +Selection + + + +2,3d +183,234d + + +Check all +2,240d +50,15d + + +Uncheck all +60,240d +50,15d + + +1 + + 2,2d + 195,276d + + + &Help + 2,285d + 50,15d + + + &OK + 1 + 93,285d + 50,15d + + + &Cancel + 146,285d + 50,15d + + + \ No newline at end of file ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: GRANT wizard
Log Message: --- GRANT wizard Modified Files: -- pgadmin3/src: Makefile.am (r1.79 -> r1.80) Index: Makefile.am === RCS file: /projects/pgadmin3/src/Makefile.am,v retrieving revision 1.79 retrieving revision 1.80 diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.79 -r1.80 --- src/Makefile.am +++ src/Makefile.am @@ -32,6 +32,8 @@ agent/pgaStep.cpp agent/pgaSchedule.cpp \ agent/dlgJob.cpp agent/dlgSchedule.cpp agent/dlgStep.cpp \ ui/xh_sqlbox.cpp ui/xh_calb.cpp ui/xh_timespin.cpp \ +ui/ctlSecurityPanel.cpp ui/dlgClasses.cpp \ +ui/frmGrantWizard.cpp \ ui/calbox.cpp ui/timespin.cpp ui/ctlListView.cpp \ ui/ctlSQLBox.cpp ui/ctlSQLResult.cpp ui/frmExport.cpp \ ui/dlgAddTableView.cpp ui/dlgEditGridOptions.cpp \ @@ -57,6 +59,7 @@ include/ctlSQLResult.h include/ctlListView.h include/dlgAddTableView.h \ include/parser/parse.h include/parser/keywords.h include/nodes/parsenodes.h \ include/postgres.h include/pgDefs.h include/pgDatatype.h \ +include/ctlSecurityPanel.h include/dlgClasses.h include/frmGrantWizard.h \ include/dlgCheck.h include/dlgColumn.h \ include/dlgDatabase.h include/dlgDomain.h include/frmExport.h \ include/dlgForeignKey.h include/dlgFunction.h include/dlgGroup.h \ ---(end of broadcast)--- TIP 2: you can get off all lists at once with the unregister command (send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])
[pgadmin-hackers] CVS Commit by andreas: gtk GRANT fixes
Log Message:
---
gtk GRANT fixes
Modified Files:
--
pgadmin3/src:
pgAdmin3.cpp (r1.95 -> r1.96)
pgadmin3/src/include:
ctlSecurityPanel.h (r1.1 -> r1.2)
pgadmin3/src/ui:
ctlSecurityPanel.cpp (r1.1 -> r1.2)
dlgProperty.cpp (r1.71 -> r1.72)
Index: pgAdmin3.cpp
===
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.95 -r1.96
Index: ctlSecurityPanel.h
===
RCS file: /projects/pgadmin3/src/include/ctlSecurityPanel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/ctlSecurityPanel.h -Lsrc/include/ctlSecurityPanel.h -u -w -r1.1
-r1.2
Index: dlgProperty.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.71 -r1.72
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -97,7 +97,7 @@
page->GetClientSize(&width, &height);
#else
nbNotebook->GetClientSize(&width, &height);
- height -= 35; // sizes of tabs
+ height -= ConvertDialogToPixels(wxPoint(0, 20)).y; // sizes of tabs
#endif
numericValidator.SetStyle(wxFILTER_NUMERIC);
Index: ctlSecurityPanel.cpp
===
RCS file: /projects/pgadmin3/src/ui/ctlSecurityPanel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/ctlSecurityPanel.cpp -Lsrc/ui/ctlSecurityPanel.cpp -u -w -r1.1 -r1.2
--- src/ui/ctlSecurityPanel.cpp
+++ src/ui/ctlSecurityPanel.cpp
@@ -47,7 +47,7 @@
: wxPanel(nb, -1, wxDefaultPosition, wxDefaultSize)
{
nbNotebook = nb;
-nbNotebook->AddPage(this, _("Security"));
+nbNotebook->AddPage(this, _("Privileges"));
connection = 0;
privilegeChars=privChars;
@@ -65,9 +65,14 @@
privCheckboxes = new wxCheckBox*[privilegeCount*2];
int i=0;
-long chkFlags=0;
int width, height;
+
+#ifdef __WIN32__
GetClientSize(&width, &height);
+#else
+ nbNotebook->GetClientSize(&width, &height);
+ height -= ConvertDialogToPixels(wxPoint(0, 20)).y; // sizes of tabs
+#endif
wxPoint zeroPos=ConvertDialogToPixels(wxPoint(5, 5));
wxSize chkSize=ConvertDialogToPixels(wxSize(65,12));
---(end of broadcast)---
TIP 6: Have you searched our list archives?
http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by andreas: fix storing of existing files (didn't truncate)
Log Message:
---
fix storing of existing files (didn't truncate)
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.102 -> r1.103)
pgadmin3/src/utils:
misc.cpp (r1.50 -> r1.51)
utffile.cpp (r1.5 -> r1.6)
pgadmin3/src/include:
utffile.h (r1.4 -> r1.5)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.102
retrieving revision 1.103
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.102 -r1.103
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,9 @@
+ 2004-06-07 APfix storing of existing files (didn't truncate)
+ 2004-06-06 APGRANT wizard
+ 2004-06-06 APALTER
AGGREGATE/FUNCTION/GROUP/LANGUAGE/SCHEMA/TRIGGER/USER RENAME TO for 7.4+
2004-06-04 APSQL Window: Try to preserve result column width
2004-06-04 AP7.5 support: comment on cast/conversion/language
2004-06-04 APchecks on column type changes
Index: utffile.cpp
===
RCS file: /projects/pgadmin3/src/utils/utffile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/utils/utffile.cpp -Lsrc/utils/utffile.cpp -u -w -r1.5 -r1.6
--- src/utils/utffile.cpp
+++ src/utils/utffile.cpp
@@ -185,6 +185,15 @@
+wxFontEncoding wxUtfFile::GetEncoding()
+{
+if (IsOpened())
+return m_encoding;
+else
+return wxFONTENCODING_DEFAULT;
+}
+
+
void wxUtfFile::WriteBOM()
{
wxFile::Seek(0);
Index: misc.cpp
===
RCS file: /projects/pgadmin3/src/utils/misc.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lsrc/utils/misc.cpp -Lsrc/utils/misc.cpp -u -w -r1.50 -r1.51
--- src/utils/misc.cpp
+++ src/utils/misc.cpp
@@ -435,17 +435,19 @@
bool FileWrite(const wxString &filename, const wxString &data, int format)
{
wxFontEncoding encoding;
+wxUtfFile file(filename);
+
if (format < 0)
+{
+encoding = file.GetEncoding();
+if (encoding == wxFONTENCODING_DEFAULT)
encoding = settings->GetUnicodeFile() ? wxFONTENCODING_UTF8 :
wxFONTENCODING_SYSTEM;
+}
else
encoding = format ? wxFONTENCODING_UTF8 : wxFONTENCODING_SYSTEM;
-wxUtfFile file;
-
-if (format < 0) // first try using the old encoding
-file.Open(filename, wxFile::read_write, wxS_DEFAULT, encoding);
-if (!file.IsOpened())
+file.Close();
file.Open(filename, wxFile::write, wxS_DEFAULT, encoding);
if (file.IsOpened())
Index: utffile.h
===
RCS file: /projects/pgadmin3/src/include/utffile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/include/utffile.h -Lsrc/include/utffile.h -u -w -r1.4 -r1.5
--- src/include/utffile.h
+++ src/include/utffile.h
@@ -28,6 +28,8 @@
bool Open(const wxChar *szFileName, OpenMode mode = read, int access =
wxS_DEFAULT, wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
void Attach(int fd, wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
+wxFontEncoding GetEncoding();
+
off_t Seek(off_t ofs, wxSeekMode mode = wxFromStart);
off_t SeekEnd(off_t ofs = 0) { return Seek(ofs, wxFromEnd); }
off_t Tell() const { return wxFile::Tell() - m_bomOffset; }
---(end of broadcast)---
TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: changed connection loss handling
Log Message: --- changed connection loss handling Modified Files: -- pgadmin3: CHANGELOG.txt (r1.103 -> r1.104) Index: CHANGELOG.txt === RCS file: /projects/pgadmin3/CHANGELOG.txt,v retrieving revision 1.103 retrieving revision 1.104 diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.103 -r1.104 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -16,6 +16,7 @@ +2004-06-07 APchanged connection loss handling 2004-06-07 APfix storing of existing files (didn't truncate) 2004-06-06 APGRANT wizard 2004-06-06 APALTER AGGREGATE/FUNCTION/GROUP/LANGUAGE/SCHEMA/TRIGGER/USER RENAME TO for 7.4+ ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: changed connection loss handling
Log Message:
---
changed connection loss handling
Modified Files:
--
pgadmin3/src/ui:
ctlSQLResult.cpp (r1.21 -> r1.22)
dlgEditGridOptions.cpp (r1.15 -> r1.16)
events.cpp (r1.90 -> r1.91)
frmMain.cpp (r1.88 -> r1.89)
pgadmin3/src/include:
frmMain.h (r1.43 -> r1.44)
pgConn.h (r1.24 -> r1.25)
pgadmin3/src/db:
pgConn.cpp (r1.47 -> r1.48)
pgSet.cpp (r1.43 -> r1.44)
pgadmin3/src/schema:
pgDatabase.cpp (r1.54 -> r1.55)
Index: ctlSQLResult.cpp
===
RCS file: /projects/pgadmin3/src/ui/ctlSQLResult.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/ctlSQLResult.cpp -Lsrc/ui/ctlSQLResult.cpp -u -w -r1.21 -r1.22
--- src/ui/ctlSQLResult.cpp
+++ src/ui/ctlSQLResult.cpp
@@ -220,8 +220,7 @@
wxString ctlSQLResult::GetErrorMessage()
{
-wxString errmsg=wxString(PQerrorMessage(conn->connection()), wxConvUTF8);
-return errmsg;
+return conn->GetLastError();
}
Index: dlgEditGridOptions.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgEditGridOptions.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/ui/dlgEditGridOptions.cpp -Lsrc/ui/dlgEditGridOptions.cpp -u -w -r1.15
-r1.16
--- src/ui/dlgEditGridOptions.cpp
+++ src/ui/dlgEditGridOptions.cpp
@@ -294,7 +294,7 @@
}
// Figure out where the error is
-wxString errMsg = wxString(PQerrorMessage(connection->connection()),
*conv).c_str();
+wxString errMsg = connection->GetLastError();
wxString atChar=wxT(" at character ");
int chp=errMsg.Find(atChar);
Index: events.cpp
===
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.90 -r1.91
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -340,81 +340,7 @@
void frmMain::OnCheckAlive(wxCommandEvent &event)
{
-bool userInformed = false;
-bool closeIt;
-
-wxCookieType cookie;
-wxTreeItemId item=browser->GetFirstChild(servers, cookie);
-while (item)
-{
-pgServer *server=(pgServer*)browser->GetItemData(item);
-if (server && server->GetType() == PG_SERVER && server->connection())
-{
-if (server->connection()->IsAlive())
-{
-wxCookieType cookie2;
-item = browser->GetFirstChild(server->GetId(), cookie2);
-while (item)
-{
-pgObject *obj=(pgObject*)browser->GetItemData(item);
-if (obj && obj->GetType() == PG_DATABASES)
-{
-wxCookieType cookie3;
-item = browser->GetFirstChild(obj->GetId(), cookie3);
-while (item)
-{
-pgDatabase *db=(pgDatabase*)browser->GetItemData(item);
-if (db && db->GetType() == PG_DATABASE &&
db->GetConnected() && db->connection())
-{
-if (!db->connection()->IsAlive())
-{
-if (!userInformed)
-{
-wxMessageDialog dlg(this, _("Close database
browser? If you abort, the object browser will not show accurate data."),
-wxString::Format(_("Connection to database %s
lost."), db->GetName().c_str()),
-
wxICON_EXCLAMATION|wxYES_NO|wxYES_DEFAULT);
-
-closeIt = (dlg.ShowModal() == wxID_YES);
-userInformed = true;
-}
-if (closeIt)
-{
-browser->DeleteChildren(db->GetId());
-browser->SetItemImage(db->GetId(),
PGICON_CLOSEDDATABASE, wxTreeItemIcon_Selected);
-browser->SetItemImage(db->GetId(),
PGICON_CLOSEDDATABASE, wxTreeItemIcon_Selected);
-db->Disconnect();
-}
-}
-}
-item = browser->GetNextChild(obj->GetId(), cookie3);
-}
-}
-item = browser->GetNextChild(server->GetId(), cookie2);
-}
-}
-else
-{
-if (!userInformed)
-{
-wxMessageDialog dlg(this, _("Close server browser? If you abort,
the object browser wil
[pgadmin-hackers] CVS Commit by andreas: gcc fix
Log Message:
---
gcc fix
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.21 -> r1.22)
pgadmin3/src/include:
frmStatus.h (r1.9 -> r1.10)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.21 -r1.22
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -27,7 +27,7 @@
#define TIMER_ID 333
BEGIN_EVENT_TABLE(frmStatus, pgDialog)
EVT_BUTTON(XRCID("btnRefresh"), frmStatus::OnRefresh)
-EVT_BUTTON (XRCID("btnClose"), frmStatus::OnClose)
+EVT_BUTTON (XRCID("btnClose"), frmStatus::OnCloseBtn)
EVT_CLOSE( frmStatus::OnClose)
EVT_SPINCTRL(XRCID("spnRefreshRate"), frmStatus::OnRateChangeSpin)
EVT_TEXT(XRCID("spnRefreshRate"), frmStatus::OnRateChange)
@@ -42,7 +42,12 @@
#define spnRefreshRate CTRL_SPIN("spnRefreshRate")
#define nbStatus CTRL_NOTEBOOK("nbStatus")
-void frmStatus::OnClose(wxCommandEvent &event)
+void frmStatus::OnCloseBtn(wxCommandEvent &event)
+{
+Destroy();
+}
+
+void frmStatus::OnClose(wxCloseEvent &event)
{
Destroy();
}
@@ -425,7 +430,7 @@
if (logHasTimestamp)
{
wxString ts=str.Mid(logFmtPos);
-int pos = ts.Mid(22).Find(logFormat[logFmtPos+2]);
+int pos = ts.Mid(22).Find(logFormat.c_str()[logFmtPos+2]);
logList->AppendItem(ts.Left(22+pos));
rest = ts.Mid(22+pos + logFormat.Length() - logFmtPos-2);
logList->SetItem(row, 1, rest.BeforeFirst(':'));
Index: frmStatus.h
===
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.9 -r1.10
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -35,7 +35,8 @@
private:
void OnHelp(wxCommandEvent& ev);
-void OnClose(wxCommandEvent &event);
+void OnCloseBtn(wxCommandEvent &event);
+void OnClose(wxCloseEvent &event);
void OnRefresh(wxCommandEvent &event);
void OnRefreshTimer(wxTimerEvent &event);
void OnRateChange(wxCommandEvent &event);
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: fix "no schema" bug when database is initial
Log Message:
---
fix "no schema" bug when database is initial database
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.105 -> r1.106)
pgadmin3/src/ui:
frmStatus.cpp (r1.22 -> r1.23)
pgadmin3/src/schema:
pgDatabase.cpp (r1.55 -> r1.56)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.105
retrieving revision 1.106
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.105 -r1.106
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,7 +16,8 @@
-2004.06.11 APApply for some function and view property dialogs
+2004-06-13 APfix "no schema" bug when database is initial database
+2004-06-11 APApply for some function and view property dialogs
2004-06-11 APDisplay server log
2004-06-08 APAllow Server Status & Maintenance windows to be resized
to allow easy reading of data
2004-06-07 APchanged connection loss handling
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.22 -r1.23
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -205,6 +205,7 @@
pgSet *dataSet1=connection->ExecuteSet(wxT("SELECT * FROM
pg_stat_activity ORDER BY procpid"));
if (dataSet1)
{
+statusList->Freeze();
while (!dataSet1->Eof())
{
pid=dataSet1->GetLong(wxT("procpid"));
@@ -248,7 +249,7 @@
dataSet1->MoveNext();
}
delete dataSet1;
-lockList->Thaw();
+statusList->Thaw();
}
else
connection->IsAlive();
@@ -361,7 +362,7 @@
}
else
{
-long newlen = StrToLong(connection->ExecuteScalar(wxT("SELECT
pg_logfile_length()")));
+long newlen = StrToLong(connection->ExecuteScalar(wxT("SELECT
pg_logfile_length(NULL)")));
wxString line;
bool skipFirst=false;
@@ -375,7 +376,7 @@
while (newlen > logFileLength)
{
-pgSet *set=connection->ExecuteSet(wxT("SELECT pg_logfile(NULL, ") +
NumToStr(logFileLength) + wxT(")"));
+pgSet *set=connection->ExecuteSet(wxT("SELECT pg_logfile_get(NULL, ") +
NumToStr(logFileLength) + wxT(", NULL)"));
if (!set)
{
connection->IsAlive();
Index: pgDatabase.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgDatabase.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lsrc/schema/pgDatabase.cpp -Lsrc/schema/pgDatabase.cpp -u -w -r1.55 -r1.56
--- src/schema/pgDatabase.cpp
+++ src/schema/pgDatabase.cpp
@@ -38,11 +38,7 @@
pgDatabase::~pgDatabase()
{
wxLogInfo(wxT("Destroying a pgDatabase object"));
-if (conn)
-{
-if (conn)
-delete conn;
-}
+Disconnect();
}
@@ -129,7 +125,7 @@
pgSet *pgDatabase::ExecuteSet(const wxString& sql)
{
pgSet *set=0;
-if (conn)
+if (connection())
{
set=connection()->ExecuteSet(sql);
if (!set)
@@ -142,7 +138,7 @@
wxString pgDatabase::ExecuteScalar(const wxString& sql)
{
wxString str;
-if (conn)
+if (connection())
{
str = connection()->ExecuteScalar(sql);
if (str.IsEmpty() && connection()->GetLastResultStatus() != PGRES_TUPLES_OK)
@@ -155,7 +151,7 @@
bool pgDatabase::ExecuteVoid(const wxString& sql)
{
bool rc;
-if (conn)
+if (connection())
{
rc = connection()->ExecuteVoid(sql);
if (!rc)
---(end of broadcast)---
TIP 2: you can get off all lists at once with the unregister command
(send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])
[pgadmin-hackers] CVS Commit by andreas: copy rows to clipboard from Query Tool and View
Log Message:
---
copy rows to clipboard from Query Tool and View Data Tool
allow omitting server disconnect when switching "Show System Objects"
guess combobox selection while typing
Modified Files:
--
pgadmin3/src:
Makefile.am (r1.80 -> r1.81)
Added Files:
---
pgadmin3/src/include:
ctlComboBox.h (r1.1)
pgadmin3/src/ui:
ctlComboBox.cpp (r1.1)
Index: Makefile.am
===
RCS file: /projects/pgadmin3/src/Makefile.am,v
retrieving revision 1.80
retrieving revision 1.81
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.80 -r1.81
--- src/Makefile.am
+++ src/Makefile.am
@@ -32,7 +32,7 @@
agent/pgaStep.cpp agent/pgaSchedule.cpp \
agent/dlgJob.cpp agent/dlgSchedule.cpp agent/dlgStep.cpp \
ui/xh_sqlbox.cpp ui/xh_calb.cpp ui/xh_timespin.cpp \
-ui/ctlSecurityPanel.cpp ui/dlgClasses.cpp \
+ui/ctlSecurityPanel.cpp ui/dlgClasses.cpp ui/ctlComboBox.cpp \
ui/frmGrantWizard.cpp \
ui/calbox.cpp ui/timespin.cpp ui/ctlListView.cpp \
ui/ctlSQLBox.cpp ui/ctlSQLResult.cpp ui/frmExport.cpp \
@@ -89,7 +89,7 @@
include/pgServer.h include/pgSet.h include/pgTable.h \
include/pgTrigger.h include/pgType.h include/pgUser.h \
include/pgView.h include/sysLogger.h include/utffile.h \
-include/calbox.h include/timespin.h \
+include/calbox.h include/timespin.h include/ctlComboBox.h \
include/xh_timespin.h include/xh_calb.h include/xh_sqlbox.h \
include/sysSettings.h include/wxgridsel.h include/menu.h\
agent/include/pgaAgent.h agent/include/pgaJob.h \
--- /dev/null
+++ src/include/ctlComboBox.h
@@ -0,0 +1,29 @@
+//
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID: $Id: ctlComboBox.h,v 1.1 2004/06/17 18:12:25 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// ctlComboBox.h - enhanced combobox control
+//
+//
+
+
+#ifndef __COMBOBOX_H
+#define __COMBOBOX_H
+
+// wxWindows headers
+#include
+
+
+class ctlComboBox : public wxComboBox
+{
+public:
+ctlComboBox(wxWindow *wnd, int id, wxPoint pos, wxSize siz, long attr=0);
+int GuessSelection();
+int GetSelection() const;
+wxString GetStringSelection() const;
+};
+
+#endif
--- /dev/null
+++ src/ui/ctlComboBox.cpp
@@ -0,0 +1,65 @@
+//
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID: $Id: ctlComboBox.cpp,v 1.1 2004/06/17 18:12:25 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// ctlComboBox.cpp - enhanced combobox control
+//
+//
+
+
+
+// App headers
+#include "pgAdmin3.h"
+#include "ctlComboBox.h"
+
+
+ctlComboBox::ctlComboBox(wxWindow *wnd, int id, wxPoint pos, wxSize siz, long attr)
+: wxComboBox(wnd, id, wxEmptyString, pos, siz, attr)
+{
+}
+
+
+int ctlComboBox::GuessSelection()
+{
+wxString str=GetValue();
+if (str.Length())
+{
+long pos=GetInsertionPoint();
+
+long sel, count=GetCount();
+int len=str.Length();
+for (sel = 0 ; sel < count ; sel++)
+{
+if (str == GetString(sel).Left(len))
+{
+SetSelection(sel);
+wxString current = GetString(sel);
+SetSelection(pos, current.Length());
+return sel;
+}
+}
+}
+return -1;
+}
+
+
+int ctlComboBox::GetSelection() const
+{
+int sel=wxComboBox::GetSelection();
+if (sel < 0)
+sel = FindString(GetValue());
+return sel;
+}
+
+
+wxString ctlComboBox::GetStringSelection() const
+{
+int sel=GetSelection();
+if (sel < 0)
+return wxEmptyString;
+else
+return GetString(sel);
+}
---(end of broadcast)---
TIP 6: Have you searched our list archives?
http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by andreas: small fix in EditGrid clipboard copy
Log Message:
---
small fix in EditGrid clipboard copy
Modified Files:
--
pgadmin3/src/ui:
frmEditGrid.cpp (r1.52 -> r1.53)
Index: frmEditGrid.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmEditGrid.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -Lsrc/ui/frmEditGrid.cpp -Lsrc/ui/frmEditGrid.cpp -u -w -r1.52 -r1.53
--- src/ui/frmEditGrid.cpp
+++ src/ui/frmEditGrid.cpp
@@ -300,7 +300,7 @@
wxString str;
for (i=0 ; i < rows.GetCount() ; i++)
{
-str.Append(sqlGrid->GetTable()->GetExportLine(i));
+str.Append(sqlGrid->GetTable()->GetExportLine(rows.Item(i)));
if (rows.GetCount() > 1)
str.Append(END_OF_LINE);
---(end of broadcast)---
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by andreas: gcc fix
Log Message:
---
gcc fix
Modified Files:
--
pgadmin3/src/ui:
ctlComboBox.cpp (r1.2 -> r1.3)
Index: ctlComboBox.cpp
===
RCS file: /projects/pgadmin3/src/ui/ctlComboBox.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/ctlComboBox.cpp -Lsrc/ui/ctlComboBox.cpp -u -w -r1.2 -r1.3
--- src/ui/ctlComboBox.cpp
+++ src/ui/ctlComboBox.cpp
@@ -48,7 +48,7 @@
int ctlComboBox::GetGuessedSelection() const
{
-int sel=wxChoice::GetSelection();
+int sel=wxComboBox::GetSelection();
if (sel < 0)
sel = FindString(GetValue());
return sel;
@@ -56,7 +56,7 @@
int ctlComboBox::GetSelection() const
{
-int sel=wxChoice::GetSelection();
+int sel=wxComboBox::GetSelection();
if (sel < 0)
sel = FindString(GetValue());
return sel;
---(end of broadcast)---
TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: reengineered sql fix
Log Message:
---
reengineered sql fix
Modified Files:
--
pgadmin3/src/schema:
pgTablespace.cpp (r1.2 -> r1.3)
Index: pgTablespace.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.2 -r1.3
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -196,7 +196,7 @@
if (location.IsEmpty())
sql += wxT("-- System Tablespace\n");
else
-sql + wxT("\n\nCREATE TABLESPACE ") + GetQuotedIdentifier()
+sql += wxT("\n\nCREATE TABLESPACE ") + GetQuotedIdentifier()
+ wxT("\n OWNER ") + qtIdent(GetOwner())
+ wxT("\n LOCATION ")+ qtString(location)
+ wxT(";\n");
---(end of broadcast)---
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: GRANT wizard
Log Message: --- GRANT wizard Added Files: --- pgadmin3/docs/en_US: grantwiz.html (r1.1) --- /dev/null +++ docs/en_US/grantwiz.html @@ -0,0 +1,34 @@ + + + + + +Grant Wizard + + + + +Grant Wizard + + + + +The Grant Wizard allows assignment of a set of privileges to groups and users to +multiple objects (tables, sequences, views and functions) in a convenient way. + + +The Selection tab will show all applicable objects under the currently selected object. +Check all objects you like to grant privileges on. + +The security tab defines the privileges and groups/users that should be granted. Assigning +no privileges to a group or user will result in revoking all rights for them. + + +The SQL tab shows the sql commands that are generated from the selected grant targets. + + +When clicking OK, the sql commands will be executed; any result will be displayed in the +Messages tab. + + + ---(end of broadcast)--- TIP 5: Have you checked our extensive FAQ? http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: backup using pg_dump
Log Message: --- backup using pg_dump Modified Files: -- pgadmin3/src: Makefile.am (r1.82 -> r1.83) Index: Makefile.am === RCS file: /projects/pgadmin3/src/Makefile.am,v retrieving revision 1.82 retrieving revision 1.83 diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.82 -r1.83 --- src/Makefile.am +++ src/Makefile.am @@ -42,6 +42,7 @@ ui/frmMain.cpp ui/frmOptions.cpp ui/frmPassword.cpp \ ui/frmQuery.cpp ui/frmQueryBuilder.cpp ui/frmHelp.cpp \ ui/frmQBJoin.cpp ui/frmSplash.cpp ui/frmMaintenance.cpp \ +ui/frmBackup.cpp ui/frmRestore.cpp \ ui/frmEditGrid.cpp ui/dlgProperty.cpp ui/dlgUser.cpp \ ui/dlgGroup.cpp ui/dlgDatabase.cpp ui/dlgLanguage.cpp \ ui/dlgSchema.cpp ui/dlgDomain.cpp ui/dlgTable.cpp ui/dlgTablespace.cpp \ @@ -76,6 +77,7 @@ include/frmQBJoin.h include/frmQueryBuilder.h include/frmHelp.h \ include/frmQuery.h include/frmSplash.h \ include/frmStatus.h include/frmMaintenance.h \ +include/frmBackup.h include/frmRestore.h \ include/misc.h include/pgAdmin3.h include/pgAggregate.h \ include/pgCast.h include/pgCheck.h include/pgCollection.h \ include/pgColumn.h include/pgConn.h include/pgTablespace.h \ ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by dpage: Added todo item
Log Message: --- Added todo item Modified Files: -- pgadmin3: TODO.txt (r1.97 -> r1.98) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.97 retrieving revision 1.98 diff -LTODO.txt -LTODO.txt -u -w -r1.97 -r1.98 --- TODO.txt +++ TODO.txt @@ -20,6 +20,7 @@ Allow copy/paste of entire rows in the data editor EditGrid: try to show freshly inserted row with 'serial' pk Generate PostgreSQL document indexes using docbook (http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html";>http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html). + Add cancel & terminate options to server status dialogue for 7.5. Major Projects ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by dpage: Allow query cancel/terminate
Log Message: --- Allow query cancel/terminate Modified Files: -- pgadmin3/src/ui/common: frmStatus.xrc (r1.8 -> r1.9) Index: frmStatus.xrc === RCS file: /projects/pgadmin3/src/ui/common/frmStatus.xrc,v retrieving revision 1.8 retrieving revision 1.9 diff -Lsrc/ui/common/frmStatus.xrc -Lsrc/ui/common/frmStatus.xrc -u -w -r1.8 -r1.9 --- src/ui/common/frmStatus.xrc +++ src/ui/common/frmStatus.xrc @@ -65,11 +65,44 @@ 395,273d Status + + +1 +2 + 5,24 - 385,270 wxLC_REPORT|wxSUNKEN_BORDER + wxTOP|wxLEFT|wxEXPAND|wxGROW|wxALIGN_CENTRE + + + +2 +1 + + +Cancel +53,15d + + wxBOTTOM|wxLEFT|wxALIGN_CENTRE|wxALIGN_CENTRE_VERTICAL + 2 + + + +Terminate +53,15d + + wxBOTTOM|wxLEFT|wxALIGN_CENTRE|wxALIGN_CENTRE_VERTICAL + 2 + +8 + + +0 +0 + + Locks ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by dpage: Allow query cancel/terminate
Log Message:
---
Allow query cancel/terminate
Modified Files:
--
pgadmin3/src/ui/common:
xrcDialogs.cpp (r1.27 -> r1.28)
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.27 -r1.28
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -7718,7 +7718,7 @@
47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,
10};
-static size_t xml_res_size_38 = 3327;
+static size_t xml_res_size_38 = 4812;
static unsigned char xml_res_file_38[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -7830,50 +7830,117 @@
108,97,115,115,61,34,110,111,116,101,98,111,111,107,112,97,103,101,34,62,
10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,83,116,97,
116,117,115,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,76,105,
-115,116,67,116,114,108,34,32,110,97,109,101,61,34,108,115,116,83,116,97,
-116,117,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
+32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,80,97,
+110,101,108,34,32,110,97,109,101,61,34,112,110,108,83,116,97,116,117,115,
+34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,
+116,32,99,108,97,115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,
+105,122,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+60,99,111,108,115,62,49,60,47,99,111,108,115,62,10,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,60,114,111,119,115,62,50,60,47,114,111,119,115,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,
+99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
+101,99,116,32,99,108,97,115,115,61,34,119,120,76,105,115,116,67,116,114,
+108,34,32,110,97,109,101,61,34,108,115,116,83,116,97,116,117,115,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
115,62,53,44,50,52,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,60,115,105,122,101,62,51,56,53,44,50,55,48,60,47,115,105,122,
-101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,
-101,62,119,120,76,67,95,82,69,80,79,82,84,124,119,120,83,85,78,75,69,78,
-95,66,79,82,68,69,82,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,76,67,95,
+82,69,80,79,82,84,124,119,120,83,85,78,75,69,78,95,66,79,82,68,69,82,60,
+47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,84,79,80,124,119,
+120,76,69,70,84,124,119,120,69,88,80,65,78,68,124,119,120,71,82,79,87,124,
+119,120,65,76,73,71,78,95,67,69,78,84,82,69,60,47,102,108,97,103,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
+116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
+101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,
+34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,
+106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,108,101,120,71,114,
+105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,60,99,111,108,115,62,50,60,47,99,111,108,115,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,114,111,
+119,115,62,49,60,47,114,111,119,115,62,10,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,
+115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,
+32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32,110,97,
+109,101,61,34,98,116,110,67,97,110,99,101,108,34,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
+108,62,67,97,110,99,101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,
+101,62,53,51,44,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,
+116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
+32,60,102,108,97,103,62,119,120,66,79,84,84,79,77,124,119,120,76,69,70,
+84,124,119,120,65,76,73,71,78,95,67,69,78,84,82,69,124,119,120,65,76,73,
+71,78,95,67,69,78,84,82,69,95,86,69,82,84,73,67,65,76,60,47,102,108,97,
[pgadmin-hackers] CVS Commit by dpage: Allow query cancel/terminate
Log Message:
---
Allow query cancel/terminate
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.23 -> r1.24)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.23 -r1.24
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -28,11 +28,15 @@
BEGIN_EVENT_TABLE(frmStatus, pgDialog)
EVT_BUTTON(XRCID("btnRefresh"), frmStatus::OnRefresh)
EVT_BUTTON (XRCID("btnClose"), frmStatus::OnCloseBtn)
+EVT_BUTTON(XRCID("btnCancel"),
frmStatus::OnCancelBtn)
+EVT_BUTTON(XRCID("btnTerminate"),
frmStatus::OnTerminateBtn)
EVT_CLOSE( frmStatus::OnClose)
EVT_SPINCTRL(XRCID("spnRefreshRate"), frmStatus::OnRateChangeSpin)
EVT_TEXT(XRCID("spnRefreshRate"), frmStatus::OnRateChange)
EVT_NOTEBOOK_PAGE_CHANGING(XRCID("nbStatus"),
frmStatus::OnNotebookPageChanged)
EVT_TIMER(TIMER_ID, frmStatus::OnRefreshTimer)
+ EVT_LIST_ITEM_SELECTED(XRCID("lstStatus"),
frmStatus::OnSelStatusItem)
+ EVT_LIST_ITEM_DESELECTED(XRCID("lstStatus"),frmStatus::OnSelStatusItem)
END_EVENT_TABLE();
@@ -41,6 +45,8 @@
#define logList CTRL_LISTVIEW("lstLog")
#define spnRefreshRate CTRL_SPIN("spnRefreshRate")
#define nbStatus CTRL_NOTEBOOK("nbStatus")
+#define btnCancel CTRL_BUTTON("btnCancel")
+#define btnTerminate CTRL_BUTTON("btnTerminate")
void frmStatus::OnCloseBtn(wxCommandEvent &event)
{
@@ -125,6 +131,9 @@
spnRefreshRate->SetValue(rate);
timer=new wxTimer(this, TIMER_ID);
+ btnCancel->Enable(false);
+ btnTerminate->Enable(false);
+
loaded = TRUE;
}
@@ -445,3 +454,67 @@
}
}
}
+
+void frmStatus::OnCancelBtn(wxCommandEvent &event)
+{
+ wxString spid = statusList->GetItemText(statusList->GetNextItem(-1,
wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED));
+ long lpid = StrToLong(spid);
+
+ if(backend_pid == lpid)
+ {
+ wxMessageBox(_("You cannot cancel a query running on your own server
process."), _("Cancel query"), wxOK | wxICON_EXCLAMATION);
+ return;
+ }
+
+ if (wxMessageBox(_("Are you sure you wish to cancel the selected query?"),
+_("Cancel query?"),
+wxYES_NO | wxICON_QUESTION) == wxNO)
+ return;
+
+ wxString sql = wxT("SELECT pg_cancel_backend(") + spid + wxT(");");
+
+ connection->ExecuteScalar(sql);
+
+ OnRefresh(*(wxCommandEvent*)&event);
+ wxMessageBox(_("A cancel signal was sent to the selected server process."),
_("Cancel query"), wxOK | wxICON_INFORMATION);
+}
+
+void frmStatus::OnTerminateBtn(wxCommandEvent &event)
+{
+ wxString spid = statusList->GetItemText(statusList->GetNextItem(-1,
wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED));
+ long lpid = StrToLong(spid);
+
+ if(backend_pid == lpid)
+ {
+ wxMessageBox(_("You cannot terminate your own server process."),
_("Terminate query"), wxOK | wxICON_EXCLAMATION);
+ return;
+ }
+
+ if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process?"),
+_("Terminate query?"), wxYES_NO |
wxICON_QUESTION) == wxNO)
+ return;
+
+ wxString sql = wxT("SELECT pg_terminate_backend(") + spid + wxT(");");
+
+ connection->ExecuteScalar(sql);
+
+ OnRefresh(*(wxCommandEvent*)&event);
+ wxMessageBox(_("A terminate signal was sent to the selected server process."),
_("Terminate query"), wxOK | wxICON_INFORMATION);
+}
+
+void frmStatus::OnSelStatusItem(wxCommandEvent &event)
+{
+ if (connection->BackendMinimumVersion(7, 5))
+ {
+ if(statusList->GetSelectedItemCount() >= 0)
+ {
+ btnCancel->Enable(true);
+ btnTerminate->Enable(true);
+ }
+ else
+ {
+ btnCancel->Enable(false);
+ btnTerminate->Enable(false);
+ }
+ }
+}
\ No newline at end of file
---(end of broadcast)---
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by dpage: Allow cancel/terminate of multiple processes at
Log Message:
---
Allow cancel/terminate of multiple processes at once.
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.24 -> r1.25)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.24 -r1.25
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -457,49 +457,49 @@
void frmStatus::OnCancelBtn(wxCommandEvent &event)
{
- wxString spid = statusList->GetItemText(statusList->GetNextItem(-1,
wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED));
- long lpid = StrToLong(spid);
-
- if(backend_pid == lpid)
- {
- wxMessageBox(_("You cannot cancel a query running on your own server
process."), _("Cancel query"), wxOK | wxICON_EXCLAMATION);
+ if (wxMessageBox(_("Are you sure you wish to cancel the selected query(s)?"),
_("Cancel query?"), wxYES_NO | wxICON_QUESTION) == wxNO)
return;
- }
- if (wxMessageBox(_("Are you sure you wish to cancel the selected query?"),
-_("Cancel query?"),
-wxYES_NO | wxICON_QUESTION) == wxNO)
- return;
+ long item = -1;
+ wxString pid;
- wxString sql = wxT("SELECT pg_cancel_backend(") + spid + wxT(");");
+for ( ;; )
+{
+item = statusList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+if ( item == -1 )
+break;
+ pid = statusList->GetItemText(item);
+ wxString sql = wxT("SELECT pg_cancel_backend(") + pid + wxT(");");
connection->ExecuteScalar(sql);
+ }
OnRefresh(*(wxCommandEvent*)&event);
- wxMessageBox(_("A cancel signal was sent to the selected server process."),
_("Cancel query"), wxOK | wxICON_INFORMATION);
+ wxMessageBox(_("A cancel signal was sent to the selected server
process(es)."), _("Cancel query"), wxOK | wxICON_INFORMATION);
}
void frmStatus::OnTerminateBtn(wxCommandEvent &event)
{
- wxString spid = statusList->GetItemText(statusList->GetNextItem(-1,
wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED));
- long lpid = StrToLong(spid);
-
- if(backend_pid == lpid)
- {
- wxMessageBox(_("You cannot terminate your own server process."),
_("Terminate query"), wxOK | wxICON_EXCLAMATION);
+ if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process(es)?"), _("Terminate process?"), wxYES_NO | wxICON_QUESTION) == wxNO)
return;
- }
- if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process?"),
-_("Terminate query?"), wxYES_NO |
wxICON_QUESTION) == wxNO)
- return;
+ long item = -1;
+ wxString pid;
- wxString sql = wxT("SELECT pg_terminate_backend(") + spid + wxT(");");
+for ( ;; )
+{
+item = statusList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+if ( item == -1 )
+break;
+ pid = statusList->GetItemText(item);
+ wxString sql = wxT("SELECT pg_terminate_backend(") + pid + wxT(");");
connection->ExecuteScalar(sql);
+ }
+
OnRefresh(*(wxCommandEvent*)&event);
- wxMessageBox(_("A terminate signal was sent to the selected server process."),
_("Terminate query"), wxOK | wxICON_INFORMATION);
+ wxMessageBox(_("A terminate signal was sent to the selected server
process(es)."), _("Terminate process"), wxOK | wxICON_INFORMATION);
}
void frmStatus::OnSelStatusItem(wxCommandEvent &event)
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by dpage: Allow query cancel/terminate
Log Message: --- Allow query cancel/terminate Modified Files: -- pgadmin3/src/include: frmStatus.h (r1.10 -> r1.11) Index: frmStatus.h === RCS file: /projects/pgadmin3/src/include/frmStatus.h,v retrieving revision 1.10 retrieving revision 1.11 diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.10 -r1.11 --- src/include/frmStatus.h +++ src/include/frmStatus.h @@ -42,6 +42,10 @@ void OnRateChange(wxCommandEvent &event); void OnRateChangeSpin(wxSpinEvent &event); void OnNotebookPageChanged(wxNotebookEvent& event); +void OnTerminateBtn(wxCommandEvent &event); +void OnCancelBtn(wxCommandEvent &event); + void OnSelStatusItem(wxCommandEvent &event); + void addLog(const wxString &str); ---(end of broadcast)--- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by andreas: fix disconnect check
Log Message:
---
fix disconnect check
Modified Files:
--
pgadmin3/src/ui:
frmMain.cpp (r1.93 -> r1.94)
Index: frmMain.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.93 -r1.94
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -549,11 +549,14 @@
while (item)
{
pgDatabase *db=(pgDatabase*)browser->GetItemData(item);
-if (db && db->GetType() == PG_DATABASE &&
db->GetConnected() && db->connection())
+if (db && db->GetType() == PG_DATABASE)
{
-if (!db->connection()->IsAlive() &&
db->connection()->GetStatus() == PGCONN_BROKEN)
+pgConn *conn=db->GetConnection();
+if (conn)
{
-db->connection()->Close();
+if (!conn->IsAlive() && conn->GetStatus() ==
PGCONN_BROKEN)
+{
+conn->Close();
if (!userInformed)
{
wxMessageDialog dlg(this, _("Close database
browser? If you abort, the object browser will not show accurate data."),
@@ -572,6 +575,7 @@
}
}
}
+}
item = browser->GetNextChild(obj->GetId(), cookie3);
}
}
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: fix cleanup terminated pids
Log Message: --- fix cleanup terminated pids Modified Files: -- pgadmin3/src/ui: frmStatus.cpp (r1.25 -> r1.26) Index: frmStatus.cpp === RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.25 -r1.26 --- src/ui/frmStatus.cpp +++ src/ui/frmStatus.cpp @@ -258,6 +258,10 @@ dataSet1->MoveNext(); } delete dataSet1; + +while (row < statusList->GetItemCount()) + statusList->DeleteItem(row); + statusList->Thaw(); } else @@ -354,6 +358,10 @@ } delete dataSet2; + +while (row < lockList->GetItemCount()) + lockList->DeleteItem(row); + lockList->Thaw(); } else ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by dpage: Set the default button to no.
Log Message:
---
Set the default button to no.
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.26 -> r1.27)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.26 -r1.27
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -465,7 +465,7 @@
void frmStatus::OnCancelBtn(wxCommandEvent &event)
{
- if (wxMessageBox(_("Are you sure you wish to cancel the selected query(s)?"),
_("Cancel query?"), wxYES_NO | wxICON_QUESTION) == wxNO)
+ if (wxMessageBox(_("Are you sure you wish to cancel the selected query(s)?"),
_("Cancel query?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
return;
long item = -1;
@@ -488,7 +488,7 @@
void frmStatus::OnTerminateBtn(wxCommandEvent &event)
{
- if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process(es)?"), _("Terminate process?"), wxYES_NO | wxICON_QUESTION) == wxNO)
+ if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process(es)?"), _("Terminate process?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) ==
wxNO)
return;
long item = -1;
---(end of broadcast)---
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: display user owned objects
Log Message:
---
display user owned objects
Modified Files:
--
pgadmin3/src/include:
pgObject.h (r1.56 -> r1.57)
pgUser.h (r1.20 -> r1.21)
pgadmin3/src/schema:
pgObject.cpp (r1.68 -> r1.69)
pgTablespace.cpp (r1.3 -> r1.4)
pgUser.cpp (r1.33 -> r1.34)
pgadmin3/src/ui:
frmMain.cpp (r1.94 -> r1.95)
Index: pgObject.h
===
RCS file: /projects/pgadmin3/src/include/pgObject.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lsrc/include/pgObject.h -Lsrc/include/pgObject.h -u -w -r1.56 -r1.57
--- src/include/pgObject.h
+++ src/include/pgObject.h
@@ -177,6 +177,8 @@
void iSetServer(pgServer *s) { server=s; }
pgServer *GetServer() { return server; }
+void FillOwned(wxTreeCtrl *browser, ctlListView *referencedBy, const
wxArrayString &dblist, const wxString &query);
+
bool CanCreate();
bool CanDrop();
bool CanEdit() { return true; }
Index: pgUser.h
===
RCS file: /projects/pgadmin3/src/include/pgUser.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/include/pgUser.h -Lsrc/include/pgUser.h -u -w -r1.20 -r1.21
--- src/include/pgUser.h
+++ src/include/pgUser.h
@@ -51,6 +51,7 @@
int GetIcon() { return PGICON_USER; }
void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form=0, ctlListView
*properties=0, ctlSQLBox *sqlPane=0);
static pgObject *ReadObjects(pgCollection *collection, wxTreeCtrl *browser, const
wxString &restriction=wxT(""));
+void ShowReferencedBy(frmMain *form, ctlListView *referencedBy, const wxString
&where);
// virtual methods
wxString GetSql(wxTreeCtrl *browser);
Index: pgObject.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgObject.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -Lsrc/schema/pgObject.cpp -Lsrc/schema/pgObject.cpp -u -w -r1.68 -r1.69
--- src/schema/pgObject.cpp
+++ src/schema/pgObject.cpp
@@ -206,9 +206,11 @@
wxString typestr=set->GetVal(wxT("type"));
int id;
+bool dontQuote=false;
switch (typestr.c_str()[0])
{
+case 'c':
case 's': // we don't know these; internally handled
case 't': set->MoveNext(); continue;
@@ -228,7 +230,7 @@
id=PG_RULE;
break;
}
-case 'c':
+case 'C':
{
switch (typestr.c_str()[1])
{
@@ -304,7 +306,7 @@
wxT("WHEN pr.oid IS NOT NULL THEN 'p'::text\n")
wxT("WHEN la.oid IS NOT NULL THEN 'l'::text\n")
wxT("WHEN rw.oid IS NOT NULL THEN 'R'::text\n")
-wxT("WHEN co.oid IS NOT NULL THEN 'c'::text || contype\n")
+wxT("WHEN co.oid IS NOT NULL THEN 'C'::text || contype\n")
wxT("ELSE '' END AS type,\n")
wxT(" COALESCE(coc.relname, clrw.relname) AS ownertable,\n")
wxT(" COALESCE(cl.relname, conname, proname, tgname, typname, lanname,
rulename, ns.nspname) AS refname,\n")
@@ -346,7 +348,7 @@
wxT("WHEN pr.oid IS NOT NULL THEN 'p'::text\n")
wxT("WHEN la.oid IS NOT NULL THEN 'l'::text\n")
wxT("WHEN rw.oid IS NOT NULL THEN 'R'::text\n")
-wxT("WHEN co.oid IS NOT NULL THEN 'c'::text || contype\n")
+wxT("WHEN co.oid IS NOT NULL THEN 'C'::text || contype\n")
wxT("ELSE '' END AS type,\n")
wxT(" COALESCE(coc.relname, clrw.relname) AS ownertable,\n")
wxT(" COALESCE(cl.relname, conname, proname, tgname, typname, lanname,
rulename, ns.nspname) AS refname,\n")
@@ -618,6 +620,114 @@
}
+void pgServerObject::FillOwned(wxTreeCtrl *browser, ctlListView *referencedBy, const
wxArrayString &dblist, const wxString &query)
+{
+pgCollection *databases;
+
+wxCookieType cookie;
+wxTreeItemId item=browser->GetFirstChild(GetServer()->GetId(), cookie);
+while (item)
+{
+databases = (pgCollection*)browser->GetItemData(item);
+if (databases && databases->GetType() == PG_DATABASES)
+break;
+else
+databases=0;
+
+item=browser->GetNextChild(GetServer()->GetId(), cookie);
+}
+
+size_t i;
+for (i=0 ; i < dblist.GetCount() ; i++)
+{
+wxString dbname=dblist.Item(i);
+pgConn *conn=0;
+pgConn *tmpConn=0;
+
+if (GetServer()->GetDatabaseName() == dbname)
+conn = GetServer()->GetConnection();
+else
+{
+item=browser->GetFirstChild(databases->GetId(),
[pgadmin-hackers] CVS Commit by andreas: todo: refactor tree context menu: create instead
Log Message: --- todo: refactor tree context menu: create instead of en/disable items Modified Files: -- pgadmin3: TODO.txt (r1.99 -> r1.100) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.99 retrieving revision 1.100 diff -LTODO.txt -LTODO.txt -u -w -r1.99 -r1.100 --- TODO.txt +++ TODO.txt @@ -3,6 +3,7 @@ pgDatatype to encapsulate all typmod handling, rewrite all other classes to use it Improve database connection docs for newbies. + refactor tree context menu: create instead of en/disable items Enhancements ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: gcc fix
Log Message:
---
gcc fix
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.27 -> r1.28)
pgadmin3/src/include:
frmStatus.h (r1.11 -> r1.12)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.27 -r1.28
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -510,7 +510,7 @@
wxMessageBox(_("A terminate signal was sent to the selected server
process(es)."), _("Terminate process"), wxOK | wxICON_INFORMATION);
}
-void frmStatus::OnSelStatusItem(wxCommandEvent &event)
+void frmStatus::OnSelStatusItem(wxListEvent &event)
{
if (connection->BackendMinimumVersion(7, 5))
{
@@ -521,7 +521,7 @@
}
else
{
- btnCancel->Enable(false);
+ btnCancel->Enablcd sre(false);
btnTerminate->Enable(false);
}
}
Index: frmStatus.h
===
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.11 -r1.12
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -44,7 +44,7 @@
void OnNotebookPageChanged(wxNotebookEvent& event);
void OnTerminateBtn(wxCommandEvent &event);
void OnCancelBtn(wxCommandEvent &event);
- void OnSelStatusItem(wxCommandEvent &event);
+ void OnSelStatusItem(wxListEvent &event);
void addLog(const wxString &str);
---(end of broadcast)---
TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: gcc fix
Log Message:
---
gcc fix
Modified Files:
--
pgadmin3/src/ui:
frmStatus.cpp (r1.28 -> r1.29)
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.28 -r1.29
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -521,7 +521,7 @@
}
else
{
- btnCancel->Enablcd sre(false);
+ btnCancel->Enable(false);
btnTerminate->Enable(false);
}
}
---(end of broadcast)---
TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: restore checking file signature
Log Message:
---
restore checking file signature
Modified Files:
--
pgadmin3/src/include:
frmRestore.h (r1.2 -> r1.3)
pgadmin3/src/ui:
frmRestore.cpp (r1.2 -> r1.3)
Index: frmRestore.h
===
RCS file: /projects/pgadmin3/src/include/frmRestore.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/include/frmRestore.h -Lsrc/include/frmRestore.h -u -w -r1.2 -r1.3
--- src/include/frmRestore.h
+++ src/include/frmRestore.h
@@ -35,6 +35,7 @@
private:
wxString GetHelpPage() const;
+void OnChangeName(wxCommandEvent &ev);
void OnChange(wxCommandEvent &ev);
void OnSelectFilename(wxCommandEvent &ev);
void OnView(wxCommandEvent &ev);
@@ -46,7 +47,7 @@
frmMain *form;
pgObject *object;
-bool viewRunning;
+bool viewRunning, filenameValid;
DECLARE_EVENT_TABLE()
};
Index: frmRestore.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.2 -r1.3
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -22,6 +22,7 @@
#include "pgTable.h"
#include
#include
+#include
// Icons
#include "images/restore.xpm"
@@ -43,7 +44,7 @@
BEGIN_EVENT_TABLE(frmRestore, ExternProcessDialog)
-EVT_TEXT(XRCID("txtFilename"), frmRestore::OnChange)
+EVT_TEXT(XRCID("txtFilename"), frmRestore::OnChangeName)
EVT_BUTTON(XRCID("btnFilename"),frmRestore::OnSelectFilename)
EVT_BUTTON(XRCID("btnOK"), frmRestore::OnOK)
EVT_BUTTON(XRCID("btnView"),frmRestore::OnView)
@@ -72,6 +73,7 @@
txtMessages = CTRL_TEXT("txtMessages");
txtMessages->SetMaxLength(0L);
btnOK->Disable();
+filenameValid=false;
wxCommandEvent ev;
OnChange(ev);
@@ -107,9 +109,40 @@
}
+void frmRestore::OnChangeName(wxCommandEvent &ev)
+{
+wxString name=txtFilename->GetValue();
+if (name.IsEmpty() || !wxFile::Exists(name))
+filenameValid=false;
+else
+{
+wxFile file(name, wxFile::read);
+if (file.IsOpened())
+{
+char buffer[8];
+off_t size=file.Read(buffer, 8);
+if (size == 8)
+{
+if (memcmp(buffer, "PGDMP", 5) && !memcmp(buffer, "toc.dat", 8))
+{
+// tar format?
+file.Seek(512);
+size=file.Read(buffer, 8);
+}
+if (size == 8 && !memcmp(buffer, "PGDMP", 5))
+{
+// check version here?
+filenameValid=true;
+}
+}
+}
+}
+OnChange(ev);
+}
+
+
void frmRestore::OnChange(wxCommandEvent &ev)
{
-bool filenameValid=!txtFilename->GetValue().IsEmpty();
btnOK->Enable(filenameValid);
btnView->Enable(filenameValid);
}
---(end of broadcast)---
TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by dpage: Split installtion into a merge module for the core
Log Message: --- Split installtion into a merge module for the core product (thus allowing pgAdmin to be distributed with PostgreSQL for Windows), and an installer with PostgreSQL utilities included as a seperate feature. Modified Files: -- pgadmin3/pkg/win32: pgadmin3.wsi (r1.15 -> r1.16) Added Files: --- pgadmin3/pkg/win32: pgadmin3.wsm (r1.1) ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by dpage: Allow cancel/terminate from status and locks tabs.
Log Message:
---
Allow cancel/terminate from status and locks tabs.
Modified Files:
--
pgadmin3/src/include:
frmStatus.h (r1.12 -> r1.13)
pgadmin3/src/ui:
frmStatus.cpp (r1.29 -> r1.30)
pgadmin3/src/ui/common:
frmStatus.xrc (r1.9 -> r1.10)
Index: frmStatus.h
===
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.12 -r1.13
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -45,7 +45,7 @@
void OnTerminateBtn(wxCommandEvent &event);
void OnCancelBtn(wxCommandEvent &event);
void OnSelStatusItem(wxListEvent &event);
-
+ void OnSelLockItem(wxListEvent &event);
void addLog(const wxString &str);
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.29 -r1.30
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -37,6 +37,8 @@
EVT_TIMER(TIMER_ID,
frmStatus::OnRefreshTimer)
EVT_LIST_ITEM_SELECTED(XRCID("lstStatus"),
frmStatus::OnSelStatusItem)
EVT_LIST_ITEM_DESELECTED(XRCID("lstStatus"),frmStatus::OnSelStatusItem)
+ EVT_LIST_ITEM_SELECTED(XRCID("lstLocks"),
frmStatus::OnSelLockItem)
+ EVT_LIST_ITEM_DESELECTED(XRCID("lstLocks"),
frmStatus::OnSelLockItem)
END_EVENT_TABLE();
@@ -170,6 +172,10 @@
if (!loaded) return;
wxCommandEvent nullEvent;
OnRefresh(nullEvent);
+
+// Disable the buttons. They'll get re-enabled if a suitable item is selected.
+ btnCancel->Enable(false);
+ btnTerminate->Enable(false);
}
@@ -468,22 +474,36 @@
if (wxMessageBox(_("Are you sure you wish to cancel the selected query(s)?"),
_("Cancel query?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
return;
+ctlListView *lv;
+
+ if (nbStatus->GetSelection() == 0)
+lv = statusList;
+
+ else if (nbStatus->GetSelection() == 1)
+lv = lockList;
+
+ else
+ {
+ wxLogError(_("Couldn't determine the source listview for a cancel
backend operation!"));
+ return;
+ }
+
long item = -1;
wxString pid;
for ( ;; )
{
-item = statusList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+item = lv->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if ( item == -1 )
break;
- pid = statusList->GetItemText(item);
+ pid = lv->GetItemText(item);
wxString sql = wxT("SELECT pg_cancel_backend(") + pid + wxT(");");
connection->ExecuteScalar(sql);
}
- OnRefresh(*(wxCommandEvent*)&event);
wxMessageBox(_("A cancel signal was sent to the selected server
process(es)."), _("Cancel query"), wxOK | wxICON_INFORMATION);
+ OnRefresh(*(wxCommandEvent*)&event);
}
void frmStatus::OnTerminateBtn(wxCommandEvent &event)
@@ -491,23 +511,37 @@
if (wxMessageBox(_("Are you sure you wish to terminate the selected server
process(es)?"), _("Terminate process?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) ==
wxNO)
return;
+ctlListView *lv;
+
+ if (nbStatus->GetSelection() == 0)
+lv = statusList;
+
+ else if (nbStatus->GetSelection() == 1)
+lv = lockList;
+
+ else
+ {
+ wxLogError(_("Couldn't determine the source listview for a terminate
backend operation!"));
+ return;
+ }
+
long item = -1;
wxString pid;
for ( ;; )
{
-item = statusList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+item = lv->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if ( item == -1 )
break;
- pid = statusList->GetItemText(item);
+ pid = lv->GetItemText(item);
wxString sql = wxT("SELECT pg_terminate_backend(") + pid + wxT(");");
connection->ExecuteScalar(sql);
}
- OnRefresh(*(wxCommandEvent*)&event);
wxMessageBox(_("A terminate signal was sent to the selected server
process(es)."), _("Terminate process"), wxOK | wxICON_INFORMATION);
+ OnRefresh(*(wxCommandEvent*)&event);
}
void frmStatus::OnSelStatusItem(wxListEvent &event)
@@ -526,3 +560,20 @@
}
}
}
+
+void frmStatus::OnSelLockItem(wxListEvent &event)
+{
+ if (connection->BackendMinimumVersion(7, 5))
+ {
+ if(lockList->GetSelectedIt
[pgadmin-hackers] CVS Commit by dpage: Update embedded xrcs
Log Message:
---
Update embedded xrcs
Modified Files:
--
pgadmin3/src/ui/common:
xrcDialogs.cpp (r1.28 -> r1.29)
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.28 -r1.29
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -1213,8 +1213,8 @@
115,111,117,114,99,101,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,
115,115,61,34,119,120,68,105,97,108,111,103,34,32,110,97,109,101,61,34,
100,108,103,69,100,105,116,71,114,105,100,79,112,116,105,111,110,115,34,
-62,10,32,32,32,32,60,116,105,116,108,101,62,69,100,105,116,32,71,114,105,
-100,32,79,112,116,105,111,110,115,60,47,116,105,116,108,101,62,10,32,32,
+62,10,32,32,32,32,60,116,105,116,108,101,62,86,105,101,119,32,68,97,116,
+97,32,79,112,116,105,111,110,115,60,47,116,105,116,108,101,62,10,32,32,
32,32,60,115,105,122,101,62,50,50,48,44,50,52,48,100,60,47,115,105,122,
101,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,
34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,98,116,110,
@@ -7718,7 +7718,7 @@
47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,
10};
-static size_t xml_res_size_38 = 4812;
+static size_t xml_res_size_38 = 4086;
static unsigned char xml_res_file_38[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -7735,7 +7735,7 @@
116,121,108,101,62,10,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,
115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,105,122,101,114,
34,62,10,32,32,32,32,32,32,60,99,111,108,115,62,49,60,47,99,111,108,115,
-62,10,32,32,32,32,32,32,60,114,111,119,115,62,50,60,47,114,111,119,115,
+62,10,32,32,32,32,32,32,60,114,111,119,115,62,51,60,47,114,111,119,115,
62,10,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,114,111,119,115,
62,49,60,47,103,114,111,119,97,98,108,101,114,111,119,115,62,10,32,32,32,
32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,
@@ -7830,115 +7830,83 @@
108,97,115,115,61,34,110,111,116,101,98,111,111,107,112,97,103,101,34,62,
10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,83,116,97,
116,117,115,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,80,97,
-110,101,108,34,32,110,97,109,101,61,34,112,110,108,83,116,97,116,117,115,
-34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,
-116,32,99,108,97,115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,
-105,122,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-60,99,111,108,115,62,49,60,47,99,111,108,115,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,32,32,32,32,60,114,111,119,115,62,50,60,47,114,111,119,115,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,
-99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
-101,99,116,32,99,108,97,115,115,61,34,119,120,76,105,115,116,67,116,114,
-108,34,32,110,97,109,101,61,34,108,115,116,83,116,97,116,117,115,34,62,
-10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
+32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,76,105,
+115,116,67,116,114,108,34,32,110,97,109,101,61,34,108,115,116,83,116,97,
+116,117,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
115,62,53,44,50,52,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,60,115,116,121,108,101,62,119,120,76,67,95,82,69,80,79,82,84,
+124,119,120,83,85,78,75,69,78,95,66,79,82,68,69,82,60,47,115,116,121,108,
+101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
+62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,
+32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
+61,34,110,111,116,101,98,111,111,107,112,97,103,101,34,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,76,111,99,107,115,60,47,
+108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,
+101,99,116,32,99,108,97,115,115,61,34,119,120,76,105,115,116,67,116,114,
+108,34,32,110,97,109,101,61,34,108,115,116,76,111,99,107,115,34,62,10,32,
+32,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,50,52,60,
+47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,
+122,101,62,51,56,53,44,50,55,48,60,47,115,105,122,101,62,10,32,32,32,32,
32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,76,67,95,
82,69,80,79,82,84,124,119,120,83,85,78,75,69,78,95,66,79,82,68,69,82,60,
-47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-32,32,32,32,60,47,111,98,106,101,99
[pgadmin-hackers] CVS Commit by dpage: todo/changelog updates
Log Message: --- todo/changelog updates Modified Files: -- pgadmin3: CHANGELOG.txt (r1.110 -> r1.111) TODO.txt (r1.100 -> r1.101) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.100 retrieving revision 1.101 diff -LTODO.txt -LTODO.txt -u -w -r1.100 -r1.101 --- TODO.txt +++ TODO.txt @@ -20,7 +20,6 @@ Allow copy/paste of entire rows in the data editor EditGrid: try to show freshly inserted row with 'serial' pk Generate PostgreSQL document indexes using docbook (http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html";>http://docbook.sourceforge.net/release/xsl/current/doc/htmlhelp.html). - Add cancel & terminate options to server status dialogue for 7.5. Major Projects Index: CHANGELOG.txt === RCS file: /projects/pgadmin3/CHANGELOG.txt,v retrieving revision 1.110 retrieving revision 1.111 diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.110 -r1.111 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -16,6 +16,8 @@ +2004-06-23 DPSplit Windows installer into a merge module and installer to allow inclusion in other packages. +2004-06-23 DPAllow cancelling of queries and termination of backends from server status dialogue for 7.5+. 2004-06-20 APbackup database using pg_dump 2004-06-19 APTablespace dependencies 2004-06-19 APcombobox guessing cleanups ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: fix translatable object name
Log Message:
---
fix translatable object name
Modified Files:
--
pgadmin3/src/ui:
frmBackup.cpp (r1.2 -> r1.3)
frmRestore.cpp (r1.4 -> r1.5)
Index: frmBackup.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmBackup.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/frmBackup.cpp -Lsrc/ui/frmBackup.cpp -u -w -r1.2 -r1.3
--- src/ui/frmBackup.cpp
+++ src/ui/frmBackup.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmBackup"));
RestorePosition();
-SetTitle(wxString::Format(_("Backup %s %s"), object->GetTypeName().c_str(),
object->GetFullIdentifier().c_str()));
+SetTitle(wxString::Format(_("Backup %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
canBlob = (obj->GetType() == PG_DATABASE);
chkBlobs->SetValue(canBlob);
Index: frmRestore.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.4 -r1.5
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmRestore"));
RestorePosition();
-SetTitle(wxString::Format(_("Restore %s %s"), object->GetTypeName().c_str(),
object->GetFullIdentifier().c_str()));
+SetTitle(wxString::Format(_("Restore %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
// Icon
---(end of broadcast)---
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: fix translatable object name
Log Message:
---
fix translatable object name
Modified Files:
--
pgadmin3/src/include:
pgObject.h (r1.57 -> r1.58)
pgadmin3/src/schema:
pgObject.cpp (r1.69 -> r1.70)
pgadmin3/src/ui:
events.cpp (r1.95 -> r1.96)
frmBackup.cpp (r1.3 -> r1.4)
frmGrantWizard.cpp (r1.2 -> r1.3)
frmIndexcheck.cpp (r1.7 -> r1.8)
frmMain.cpp (r1.95 -> r1.96)
frmMaintenance.cpp (r1.10 -> r1.11)
frmRestore.cpp (r1.5 -> r1.6)
pgadmin3/src/ui/de_DE:
pgadmin3.mo (r1.31 -> r1.32)
pgadmin3.po (r1.36 -> r1.37)
Index: pgObject.h
===
RCS file: /projects/pgadmin3/src/include/pgObject.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lsrc/include/pgObject.h -Lsrc/include/pgObject.h -u -w -r1.57 -r1.58
--- src/include/pgObject.h
+++ src/include/pgObject.h
@@ -94,6 +94,7 @@
virtual pgDatabase *GetDatabase() const { return 0; }
int GetType() const { return type; }
wxString GetTypeName() const { return typesList[type].typName; }
+wxString GetTranslatedTypeName() const { return
wxString(wxGetTranslation(typesList[type].typName)); }
void iSetName(const wxString& newVal) { name = newVal; }
wxString GetName() const { return name; }
OID GetOid() const { return oid; }
Index: pgObject.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgObject.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -Lsrc/schema/pgObject.cpp -Lsrc/schema/pgObject.cpp -u -w -r1.69 -r1.70
--- src/schema/pgObject.cpp
+++ src/schema/pgObject.cpp
@@ -389,7 +389,7 @@
wxLogInfo(wxT("Displaying properties for ") + GetTypeName() + wxT("
")+GetIdentifier());
if (form)
{
-form->StartMsg(wxString::Format(_("Retrieving %s details"),
wxGetTranslation(GetTypeName(;
+form->StartMsg(wxString::Format(_("Retrieving %s details"),
GetTranslatedTypeName().c_str()));
form->SetButtons(this);
SetContextInfo(form);
Index: frmGrantWizard.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmGrantWizard.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/frmGrantWizard.cpp -Lsrc/ui/frmGrantWizard.cpp -u -w -r1.2 -r1.3
--- src/ui/frmGrantWizard.cpp
+++ src/ui/frmGrantWizard.cpp
@@ -47,7 +47,7 @@
LoadResource(wxT("frmGrantWizard"));
RestorePosition();
-SetTitle(wxString::Format(_("Privileges for %s %s"),
object->GetTypeName().c_str(), object->GetFullIdentifier().c_str()));
+SetTitle(wxString::Format(_("Privileges for %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
// Icon
SetIcon(wxIcon(index_xpm));
@@ -129,7 +129,7 @@
else
{
objectArray.Add(obj);
-chkList->Append(obj->GetTypeName() + wxT(" ") +
obj->GetFullIdentifier());
+chkList->Append(obj->GetTypeName() + wxT(" ") +
obj->GetFullIdentifier()); // no translation!
}
}
item=mainForm->GetBrowser()->GetNextChild(collection->GetId(), cookie);
Index: frmBackup.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmBackup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/frmBackup.cpp -Lsrc/ui/frmBackup.cpp -u -w -r1.3 -r1.4
--- src/ui/frmBackup.cpp
+++ src/ui/frmBackup.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmBackup"));
RestorePosition();
-SetTitle(wxString::Format(_("Backup %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
+SetTitle(wxString::Format(_("Backup %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
canBlob = (obj->GetType() == PG_DATABASE);
chkBlobs->SetValue(canBlob);
Index: frmRestore.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.5 -r1.6
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmRestore"));
RestorePosition();
-SetTitle(wxString::Format(_("Restore %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
+SetTitle(wxString::Format(_("Restore %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
// Icon
Index: frmMaintenance.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmMaintenance.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/frmMaintenance.cpp -Lsrc/ui/frmMaintenance.cpp -u -w -r1.10 -r1.11
--- src/ui/frmMaintenance.cpp
+++ src/ui/frmMai
[pgadmin-hackers] CVS Commit by andreas: Tablespace ACLs
Log Message:
---
Tablespace ACLs
Modified Files:
--
pgadmin3/src/include:
dlgTablespace.h (r1.1 -> r1.2)
pgadmin3/src/schema:
pgTablespace.cpp (r1.4 -> r1.5)
pgadmin3/src/ui:
ctlSecurityPanel.cpp (r1.3 -> r1.4)
dlgTablespace.cpp (r1.2 -> r1.3)
Index: dlgTablespace.h
===
RCS file: /projects/pgadmin3/src/include/dlgTablespace.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/dlgTablespace.h -Lsrc/include/dlgTablespace.h -u -w -r1.1 -r1.2
--- src/include/dlgTablespace.h
+++ src/include/dlgTablespace.h
@@ -17,7 +17,7 @@
class pgTablespace;
-class dlgTablespace : public dlgProperty
+class dlgTablespace : public dlgSecurityProperty
{
public:
dlgTablespace(frmMain *frame, pgTablespace *node=0);
Index: pgTablespace.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.4 -r1.5
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -135,6 +135,7 @@
properties->AppendItem(_("OID"), GetOid());
properties->AppendItem(_("Owner"), GetOwner());
properties->AppendItem(_("Location"), GetLocation());
+properties->AppendItem(_("ACL"), GetAcl());
}
}
@@ -163,7 +164,7 @@
pgSet *tablespaces = collection->GetServer()->ExecuteSet(
-wxT("SELECT ts.oid, spcname, spclocation, pg_get_userbyid(spcowner) as
spcuser FROM pg_tablespace ts\n")
+wxT("SELECT ts.oid, spcname, spclocation, pg_get_userbyid(spcowner) as
spcuser, spcacl FROM pg_tablespace ts\n")
+ restriction + wxT(" ORDER BY spcname"));
if (tablespaces)
@@ -176,6 +177,7 @@
tablespace->iSetOid(tablespaces->GetOid(wxT("oid")));
tablespace->iSetOwner(tablespaces->GetVal(wxT("spcuser")));
tablespace->iSetLocation(tablespaces->GetVal(wxT("spclocation")));
+tablespace->iSetAcl(tablespaces->GetVal(wxT("spcacl")));
if (browser)
Index: dlgTablespace.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgTablespace.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/dlgTablespace.cpp -Lsrc/ui/dlgTablespace.cpp -u -w -r1.2 -r1.3
--- src/ui/dlgTablespace.cpp
+++ src/ui/dlgTablespace.cpp
@@ -29,7 +29,7 @@
#define txtLocation CTRL_TEXT("txtLocation")
-BEGIN_EVENT_TABLE(dlgTablespace, dlgProperty)
+BEGIN_EVENT_TABLE(dlgTablespace, dlgSecurityProperty)
EVT_TEXT(XRCID("txtName"), dlgTablespace::OnChange)
EVT_TEXT(XRCID("txtLocation"), dlgTablespace::OnChange)
EVT_TEXT(XRCID("cbOwner"), dlgTablespace::OnOwnerChange)
@@ -39,7 +39,7 @@
dlgTablespace::dlgTablespace(frmMain *frame, pgTablespace *node)
-: dlgProperty(frame, wxT("dlgTablespace"))
+: dlgSecurityProperty(frame, node, wxT("dlgTablespace"), wxT("CREATE"), "C")
{
tablespace=node;
SetIcon(wxIcon(tablespace_xpm));
@@ -55,6 +55,7 @@
int dlgTablespace::Go(bool modal)
{
+AddGroups();
AddUsers(cbOwner);
txtComment->Disable();
@@ -73,7 +74,7 @@
{
}
-return dlgProperty::Go(modal);
+return dlgSecurityProperty::Go(modal);
}
@@ -129,6 +130,7 @@
sql += wxT(" LOCATION ") + qtString(txtLocation->GetValue())
+ wxT(";\n");
}
+sql += GetGrant(wxT("C"), wxT("TABLESPACE ") + name);
return sql;
}
Index: ctlSecurityPanel.cpp
===
RCS file: /projects/pgadmin3/src/ui/ctlSecurityPanel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/ctlSecurityPanel.cpp -Lsrc/ui/ctlSecurityPanel.cpp -u -w -r1.3 -r1.4
--- src/ui/ctlSecurityPanel.cpp
+++ src/ui/ctlSecurityPanel.cpp
@@ -270,6 +270,7 @@
void ctlSecurityPanel::OnDelPriv(wxCommandEvent &ev)
{
lbPrivileges->DeleteCurrentItem();
+ev.Skip();
}
@@ -302,6 +303,7 @@
}
}
lbPrivileges->SetItem(pos, 1, value);
+ev.Skip();
}
---(end of broadcast)---
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
[pgadmin-hackers] CVS Commit by andreas: gtk focus problem
Log Message: --- gtk focus problem Modified Files: -- pgadmin3: BUGS.txt (r1.48 -> r1.49) Index: BUGS.txt === RCS file: /projects/pgadmin3/BUGS.txt,v retrieving revision 1.48 retrieving revision 1.49 diff -LBUGS.txt -LBUGS.txt -u -w -r1.48 -r1.49 --- BUGS.txt +++ BUGS.txt @@ -1,6 +1,7 @@ Known issues + [gtk] retrieving current focus in QueryWindow failes (needed for toolbar enabling) [Object Tree] missing schema for function return type if table type (are there more cases?) [gtk] cursor problem with wxSTC (disappears every second focus change) [Query Builder] Menu item 'Query Browser' causes Segfault under unix - crash after qbForm->Show() in frmQueryBuilder::OnSize() at layout.LayoutMDIFrame(this). QB currently disabled. ---(end of broadcast)--- TIP 5: Have you checked our extensive FAQ? http://www.postgresql.org/docs/faqs/FAQ.html
[pgadmin-hackers] CVS Commit by andreas: Fix check constraint in table reengineering
Log Message:
---
Fix check constraint in table reengineering
Modified Files:
--
pgadmin3/src/schema:
pgTable.cpp (r1.53 -> r1.54)
pgadmin3:
CHANGELOG.txt (r1.112 -> r1.113)
Index: pgTable.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgTable.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lsrc/schema/pgTable.cpp -Lsrc/schema/pgTable.cpp -u -w -r1.53 -r1.54
--- src/schema/pgTable.cpp
+++ src/schema/pgTable.cpp
@@ -98,7 +98,7 @@
sql += ((pgForeignKey*)data)->GetDefinition();
break;
case PG_CHECK:
-sql += ((pgCheck*)data)->GetDefinition();
+ sql += wxT("(") + ((pgCheck*)data)->GetDefinition()
+ wxT(")");
break;
}
}
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.112
retrieving revision 1.113
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.112 -r1.113
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,7 @@
+2004-01-12 APFix check constraint in table reengineering
2004-01-11 APFix combobox size/position issue on gtk
2004-01-11 APFix button height issue with modern gtk themes
2004-06-30 APTablespace ACLs
---(end of broadcast)---
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
[pgadmin-hackers] CVS Commit by dpage: Remove pga2 support note
Log Message: --- Remove pga2 support note Modified Files: -- www/pgadmin3/cnt: cnt_index.php (r1.30 -> r1.31) Index: cnt_index.php === RCS file: /projects/www/pgadmin3/cnt/cnt_index.php,v retrieving revision 1.30 retrieving revision 1.31 diff -Lpgadmin3/cnt/cnt_index.php -Lpgadmin3/cnt/cnt_index.php -u -w -r1.30 -r1.31 --- pgadmin3/cnt/cnt_index.php +++ pgadmin3/cnt/cnt_index.php @@ -47,17 +47,6 @@ daily snapshots compiled almost everyday."), "download.php#snapshots");?> - - - - - - -pgAdmin II site."), "http://www.pgadmin.org/pgadmin2";)?> - - - - top ---(end of broadcast)--- TIP 6: Have you searched our list archives? http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by dpage: Remove obsolete configurations.
Log Message: --- Remove obsolete configurations. Update for current wxWidgets. NOTE: you'll probably need to tweak your build enviroment, but this should now be easier than previously!! Modified Files: -- pgadmin3/src: pgAdmin3.dsp (r1.102 -> r1.103) Index: pgAdmin3.dsp === RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v retrieving revision 1.102 retrieving revision 1.103 diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.102 -r1.103 --- src/pgAdmin3.dsp +++ src/pgAdmin3.dsp @@ -17,10 +17,6 @@ !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "pgAdmin3 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "pgAdmin3 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "pgAdmin3 - Win32 Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "pgAdmin3 - Win32 Unicode Release" (based on "Win32 (x86) Application") !MESSAGE "pgAdmin3 - Win32 Unicode SSL Debug" (based on "Win32 (x86) Application") !MESSAGE "pgAdmin3 - Win32 Unicode SSL Release" (based on "Win32 (x86) Application") !MESSAGE @@ -33,117 +29,7 @@ MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "pgAdmin3 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "c:/wxWindows_2.4.0/include" /I "c:/wxWindows_2.4.0/contrib/include" /I "c:/wxWindows_2.4.0/lib/mswd" /I "include/" /I "c:/postgresql/include" /I "agent/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "EMBED_XRC" /FAcs /FR /Yu"pgadmin3.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /i "c:/wxWindows_2.4.0/include" /i "c:/wxWindows_2.4.0/contrib/include" /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib wxxrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib libpq.lib expat.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"c:/wxWindows_2.4.0/lib" /libpath:"c:/wxWindows_2.4.0/contrib/lib" /libpath:"c:/postgresql/lib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWindows_2.4.0/include" /I "c:/wxWindows_2.4.0/contrib/include" /I "c:/wxWindows_2.4.0/lib/mswd" /I "include/" /I "c:/postgresql/include" /I "agent/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FAcs /FR /Yu"pgadmin3.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /i "c:/wxWindows_2.4.0/include" /i "c:/wxWindows_2.4.0/contrib/include" /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib wxxrcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib libpq.lib expatd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /
[pgadmin-hackers] CVS Commit by dpage: Don't try to access pg_tablespace with 7.4 or below
Log Message:
---
Don't try to access pg_tablespace with 7.4 or below
[Hiroshi Saito]
Modified Files:
--
pgadmin3/src/schema:
pgUser.cpp (r1.34 -> r1.35)
Index: pgUser.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgUser.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lsrc/schema/pgUser.cpp -Lsrc/schema/pgUser.cpp -u -w -r1.34 -r1.35
--- src/schema/pgUser.cpp
+++ src/schema/pgUser.cpp
@@ -98,13 +98,19 @@
wxArrayString dblist;
-pgSet *set=GetConnection()->ExecuteSet(
+pgSet *set;
+if (GetConnection()->BackendMinimumVersion(7, 5))
+set=GetConnection()->ExecuteSet(
wxT("SELECT 'd' as type, datname, datallowconn, datdba\n")
wxT(" FROM pg_database db\n")
wxT("UNION\n")
wxT("SELECT 'M', spcname, null, null\n")
wxT(" FROM pg_tablespace where spcowner=") + uid + wxT("\n")
wxT(" ORDER BY 1, 2"));
+else
+set=GetConnection()->ExecuteSet(
+wxT("SELECT 'd' as type, datname, datallowconn, datdba\n")
+wxT(" FROM pg_database db"));
if (set)
{
---(end of broadcast)---
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: Allow change of some function attributes
Log Message:
---
Allow change of some function attributes
Modified Files:
--
pgadmin3/src/ui:
dlgFunction.cpp (r1.32 -> r1.33)
Index: dlgFunction.cpp
===
RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.32 -r1.33
--- src/ui/dlgFunction.cpp
+++ src/ui/dlgFunction.cpp
@@ -227,7 +227,6 @@
|| name != function->GetName()
|| cbVolatility->GetValue() != function->GetVolatility()
|| chkSecureDefiner->GetValue() != function->GetSecureDefiner()
- || chkSetof->GetValue() != function->GetReturnAsSet()
|| chkStrict->GetValue() != function->GetIsStrict()
|| cbLanguage->GetValue() != function->GetLanguage()
|| (isC && (txtObjectFile->GetValue() != function->GetBin() ||
txtLinkSymbol->GetValue() != function->GetSource()))
@@ -354,6 +353,10 @@
bool isC=cbLanguage->GetValue().IsSameAs(wxT("C"), false);
bool didChange = !function
+|| cbVolatility->GetValue() != function->GetVolatility()
+|| chkSecureDefiner->GetValue() != function->GetSecureDefiner()
+|| chkStrict->GetValue() != function->GetIsStrict()
+|| cbLanguage->GetValue() != function->GetLanguage()
|| (isC && (txtObjectFile->GetValue() != function->GetBin() ||
txtLinkSymbol->GetValue() != function->GetSource()))
|| (!isC && txtSqlBox->GetText() != function->GetSource());
---(end of broadcast)---
TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: fix dependency display for tablespaces and users
Log Message:
---
fix dependency display for tablespaces and users
Modified Files:
--
pgadmin3/src/schema:
pgTablespace.cpp (r1.5 -> r1.6)
pgUser.cpp (r1.35 -> r1.36)
Index: pgUser.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgUser.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lsrc/schema/pgUser.cpp -Lsrc/schema/pgUser.cpp -u -w -r1.35 -r1.36
--- src/schema/pgUser.cpp
+++ src/schema/pgUser.cpp
@@ -133,12 +133,12 @@
}
FillOwned(form->GetBrowser(), referencedBy, dblist,
-wxT("SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname,
COALESCE(ci.relname, cl.relname) as relname, ci.relname as indname\n")
+wxT("SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname,
COALESCE(ci.relname, cl.relname) as relname, cl.relname as indname\n")
wxT(" FROM pg_class cl\n")
wxT(" JOIN pg_namespace cln ON cl.relnamespace=cln.oid\n")
wxT(" LEFT OUTER JOIN pg_index ind ON ind.indexrelid=cl.oid\n")
wxT(" LEFT OUTER JOIN pg_class ci ON ind.indrelid=ci.oid\n")
-wxT(" JOIN pg_namespace cin ON ci.relnamespace=cin.oid\n")
+wxT(" LEFT OUTER JOIN pg_namespace cin ON ci.relnamespace=cin.oid\n")
wxT(" WHERE cl.relowner = ") + uid + wxT(" AND cl.oid > ") + sysoid +
wxT("\n")
wxT("UNION ALL\n")
wxT("SELECT 'n', null, nspname, null\n")
Index: pgTablespace.cpp
===
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.5 -r1.6
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -78,12 +78,12 @@
}
FillOwned(form->GetBrowser(), referencedBy, dblist,
-wxT("SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname,
COALESCE(ci.relname, cl.relname) as relname, ci.relname as indname\n")
+wxT("SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname,
COALESCE(ci.relname, cl.relname) as relname, cl.relname as indname\n")
wxT(" FROM pg_class cl\n")
wxT(" JOIN pg_namespace cln ON cl.relnamespace=cln.oid\n")
wxT(" LEFT OUTER JOIN pg_index ind ON ind.indexrelid=cl.oid\n")
wxT(" LEFT OUTER JOIN pg_class ci ON ind.indrelid=ci.oid\n")
-wxT(" JOIN pg_namespace cin ON ci.relnamespace=cin.oid\n")
+wxT(" LEFT OUTER JOIN pg_namespace cin ON ci.relnamespace=cin.oid\n")
wxT(" WHERE cl.reltablespace IN (") + tsoid + wxT(")\n")
wxT("UNION ALL\n")
wxT("SELECT 'n', null, nspname, null\n")
---(end of broadcast)---
TIP 6: Have you searched our list archives?
http://archives.postgresql.org
[pgadmin-hackers] CVS Commit by andreas: catch SIGPIPE
Log Message: --- catch SIGPIPE Modified Files: -- pgadmin3: TODO.txt (r1.101 -> r1.102) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.101 retrieving revision 1.102 diff -LTODO.txt -LTODO.txt -u -w -r1.101 -r1.102 --- TODO.txt +++ TODO.txt @@ -1,6 +1,7 @@ Essentials + catch SIGPIPE pgDatatype to encapsulate all typmod handling, rewrite all other classes to use it Improve database connection docs for newbies. refactor tree context menu: create instead of en/disable items ---(end of broadcast)--- TIP 8: explain analyze is your friend
[pgadmin-hackers] CVS Commit by andreas: recreate views after column type change
Log Message: --- recreate views after column type change Modified Files: -- pgadmin3: TODO.txt (r1.102 -> r1.103) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.102 retrieving revision 1.103 diff -LTODO.txt -LTODO.txt -u -w -r1.102 -r1.103 --- TODO.txt +++ TODO.txt @@ -2,6 +2,7 @@ Essentials catch SIGPIPE + recreate views after column type change pgDatatype to encapsulate all typmod handling, rewrite all other classes to use it Improve database connection docs for newbies. refactor tree context menu: create instead of en/disable items ---(end of broadcast)--- TIP 4: Don't 'kill -9' the postmaster
[pgadmin-hackers] CVS Commit by andreas: catch SIGPIPE
Log Message: --- catch SIGPIPE Modified Files: -- pgadmin3: TODO.txt (r1.103 -> r1.104) pgadmin3/src: pgAdmin3.cpp (r1.98 -> r1.99) Index: TODO.txt === RCS file: /projects/pgadmin3/TODO.txt,v retrieving revision 1.103 retrieving revision 1.104 diff -LTODO.txt -LTODO.txt -u -w -r1.103 -r1.104 --- TODO.txt +++ TODO.txt @@ -1,7 +1,6 @@ Essentials - catch SIGPIPE recreate views after column type change pgDatatype to encapsulate all typmod handling, rewrite all other classes to use it Improve database connection docs for newbies. Index: pgAdmin3.cpp === RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.98 -r1.99 --- src/pgAdmin3.cpp +++ src/pgAdmin3.cpp @@ -27,6 +27,11 @@ #include #endif +// Linux headers +#ifdef __LINUX__ +#include +#endif + #if wxCHECK_VERSION(2,5,1) #ifdef __WXGTK__ #include @@ -183,6 +188,10 @@ #endif #endif +#ifdef __LINUX__ + signal(SIGPIPE, SIG_IGN); +#endif + locale = new wxLocale(); locale->AddCatalogLookupPathPrefix(uiPath); ---(end of broadcast)--- TIP 7: don't forget to increase your free space map settings
[pgadmin-hackers] CVS Commit by andreas: StatusBar for frmStatus
Log Message: --- StatusBar for frmStatus Modified Files: -- pgadmin3/src/ui/common: frmStatus.xrc (r1.12 -> r1.13) Index: frmStatus.xrc === RCS file: /projects/pgadmin3/src/ui/common/frmStatus.xrc,v retrieving revision 1.12 retrieving revision 1.13 diff -Lsrc/ui/common/frmStatus.xrc -Lsrc/ui/common/frmStatus.xrc -u -w -r1.12 -r1.13 --- src/ui/common/frmStatus.xrc +++ src/ui/common/frmStatus.xrc @@ -6,7 +6,7 @@ wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER|wxRESIZE_BOX|wxTHICK_FRAME 1 - 2 + 3 2,24d @@ -187,6 +187,12 @@ 0 0 + + + -1,15d + +wxGROW + \ No newline at end of file ---(end of broadcast)--- TIP 3: if posting/reading through Usenet, please send an appropriate subscribe-nomail command to [EMAIL PROTECTED] so that your message can get through to the mailing list cleanly
[pgadmin-hackers] CVS Commit by andreas: Update ServerStatus to pg_logdir_ls
Log Message:
---
Update ServerStatus to pg_logdir_ls
Modified Files:
--
pgadmin3:
CHANGELOG.txt (r1.115 -> r1.116)
pgadmin3/src/include:
frmStatus.h (r1.14 -> r1.15)
pgadmin3/src/ui:
frmStatus.cpp (r1.31 -> r1.32)
Index: CHANGELOG.txt
===
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.115
retrieving revision 1.116
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.115 -r1.116
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -16,6 +16,8 @@
+2004-01-21 APUpdate ServerStatus to pg_logdir_ls
+2004-01-21 APcatch SIGPIPE
2004-01-20 APowner, name, comment refactoring in dlgProperty
2004-01-20 APsupport of function parameters
2004-01-20 APtablespace changes
Index: frmStatus.h
===
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.14 -r1.15
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -56,8 +56,10 @@
void addLogFile(const wxString &filename, const wxDateTime timestamp, int pid,
long len, long &read, bool skipFirst);
void addLogLine(const wxString &str, bool formatted=true);
+ void checkConnection();
frmMain *mainForm;
+ wxStatusBar *statusBar;
wxString logFormat;
bool logHasTimestamp, logFormatKnown;
int logFmtPos;
Index: frmStatus.cpp
===
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.31 -r1.32
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -81,6 +81,8 @@
RestorePosition(-1, -1, 400, 240, 200, 150);
SetTitle(_title);
SetIcon(wxIcon(pgAdmin3_xpm));
+ statusBar = new wxStatusBar(this, -1);
+ wxXmlResource::Get()->AttachUnknownControl(wxT("unkStatusBar"), statusBar);
mainForm=form;
timer=0;
@@ -229,6 +231,11 @@
// To avoid hammering the lock manager (and the network for that matter),
// only query for the required tab.
+ wxLogNull nolog;
+
+ if (!connection)
+ return;
+
if (nbStatus->GetSelection() == 0)
{
// Status
@@ -237,6 +244,7 @@
if (dataSet1)
{
statusList->Freeze();
+ statusBar->SetStatusText(_("Refreshing."));
while (!dataSet1->Eof())
{
pid=dataSet1->GetLong(wxT("procpid"));
@@ -285,9 +293,10 @@
statusList->DeleteItem(row);
statusList->Thaw();
+ statusBar->SetStatusText(_("Done."));
}
else
-connection->IsAlive();
+ checkConnection();
row=0;
while (row < statusList->GetItemCount())
@@ -326,6 +335,7 @@
pgSet *dataSet2=connection->ExecuteSet(sql);
if (dataSet2)
{
+ statusBar->SetStatusText(_("Refreshing."));
lockList->Freeze();
while (!dataSet2->Eof())
@@ -385,9 +395,10 @@
lockList->DeleteItem(row);
lockList->Thaw();
+ statusBar->SetStatusText(_("Done."));
}
else
-connection->IsAlive();
+checkConnection();
row=0;
while (row < lockList->GetItemCount())
@@ -401,7 +412,7 @@
}
else
{
-long newlen;
+long newlen=0;
if (logDirectory.IsEmpty())
{
@@ -430,11 +441,22 @@
if (isCurrent)
{
// check if the current logfile changed
-newlen = StrToLong(connection->ExecuteScalar(wxT("SELECT
pg_file_length(") + qtString(logfileName) + wxT(")")));
-
+ pgSet *set = connection->ExecuteSet(wxT("SELECT pg_file_length(")
+ qtString(logfileName) + wxT(") AS len"));
+ if (set)
+ {
+ newlen = set->GetLong(wxT("len"));
+ delete set;
+ }
+ else
+ {
+ checkConnection();
+ return;
+ }
if (newlen > logfileLength)
{
+ statusBar->SetStatusText(_("Refreshing."));
addLogFile(logfileName, logfileTimestamp, logfilePid, newlen,
logfileLength, false);
+ statusBar->SetStatusText(_("Done."));
// as long as there was new data, the
[pgadmin-hackers] CVS Commit by andreas: StatusBar with size handle for frmStatus,
Log Message:
---
StatusBar with size handle for frmStatus, dlgFunction and dlgView
Modified Files:
--
pgadmin3/src/ui/common:
xrcDialogs.cpp (r1.32 -> r1.33)
Index: xrcDialogs.cpp
===
RCS file: /projects/pgadmin3/src/ui/common/xrcDialogs.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lsrc/ui/common/xrcDialogs.cpp -Lsrc/ui/common/xrcDialogs.cpp -u -w -r1.32 -r1.33
--- src/ui/common/xrcDialogs.cpp
+++ src/ui/common/xrcDialogs.cpp
@@ -1628,7 +1628,7 @@
47,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,
117,114,99,101,62,10};
-static size_t xml_res_size_9 = 13449;
+static size_t xml_res_size_9 = 13409;
static unsigned char xml_res_file_9[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -2225,20 +2225,18 @@
108,115,62,48,60,47,103,114,111,119,97,98,108,101,99,111,108,115,62,10,
32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,
105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,60,111,
-98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,84,101,120,116,67,
-116,114,108,34,32,110,97,109,101,61,34,116,120,116,83,116,97,116,117,115,
-34,62,10,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,
-45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,
-115,116,121,108,101,62,119,120,84,69,95,82,69,65,68,79,78,76,89,60,47,115,
-116,121,108,101,62,10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,
-62,10,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,71,82,79,87,
-124,119,120,65,76,73,71,78,95,67,69,78,84,82,69,60,47,102,108,97,103,62,
-10,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,
-114,100,101,114,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,
-10,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,114,111,119,115,62,
-48,60,47,103,114,111,119,97,98,108,101,114,111,119,115,62,10,32,32,32,32,
-60,47,111,98,106,101,99,116,62,10,32,32,60,47,111,98,106,101,99,116,62,
-10,60,47,114,101,115,111,117,114,99,101,62,10};
+98,106,101,99,116,32,99,108,97,115,115,61,34,117,110,107,110,111,119,110,
+34,32,110,97,109,101,61,34,117,110,107,83,116,97,116,117,115,66,97,114,
+34,62,10,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,45,49,44,49,
+53,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,60,47,111,98,
+106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,
+71,82,79,87,124,119,120,65,76,73,71,78,95,67,69,78,84,82,69,60,47,102,108,
+97,103,62,10,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,
+47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,60,47,111,98,106,101,
+99,116,62,10,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,114,111,
+119,115,62,48,60,47,103,114,111,119,97,98,108,101,114,111,119,115,62,10,
+32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,60,47,111,98,106,101,
+99,116,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
static size_t xml_res_size_10 = 2651;
static unsigned char xml_res_file_10[] = {
@@ -5725,7 +5723,7 @@
32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,
101,62,10};
-static size_t xml_res_size_26 = 4625;
+static size_t xml_res_size_26 = 4585;
static unsigned char xml_res_file_26[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -5926,20 +5924,18 @@
103,114,111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32,32,60,
111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,
116,101,109,34,62,10,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,
-99,108,97,115,115,61,34,119,120,84,101,120,116,67,116,114,108,34,32,110,
-97,109,101,61,34,116,120,116,83,116,97,116,117,115,34,62,10,32,32,32,32,
-32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,100,60,47,115,
-105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,
-62,119,120,84,69,95,82,69,65,68,79,78,76,89,60,47,115,116,121,108,101,62,
-10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
-32,32,32,32,60,102,108,97,103,62,119,120,71,82,79,87,124,119,120,65,76,
-73,71,78,95,67,69,78,84,82,69,60,47,102,108,97,103,62,10,32,32,32,32,32,
-32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62,
-10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,
-60,103,114,111,119,97,98,108,101,114,111,119,115,62,48,60,47,103,114,111,
-119,97,98,108,101,114,111,119,115,62,10,32,32,32,32,60,47,111,98,106,101,
-99,116,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,
-111,117,114,99,101,62,10};
+99,108,97,115,115,61,34,117,110,107,110,111,119,110,34,32,110,97,109,101,
+61,34,117,110,107,83,116,97,116,117,115,66,97,114,34,62,10,32,32,32,32,
+32,32,32,32,32,32,60,115,105,122,101,62,45,49,44,49,53,100,60,47,1
