diff --git a/Release/pgAdmin3.exe b/Release/pgAdmin3.exe index 74bd7e5..777f817 100644 Binary files a/Release/pgAdmin3.exe and b/Release/pgAdmin3.exe differ diff --git a/frm/frmStatus.cpp b/frm/frmStatus.cpp index 3253cc1..db9f6c7 100644 --- a/frm/frmStatus.cpp +++ b/frm/frmStatus.cpp @@ -2059,7 +2059,7 @@ void frmStatus::OnRefreshQuerystateTimer(wxTimerEvent &event) sql = wxT("select pid,frame_number,query_text,unnest(string_to_array(plan, E'\n')) pln,leader_pid from pg_query_state(") +pid+flags+wxT(") s"); - pgSet *dataSet3 = connection->ExecuteSet(sql); + pgSet *dataSet3 = connection->ExecuteSet(sql,false); if (dataSet3) { statusBar->SetStatusText(_("Refreshing query state list.")); diff --git a/pro_scheduler/pgproJob.cpp b/pro_scheduler/pgproJob.cpp index 549ea2c..b154660 100644 --- a/pro_scheduler/pgproJob.cpp +++ b/pro_scheduler/pgproJob.cpp @@ -278,9 +278,9 @@ void pgproJob::ShowStatistics(frmMain *form, ctlListView *statistics) statistics->AddColumn(_("Critical"), 30); statistics->AddColumn(_("Message"), 300); statistics->AddColumn(_("Stage"), 40); - if ((bu==wxT("f"))||(!settings->GetASUTPstyle())||(DateToStr(GetStarted()).IsEmpty())) return ; + if ((bu==wxT("f"))||(!settings->GetASUTPstyle())||(DateToAnsiStr(GetStarted()).IsEmpty())) return ; - wxString wxDTend = DateToStr(GetFinished()); + wxString wxDTend = DateToAnsiStr(GetFinished()); if (wxDTend.IsEmpty()) wxDTend=DateToStr(wxDateTime::Now()); sql=wxT("select log_time,detail critical,message,application_name from pg_log l where l.log_time>'") + DateToStr(GetStarted())+ wxT("'::timestamp - interval '1min' and l.log_time<'")+ wxDTend +