diff --git a/.gitignore b/.gitignore index 42cfb67..ad254bb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ Debug/* *.sbr *.obj *.cod -*.dll *.tlog *.7z *.bsc diff --git a/Release/libeay32.dll b/Release/libeay32.dll new file mode 100644 index 0000000..3573963 Binary files /dev/null and b/Release/libeay32.dll differ diff --git a/Release/libiconv-2.dll b/Release/libiconv-2.dll new file mode 100644 index 0000000..f7f78fc Binary files /dev/null and b/Release/libiconv-2.dll differ diff --git a/Release/libiconv.dll b/Release/libiconv.dll new file mode 100644 index 0000000..e5694fa Binary files /dev/null and b/Release/libiconv.dll differ diff --git a/Release/libintl-8.dll b/Release/libintl-8.dll new file mode 100644 index 0000000..4a69b7c Binary files /dev/null and b/Release/libintl-8.dll differ diff --git a/Release/libintl.dll b/Release/libintl.dll new file mode 100644 index 0000000..d2fb7d1 Binary files /dev/null and b/Release/libintl.dll differ diff --git a/Release/libpq.dll b/Release/libpq.dll new file mode 100644 index 0000000..adb4818 Binary files /dev/null and b/Release/libpq.dll differ diff --git a/Release/libxml2.dll b/Release/libxml2.dll new file mode 100644 index 0000000..80ff1fd Binary files /dev/null and b/Release/libxml2.dll differ diff --git a/Release/libxslt.dll b/Release/libxslt.dll new file mode 100644 index 0000000..03804fc Binary files /dev/null and b/Release/libxslt.dll differ diff --git a/Release/pgAdmin3.exe b/Release/pgAdmin3.exe index 33bee13..f59f030 100644 Binary files a/Release/pgAdmin3.exe and b/Release/pgAdmin3.exe differ diff --git a/Release/ssleay32.dll b/Release/ssleay32.dll new file mode 100644 index 0000000..e78aa94 Binary files /dev/null and b/Release/ssleay32.dll differ diff --git a/Release/wxbase28u_net_vc_custom.dll b/Release/wxbase28u_net_vc_custom.dll new file mode 100644 index 0000000..504100e Binary files /dev/null and b/Release/wxbase28u_net_vc_custom.dll differ diff --git a/Release/wxbase28u_vc_custom.dll b/Release/wxbase28u_vc_custom.dll new file mode 100644 index 0000000..001a06e Binary files /dev/null and b/Release/wxbase28u_vc_custom.dll differ diff --git a/Release/wxbase28u_xml_vc_custom.dll b/Release/wxbase28u_xml_vc_custom.dll new file mode 100644 index 0000000..59e17a5 Binary files /dev/null and b/Release/wxbase28u_xml_vc_custom.dll differ diff --git a/Release/wxmsw28u_adv_vc_custom.dll b/Release/wxmsw28u_adv_vc_custom.dll new file mode 100644 index 0000000..fe868fd Binary files /dev/null and b/Release/wxmsw28u_adv_vc_custom.dll differ diff --git a/Release/wxmsw28u_aui_vc_custom.dll b/Release/wxmsw28u_aui_vc_custom.dll new file mode 100644 index 0000000..ab77df9 Binary files /dev/null and b/Release/wxmsw28u_aui_vc_custom.dll differ diff --git a/Release/wxmsw28u_core_vc_custom.dll b/Release/wxmsw28u_core_vc_custom.dll new file mode 100644 index 0000000..ddb9e3b Binary files /dev/null and b/Release/wxmsw28u_core_vc_custom.dll differ diff --git a/Release/wxmsw28u_html_vc_custom.dll b/Release/wxmsw28u_html_vc_custom.dll new file mode 100644 index 0000000..4fcbe7e Binary files /dev/null and b/Release/wxmsw28u_html_vc_custom.dll differ diff --git a/Release/wxmsw28u_stc_vc_custom.dll b/Release/wxmsw28u_stc_vc_custom.dll new file mode 100644 index 0000000..ef4ce5d Binary files /dev/null and b/Release/wxmsw28u_stc_vc_custom.dll differ diff --git a/Release/wxmsw28u_xrc_vc_custom.dll b/Release/wxmsw28u_xrc_vc_custom.dll new file mode 100644 index 0000000..38cc5d9 Binary files /dev/null and b/Release/wxmsw28u_xrc_vc_custom.dll differ diff --git a/ctl/ctlSQLBox.cpp b/ctl/ctlSQLBox.cpp index 19846a5..d7b9f13 100644 --- a/ctl/ctlSQLBox.cpp +++ b/ctl/ctlSQLBox.cpp @@ -1172,6 +1172,7 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev) { wxString token = tokenizer.GetNextToken(); if (token.IsEmpty()) {p=0; continue;} + token=token.AfterLast('.'); found=token.CmpNoCase(alias)==0; if (tokenizer.GetLastDelimiter()==' '&&found) { table=token; diff --git a/pro_scheduler/pgproJob.cpp b/pro_scheduler/pgproJob.cpp index b154660..c220a3b 100644 --- a/pro_scheduler/pgproJob.cpp +++ b/pro_scheduler/pgproJob.cpp @@ -281,9 +281,9 @@ void pgproJob::ShowStatistics(frmMain *form, ctlListView *statistics) if ((bu==wxT("f"))||(!settings->GetASUTPstyle())||(DateToAnsiStr(GetStarted()).IsEmpty())) return ; 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 + + if (wxDTend.IsEmpty()) wxDTend=DateToAnsiStr(wxDateTime::Now()); + sql=wxT("select log_time,detail critical,message,application_name from pg_log l where l.log_time>'") + DateToAnsiStr(GetStarted())+ + wxT("'::timestamp - interval '1min' and l.log_time<='")+ wxDTend + wxT("'::timestamp and hint='")+GetTryName()+wxT("'"); pgSet *stats = GetConnection()->ExecuteSet(sql);