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

fix UI autocomplite

Browse source 
Изменён порядок колонок при подстановке alias.* на порядок
 указаный при создании таблицы.
This commit is contained in:
lsv 2024-12-06 10:28:49 +05:00 • committed by lsv
parent 1f3c598d61
commit 72eee5fe28
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ctl/ctlSQLBox.cpp
View file

@ -1597,7 +1597,7 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev)
sch = " and relnamespace =" + qtConnString(sch) + "::regnamespace";
}
if (tabn[0] == '"') tabn.Replace("\"", ""); else tabn = tabn.Lower();
wxString sql2 = wxT("select string_agg(a.attname,E'\t' ORDER BY attname) from pg_attribute a where a.attrelid = (select oid from pg_class p where relname=") + qtConnString(tabn) + sch
wxString sql2 = wxT("select string_agg(a.attname,E'\t') from pg_attribute a where a.attrelid = (select oid from pg_class p where relname=") + qtConnString(tabn) + sch
+ wxT(") and a.attisdropped IS FALSE and a.attnum>=0 ") + flt
+ wxT("");
//pgSet *res = m_database->ExecuteSet(sql);
@ -1610,8 +1610,13 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev)
int npos = pos - 2 - field.Len();
DeleteRange(npos, field.Len() + 2);
InsertText(npos, field + "."+r);
} else
}
else {
wxArrayString sort=wxSplit(r, '\t');
sort.Sort();
r=wxJoin(sort, '\t');
AutoCompShow(l2, r);
}
}
return;
}