From 9b97fa1dcfe9dabfeed11fee930ff92b467feedf Mon Sep 17 00:00:00 2001 From: levinsv <44033647+levinsv@users.noreply.github.com> Date: Mon, 13 Apr 2020 21:11:13 +0500 Subject: [PATCH] buf fix sort and procedure --- README.md | 4 ++++ Release_(3.0)/pgAdmin3.exe | Bin 10810880 -> 10810880 bytes ctl/ctlSQLGrid.cpp | 11 +++++++---- ctl/ctlSQLResult.cpp | 2 ++ dlg/dlgFunction.cpp | 2 +- include/ctl/ctlSQLGrid.h | 10 ++++++++++ schema/pgFunction.cpp | 4 ++-- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fb30381..b19c70b 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,10 @@ This text Russian language. - добавлены новые опции для Vaccum ( DISABLE_PAGE_SKIPPING ) и Reindex ( CONCURRENTLY ) * ускорена работа фильтра в окне результав запроса. +13.04.2020 + * исправлено падение в режиме редактирования + * исправлено редактирование процедур без аргументов + diff --git a/Release_(3.0)/pgAdmin3.exe b/Release_(3.0)/pgAdmin3.exe index 00505fe65e1b2a5084d1f8f608653b7d33de68ba..c6a1d29e80a15416daf160e07b4dfa9adb86d577 100644 GIT binary patch delta 13613 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 aRo=_iqkM|80c9h~CX~&*_p&WbqyG;yLCuf= diff --git a/ctl/ctlSQLGrid.cpp b/ctl/ctlSQLGrid.cpp index e768847..d2338f1 100644 --- a/ctl/ctlSQLGrid.cpp +++ b/ctl/ctlSQLGrid.cpp @@ -59,7 +59,7 @@ ctlSQLGrid::ctlSQLGrid(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons //SetUseNativeColLabels(true); //UseNativeColHeader(true); grp=NULL; - + isSort=false; Connect(wxID_ANY, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler(ctlSQLGrid::OnLabelDoubleClick)); } #include "wx/renderer.h" @@ -67,6 +67,7 @@ ctlSQLGrid::ctlSQLGrid(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons void ctlSQLGrid::DrawColLabel( wxDC& dc, int col ) { wxGrid::DrawColLabel(dc,col); + if (!IsSort()) return; int colLeft = GetColLeft(col); wxRect rect(colLeft, 0, GetColWidth(col), m_colLabelHeight); @@ -516,9 +517,11 @@ void ctlSQLGrid::OnLabelClick(wxGridEvent &event) if ( col >= 0 && (event.AltDown() ) ) { // continue for sort event - sqlResultTable *t=(sqlResultTable *)GetTable(); - t->setSortColumn(col); - return; + if (IsSort()) { + sqlResultTable *t=(sqlResultTable *)GetTable(); + t->setSortColumn(col); + return; + } } // add support for (de)selecting multiple rows and cols with Control pressed else if ( row >= 0 && (event.ControlDown() || event.CmdDown()) ) diff --git a/ctl/ctlSQLResult.cpp b/ctl/ctlSQLResult.cpp index 8a11058..f32aa5c 100644 --- a/ctl/ctlSQLResult.cpp +++ b/ctl/ctlSQLResult.cpp @@ -194,6 +194,7 @@ void ctlSQLResult::DisplayData(bool single) ProcessTableMessage(*msg); delete msg; table->initSort(); + SetSort(true); if (NumRows()<1000) { for(int row = 0; row < NumRows(); ++row) { if (row%2==0) { @@ -679,6 +680,7 @@ sqlResultTable::sqlResultTable() thread = NULL; colorder=NULL; maplines=NULL; + use_map=false; } int sqlResultTable::GetNumberRows() diff --git a/dlg/dlgFunction.cpp b/dlg/dlgFunction.cpp index be97289..ae359e7 100644 --- a/dlg/dlgFunction.cpp +++ b/dlg/dlgFunction.cpp @@ -927,7 +927,7 @@ wxString dlgFunction::GetSql() { if (isProcedure && GetArgs().IsEmpty()) { - sql += schema->GetQuotedPrefix() + qtIdent(GetName()); + sql += schema->GetQuotedPrefix() + qtIdent(GetName()) + wxT("()"); } else { diff --git a/include/ctl/ctlSQLGrid.h b/include/ctl/ctlSQLGrid.h index 16fc853..d60c8fb 100644 --- a/include/ctl/ctlSQLGrid.h +++ b/include/ctl/ctlSQLGrid.h @@ -36,6 +36,15 @@ public: { return true; }; + bool IsSort() + { + return isSort; + }; + void SetSort(bool flag) + { + isSort=flag; + }; + wxSize GetBestSize(int row, int col); void OnLabelDoubleClick(wxGridEvent &event); void OnLabelClick(wxGridEvent &event); @@ -65,6 +74,7 @@ private: ColKeySizeHashMap colSizes; // Max size for each column wxArrayInt colMaxSizes; + bool isSort; }; diff --git a/schema/pgFunction.cpp b/schema/pgFunction.cpp index 10d231f..80b503e 100644 --- a/schema/pgFunction.cpp +++ b/schema/pgFunction.cpp @@ -458,8 +458,8 @@ wxString pgProcedure::GetSql(ctlTree *browser) if (GetArgListWithNames().IsEmpty()) { - qtName = GetQuotedFullIdentifier(); - qtSig = GetQuotedFullIdentifier(); + qtName = GetQuotedFullIdentifier()+wxT("()"); + qtSig = GetQuotedFullIdentifier()+wxT("()"); } else {