github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Little fixes. Added a hotkey to generate.

Browse source 
Два первых шаблона генерации можно вызвать Ctrl+1 и Ctrl+2 соответственно.
This commit is contained in:
lsv 2026-01-21 17:33:36 +05:00
parent adeaccf225
commit b5ec421085
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
frm/frmQuery.cpp
View file

@ -575,20 +575,22 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
entries[idx++].Set(wxACCEL_CTRL, (int)'E', MNU_EXECUTE);
entries[idx++].Set(wxACCEL_CTRL, (int)'O', MNU_OPEN);
entries[idx++].Set(wxACCEL_CTRL, (int)'S', MNU_SAVE);
entries[idx++].Set(wxACCEL_CMD, (int)'S', MNU_SAVE);
entries[idx++].Set(wxACCEL_CTRL, (int)'F', MNU_FIND);
entries[idx++].Set(wxACCEL_CTRL, (int)'R', MNU_REPLACE);
entries[idx++].Set(wxACCEL_NORMAL, WXK_F8, MNU_EXECUTE);
entries[idx++].Set(wxACCEL_NORMAL, WXK_F7, MNU_EXPLAIN);
entries[idx++].Set(wxACCEL_ALT, WXK_PAUSE, MNU_CANCEL);
entries[idx++].Set(wxACCEL_CTRL, (int)'A', MNU_SELECTALL);
entries[idx++].Set(wxACCEL_CMD, (int)'A', MNU_SELECTALL);
entries[idx++].Set(wxACCEL_NORMAL, WXK_F1, MNU_HELP);
entries[idx++].Set(wxACCEL_CTRL, (int)'N', MNU_NEW);
entries[idx++].Set(wxACCEL_NORMAL, WXK_F6, MNU_EXECPGS);
entries[idx++].Set(wxACCEL_NORMAL, WXK_F5, MNU_EXECFILE);
entries[idx++].Set(wxACCEL_CTRL, (int)'T', MNU_NEWSQLTAB);
entries[idx++].Set(wxACCEL_CTRL, (int)'1', MNU_GENERATESQL+1);
entries[idx++].Set(wxACCEL_CTRL, (int)'2', MNU_GENERATESQL+2);
wxAcceleratorTable accel(idx, entries);
SetAcceleratorTable(accel);
wxLogInfo(wxT("frmQuery::Create key map Ok"));
@ -2311,14 +2313,17 @@ void frmQuery::OnCopy_WhereList(wxCommandEvent& ev)
void frmQuery::OnGenerateInvoke(wxCommandEvent& ev)
{
// if (currentControl() == sqlResult)
int id=ev.GetId();
wxMenu* mi = static_cast<wxMenu*>(ev.GetEventObject());
wxString templ = mi->GetHelpString(id);
int id=ev.GetId()-MNU_GENERATESQL-1;
wxString s = _("No template generate.");
//wxMenu* mi = static_cast<wxMenu*>(ev.GetEventObject());
if (id>=0 && id<body_template.Count() ) {
{
wxString s = wxT("Where list format copy buffer.");
wxString templ = body_template[id];
s=sqlResult->GenerateTemplate(templ,0);
SetStatusText(s, STATUSPOS_MSGS);
}
} else
SetStatusText(s, STATUSPOS_MSGS);
}
void frmQuery::OnCopy_TableToHtml(wxCommandEvent& ev)
{
@ -4577,7 +4582,8 @@ void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent& event)
}
if (sqlQueryBook->GetPageCount() > 1)
{
size_t curpage = sqlQueryBook->GetSelection();
int curpage = sqlQueryBook->GetSelection();
if (curpage!=wxNOT_FOUND) {
sqlQuery = wxDynamicCast(sqlQueryBook->GetPage(curpage), ctlSQLBox);
if (sqlQuery != NULL)
{
@ -4587,6 +4593,7 @@ void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent& event)
}
}
}
}
void frmQuery::OnSqlBookAddPage(wxCommandEvent &event)
{
if (SqlBookCanChangePage()) {

2
tests/test_Formatter.cpp
View file

@ -317,7 +317,7 @@ delete from t2 using t4,t5 where t4.id=t5 and t2.id=t4.id returning t2.id;
end
)");
std::vector<complite_element> list = f2.ParsePLpgsql(); o=f2.GetListTable(list);
exp = "[ f1,] \n[ f2,] \n[ tab1,] \n[ f3,] \n[ f4,] \n[ t2,] \n[ t5,] \n";
exp = "[ f1,] \n[ f2,] \n[ tab1,] \n[ f3,] \n[ f4,] \n[ t2,] \n[ t4,] \n[ t5,] \n";
CHECK(o==exp);
}