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

Minor Sqlite-related fixes and improvements; new helper HttpContentDisposition to simplify generation of http response headers

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1881 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2010-01-12 13:53:13 +00:00
parent fbcd317e2e
commit 8132cd7f9f
8 changed files with 89 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/Oracle/OraCommon.cpp
View file

@ -270,12 +270,10 @@ Vector<String> OracleSchemaUsers(Sql& cursor)
Vector<String> OracleSchemaTables(Sql& cursor, String database)
{
Vector<String> out;
SqlSelect sel;
if(!IsNull(database))
sel = Select(SqlId("TABLE_NAME")).From(SqlId("ALL_TABLES")).Where(SqlId("OWNER") == database);
else
sel = Select(SqlId("TABLE_NAME")).From(SqlId("USER_TABLES"));
if(sel.Execute(cursor))
if(Select(SqlId("TABLE_NAME"))
.From(SqlId("ALL_TABLES"))
.Where(SqlId("OWNER") == Nvl(database, cursor.GetUser()))
.Execute(cursor))
out = FetchList(cursor);
return out;
}
@ -283,7 +281,10 @@ Vector<String> OracleSchemaTables(Sql& cursor, String database)
Vector<String> OracleSchemaViews(Sql& cursor, String database)
{
Vector<String> out;
if(Select(SqlId("VIEW_NAME")).From(SqlId("ALL_VIEWS")).Where(SqlId("OWNER") == database).Execute(cursor))
if(Select(SqlId("VIEW_NAME"))
.From(SqlId("ALL_VIEWS"))
.Where(SqlId("OWNER") == Nvl(database, cursor.GetUser()))
.Execute(cursor))
out = FetchList(cursor);
return out;
}
@ -291,7 +292,10 @@ Vector<String> OracleSchemaViews(Sql& cursor, String database)
Vector<String> OracleSchemaSequences(Sql& cursor, String database)
{
Vector<String> out;
if(Select(SqlId("SEQUENCE_NAME")).From(SqlId("ALL_SEQUENCES")).Where(SqlId("SEQUENCE_OWNER") == database).Execute(cursor))
if(Select(SqlId("SEQUENCE_NAME"))
.From(SqlId("ALL_SEQUENCES"))
.Where(SqlId("SEQUENCE_OWNER") == Nvl(database, cursor.GetUser()))
.Execute(cursor))
out = FetchList(cursor);
return out;
}
@ -299,12 +303,13 @@ Vector<String> OracleSchemaSequences(Sql& cursor, String database)
Vector<String> OracleSchemaPrimaryKey(Sql& cursor, String database, String table)
{
Vector<String> out;
String udb = Nvl(database, cursor.GetUser());
if(Select(SqlId("COLUMN_NAME")).From(SqlId("ALL_CONS_COLUMNS"))
.Where(SqlId("OWNER") == database && SqlId("TABLE_NAME") == table
.Where(SqlId("OWNER") == udb && SqlId("TABLE_NAME") == table
&& SqlId("CONSTRAINT_NAME") ==
Select(SqlId("CONSTRAINT_NAME"))
.From(SqlId("ALL_CONSTRAINTS"))
.Where(SqlId("OWNER") == database && SqlId("TABLE_NAME") == table
.Where(SqlId("OWNER") == udb && SqlId("TABLE_NAME") == table
&& SqlId("CONSTRAINT_TYPE") == "P")
).OrderBy(SqlId("POSITION"))
.Execute(cursor))