github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

PGSQL: Fixed schema introspection, SqlCtrl: SqlConsole overhaul finished #412

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8135 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-02-03 14:44:36 +00:00
parent 6e70fc4681
commit 10b8964d99
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/PostgreSQL/PostgreSQL.cpp
View file

@ -193,10 +193,10 @@ Vector<String> PostgreSQLSession::EnumUsers()
}
Vector<String> PostgreSQLSession::EnumDatabases()
{
{// For now, we really enumerate namespaces rather than databases here
Vector<String> vec;
Sql sql(*this);
sql.Execute("select datname from pg_database");
sql.Execute("select nspname from pg_namespace where nspacl is not null");
while(sql.Fetch())
vec.Add(sql[0]);
return vec;

11
uppsrc/SqlCtrl/SqlConsole.cpp
View file

@ -166,6 +166,7 @@ protected:
CodeEditor command;
Button execute;
Button schema;
Button csv;
ParentCtrl command_pane;
// CallbackSet hide;
Vector<int> cw;
@ -191,6 +192,7 @@ protected:
void RunScript(bool quiet);
void TraceMenu(Bar& menu);
void ObjectTree() { SQLObjectTree(cursor.GetSession()); }
void Csv();
class Exec;
friend class Exec;
@ -466,6 +468,11 @@ void SqlConsole::ListMenu(Bar& bar)
bar.Add(t_("Export..."), THISBACK(ListExport));
}
void SqlConsole::Csv()
{
SelectSaveFile("Csv\t*.csv", list.AsCsv());
}
void SqlConsole::ListPrintRow()
{
String qtf;
@ -591,6 +598,7 @@ SqlConsole::SqlConsole(SqlSession& session)
ecy = max(24, ecy);
command_pane.Add(execute.TopPos(0, ecy).RightPos(4, HorzLayoutZoom(90)));
command_pane.Add(schema.TopPos(ecy + 4, ecy).RightPos(4, HorzLayoutZoom(90)));
command_pane.Add(csv.TopPos(2 * ecy + 4, ecy).RightPos(4, HorzLayoutZoom(90)));
command.Highlight("sql");
schema.SetLabel(t_("&Schema"));
schema <<= THISBACK(ObjectTree);
@ -598,6 +606,9 @@ SqlConsole::SqlConsole(SqlSession& session)
execute <<= THISBACK1(Execute, NORMAL);
execute.SetImage(SqlConsoleImg::lightning());
execute.SetLabel(t_("Execute (F5)"));
csv <<= THISBACK(Csv);
csv.SetLabel(t_("Export.."));
csv.SetImage(SqlConsoleImg::database_save());
ActiveFocus(command);
}