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

bug fix

Browse source 
autocomlite fix
This commit is contained in:
levinsv 2018-12-11 19:26:21 +05:00
parent e8e1695246
commit 8cb8ff6af8
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Release/pgAdmin3.exe
View file

Binary file not shown.

25
ctl/ctlSQLBox.cpp
View file

@ -998,6 +998,7 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
int startsql=0;
// Roll back through the doc and highlight any unmatched braces
int tmp=pos;
list_table.Clear();
while ((pos--) >= 0)
{
ch = GetCharAt(pos);
@ -1012,7 +1013,8 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
if (match == wxSTC_INVALID_POSITION)
{
BraceBadLight(pos);
break;
event.Skip();
return;
} else
{
@ -1046,9 +1048,10 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
st != 1 &&st != 2 && st != 6 && st != 7)
{
match = BraceMatch(pos);
if (match == wxSTC_INVALID_POSITION)
if (match == wxSTC_INVALID_POSITION || (match>=pos))
{
break;
event.Skip();
return;
} else
{
pos=match-1;
@ -1059,7 +1062,7 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
int endtext= GetLength();
bool isfrom=false;
pos=startsql;
list_table.Clear();
ident.Clear();
while (pos<endtext) {
ch = GetCharAt(pos);
@ -1079,7 +1082,13 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
} else if (keyword.CmpNoCase(wxT("on"))==0) {
list_table.Append(wxT(","));
isfrom=false;
}else if (keyword.CmpNoCase(wxT("where"))==0) {
}else if (keyword.CmpNoCase(wxT("where"))==0
||keyword.CmpNoCase(wxT("group"))==0
||keyword.CmpNoCase(wxT("union"))==0
||keyword.CmpNoCase(wxT("limit"))==0
||keyword.CmpNoCase(wxT("for"))==0
||keyword.CmpNoCase(wxT("window"))==0
) {
//list_table.Append(ident);
isfrom=false;
break;
@ -1094,11 +1103,11 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
match = BraceMatch(pos);
if (match == wxSTC_INVALID_POSITION)
{
BraceBadLight(pos);
//BraceBadLight(pos);
break;
} else
{
pos=match;
if (match>pos) pos=match;
ident.Clear();
}
}
@ -1175,7 +1184,7 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev)
token=token.AfterLast('.');
found=token.CmpNoCase(alias)==0;
if (tokenizer.GetLastDelimiter()==' '&&found) {
table=token;
if (p==1) table=prev; else table=token;
break;
}
if ((tokenizer.GetLastDelimiter()==',')&&found) {

2
frm/frmQuery.cpp
View file

@ -747,7 +747,7 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
pgSet *functions;
wxString def_f;
wxString def_name;
functions = conn->ExecuteSet(wxT("select pg_get_function_arguments(oid) def,proname,pronargs nargs from pg_proc where pronargs<>0 order by proname,pronargs"));
functions = conn->ExecuteSet(wxT("select pg_get_function_arguments(oid) def,proname,pronargs nargs from pg_proc where pronargs>=0 order by proname,pronargs"));
if (functions)
{
//name_func.Init(true);