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

bug fix

Browse source
This commit is contained in:
levinsv 2019-07-07 22:00:57 +05:00
parent d5dab18175
commit 339a4f777e
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Release_(3.0)/pgAdmin3.exe
View file

Binary file not shown.

17
dlg/dlgSearchObject.cpp
View file

@ -75,6 +75,7 @@ dlgSearchObject::dlgSearchObject(frmMain *p, pgDatabase *db, pgObject *obj)
aMap[_("Rules")] = wxT("Rules");
aMap[_("Indexes")] = wxT("Indexes");
aMap[_("Functions")] = wxT("Functions");
aMap[_("Procedures")] = wxT("Procedures");
aMap[_("Aggregates")] = wxT("Aggregates");
aMap[_("Trigger Functions")] = wxT("Trigger Functions");
aMap[_("Constraints")] = wxT("Constraints");
@ -144,6 +145,10 @@ dlgSearchObject::dlgSearchObject(frmMain *p, pgDatabase *db, pgObject *obj)
cbType->Append(_("Extensions"));
cbType->Append(_("Collations"));
}
if(currentdb->BackendMinimumVersion(10, 0))
{
cbType->Append(_("Procedures"));
}
cbSchema->Clear();
cbSchema->Append(_("All schemas"));
@ -386,8 +391,8 @@ void dlgSearchObject::OnSearch(wxCommandEvent &ev)
wxT(" LEFT OUTER JOIN pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) ")
wxT(" WHERE contype IS NULL ")
wxT(" UNION ")
wxT(" SELECT CASE WHEN t.typname = 'trigger' THEN 'Trigger Functions' ELSE 'Functions' END AS type, p.proname, ")
wxT(" ':Schemas/' || n.nspname || '/' || case when t.typname = 'trigger' then ':Trigger Functions' else ':Functions' end || '/' || p.proname, n.nspname ")
wxT(" SELECT CASE WHEN t.typname = 'trigger' THEN 'Trigger Functions' ELSE case when p.prokind='p' then 'Procedures' else 'Functions' end END AS type, p.proname, ")
wxT(" ':Schemas/' || n.nspname || '/' || case when t.typname = 'trigger' then ':Trigger Functions' else case when p.prokind='p' then ':Procedures' else ':Functions' end end || '/' || p.proname, n.nspname ")
wxT(" from pg_proc p ")
wxT(" left join pg_namespace n on p.pronamespace = n.oid ")
wxT(" left join pg_type t on p.prorettype = t.oid ")
@ -530,8 +535,8 @@ void dlgSearchObject::OnSearch(wxCommandEvent &ev)
searchSQL += wxT("UNION \n");
nextMode = true;
searchSQL += wxT("SELECT * FROM ( ") // Function's source code
wxT(" SELECT CASE WHEN t.typname = 'trigger' THEN 'Trigger Functions' ELSE 'Functions' END AS type, p.proname as objectname, ")
wxT(" ':Schemas/' || n.nspname || '/' || case when t.typname = 'trigger' then ':Trigger Functions' else ':Functions' end || '/' || p.proname as path, n.nspname ")
wxT(" SELECT CASE WHEN t.typname = 'trigger' THEN 'Trigger Functions' ELSE case when p.prokind='p' then 'Procedures' else 'Functions' end END AS type, p.proname as objectname, ")
wxT(" ':Schemas/' || n.nspname || '/' || case when t.typname = 'trigger' then ':Trigger Functions' else case when p.prokind='p' then ':Procedures' else ':Functions' end end || '/' || p.proname as path, n.nspname ")
wxT(" from pg_proc p ")
wxT(" left join pg_namespace n on p.pronamespace = n.oid ")
wxT(" left join pg_type t on p.prorettype = t.oid ")
@ -636,10 +641,10 @@ void dlgSearchObject::OnSearch(wxCommandEvent &ev)
wxT(" LEFT OUTER JOIN pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0)")
wxT(" WHERE contype IS NULL")
wxT(" UNION")
wxT(" select case when p_t.typname = 'trigger' THEN 'Trigger Functions' ELSE 'Functions' end as type,")
wxT(" select CASE WHEN p_t.typname = 'trigger' THEN 'Trigger Functions' ELSE case when p.prokind='p' then 'Procedures' else 'Functions' end END AS type,")
wxT(" p_.proname AS objectname,")
wxT(" ':Schemas/' || n.nspname || '/' ||")
wxT(" case when p_t.typname = 'trigger' then ':Trigger Functions/' else ':Functions/' end || p_.proname AS path, n.nspname")
wxT(" case when p_t.typname = 'trigger' then ':Trigger Functions/' else case when p.prokind='p' then ':Procedures/' else ':Functions/' end end || p_.proname AS path, n.nspname")
wxT(" from ") + pd +
wxT(" join pg_proc p_ on pd.relname = 'pg_proc' and pd.objoid = p_.oid and p_.prokind <> 'a'")
wxT(" left join pg_type p_t on p_.prorettype = p_t.oid")

5
frm/frmOptions.cpp
View file

@ -789,7 +789,10 @@ void frmOptions::OnOK(wxCommandEvent &ev)
if (pickerBlockedProcessColour->GetColourString() != settings->GetBlockedProcessColour())
changed = true;
settings->SetBlockedProcessColour(pickerBlockedProcessColour->GetColourString());
settings->SetBlockedbyProcessColour(pickerBlockedProcessColour->GetColourString());
if (pickerBlockedbyProcessColour->GetColourString() != settings->GetBlockedbyProcessColour())
changed = true;
settings->SetBlockedbyProcessColour(pickerBlockedbyProcessColour->GetColourString());
// Change files' location
settings->SetFavouritesFile(pickerFavouritesFile->GetPath());

2
frm/frmStatus.cpp
View file

@ -1660,7 +1660,7 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event)
// Clear the queries array content
queries.Clear();
wxString blocked;
wxString blocked=wxT("");
wxArrayLong pids;
while (!dataSet1->Eof())
{