diff -ru tora-1.3.18/tobrowser.cpp tora-1.3.18-pg/tobrowser.cpp --- tora-1.3.18/tobrowser.cpp Mon Jun 6 15:19:47 2005 +++ tora-1.3.18-pg/tobrowser.cpp Tue Aug 15 08:48:19 2006 @@ -610,8 +610,8 @@ "7.3"); static toSQL SQLListTablesPgSQL("toBrowser:ListTables", "SELECT c.relname AS \"Table Name\"\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'r'" " ORDER BY \"Table Name\"", "", @@ -681,8 +681,8 @@ ""); static toSQL SQLTableInfoPgSQL("toBrowser:TableInformation", "SELECT c.*\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'r'\n" " AND c.relname = :f2", "", @@ -726,8 +726,8 @@ static toSQL SQLListViewPgSQL("toBrowser:ListView", "SELECT c.relname as View_Name\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'v'" " ORDER BY View_Name", "List the available views in a schema", @@ -748,8 +748,8 @@ "SapDB"); static toSQL SQLViewSQLPgSQL("toBrowser:ViewSQL", "SELECT pg_get_viewdef(c.relname)\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'v' AND c.relname = :f2", "Display SQL of a specified view", "7.1", @@ -781,8 +781,8 @@ ""); static toSQL SQLListIndexPgSQL("toBrowser:ListIndex", "SELECT c.relname AS \"Index Name\"\n" - "FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - "WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + "FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + "WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'i'\n" "ORDER BY \"Index Name\"", "", @@ -829,9 +829,9 @@ " format_type(a.atttypid, a.atttypmod) as FORMAT,\n" " a.attnotnull,\n" " a.atthasdef\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid,\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid,\n" " pg_attribute a\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND a.attrelid = c.oid AND c.relname = :f2\n" " AND a.attnum > 0\n" " ORDER BY a.attnum\n", @@ -868,8 +868,8 @@ static toSQL SQLListSequencePgSQL("toBrowser:ListSequence", "SELECT c.relname AS \"Sequence Name\"\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND c.relkind = 'S'\n" " ORDER BY \"Sequence Name\"", "List the available sequences in a schema", @@ -911,8 +911,8 @@ " CASE WHEN p.prorettype = 0 THEN 'PROCEDURE'\n" " ELSE 'FUNCTION'\n" " END AS Object_Type\n" - "FROM pg_proc p LEFT OUTER JOIN pg_user u ON p.proowner=u.usesysid\n" - "WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + "FROM pg_proc p LEFT OUTER JOIN pg_namespace n ON p.pronamespace=n.oid\n" + "WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" "ORDER BY Object_Name", "List the available Code objects in a schema", "7.1", @@ -927,8 +927,8 @@ ""); static toSQL SQLListSQLShortPgSQL("toBrowser:ListCodeShort", "SELECT p.proname AS Object_Name\n" - "FROM pg_proc p LEFT OUTER JOIN pg_user u ON p.proowner=u.usesysid\n" - "WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + "FROM pg_proc p LEFT OUTER JOIN pg_namespace n ON p.pronamespace=n.oid\n" + "WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" "ORDER BY Object_Name", "List the available Code objects in a schema, one column version", "7.1", @@ -952,8 +952,8 @@ // package code will be returnd for both Head and Body static toSQL SQLSQLHeadPgSQL("toBrowser:CodeHead", "SELECT p.prosrc\n" - "FROM pg_proc p LEFT OUTER JOIN pg_user u ON p.proowner=u.usesysid\n" - "WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + "FROM pg_proc p LEFT OUTER JOIN pg_namespace n ON p.pronamespace=n.oid\n" + "WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND p.proname = :f2\n", "Declaration of object", "7.1", @@ -966,8 +966,8 @@ static toSQL SQLSQLBodyPgSQL("toBrowser:CodeBody", "SELECT p.prosrc\n" - "FROM pg_proc p LEFT OUTER JOIN pg_user u ON p.proowner=u.usesysid\n" - "WHERE (u.usename = :f1 OR u.usesysid IS NULL)\n" + "FROM pg_proc p LEFT OUTER JOIN pg_namespace n ON p.pronamespace=n.oid\n" + "WHERE (n.nspname = :f1 OR n.oid IS NULL)\n" " AND p.proname = :f2\n", "Implementation of object", "7.1", diff -ru tora-1.3.18/toqsqlconnection.cpp tora-1.3.18-pg/toqsqlconnection.cpp --- tora-1.3.18/toqsqlconnection.cpp Mon May 2 15:10:25 2005 +++ tora-1.3.18-pg/toqsqlconnection.cpp Tue Aug 15 08:14:01 2006 @@ -107,9 +107,9 @@ static toSQL SQLListObjectsPgSQL("toQSqlConnection:ListObjects", "SELECT c.relname AS \"Tablename\",\n" - " u.usename AS \"Owner\",\n" + " n.nspname AS \"Owner\",\n" " c.relkind AS \"Type\"\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" " ORDER BY \"Tablename\"", "", "7.1", @@ -125,9 +125,9 @@ "SapDb"); static toSQL SQLListSynonyms("toQSqlConnection:ListSynonyms", - "SELECT c.relname AS \"Synonym\", u.usename AS \"Schema\", c.relname AS \"Object\"\n" - " FROM pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" - " ORDER BY u.usename, c.relname", + "SELECT c.relname AS \"Synonym\", n.nspname AS \"Schema\", c.relname AS \"Object\"\n" + " FROM pg_class c LEFT OUTER JOIN pg_namespace n ON c.relnamespace=n.oid\n" + " ORDER BY n.nspname, c.relname", "", "7.1", "PostgreSQL"); @@ -137,11 +137,11 @@ "from\n" " pg_attribute a,\n" " pg_description b,\n" - " pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" + " pg_class c LEFT OUTER JOIN pg_namespace n ON c.relowner=n.oid\n" "where\n" " a.oid=b.objoid\n" " and c.oid=a.attrelid\n" - " and (u.usename = :owner OR u.usesysid IS NULL)\n" + " and (u.nspname = :owner OR u.usesysid IS NULL)\n" " and c.relname=:table", "Get the available comments on columns of a table, " "must have same binds and columns", @@ -153,12 +153,12 @@ "from\n" " pg_attribute a,\n" " pg_description b,\n" - " pg_class c LEFT OUTER JOIN pg_user u ON c.relowner=u.usesysid\n" + " pg_class c LEFT OUTER JOIN pg_namespace n ON c.relowner=n.oid\n" "where\n" " a.attnum=b.objsubid\n" " and b.objoid=a.attrelid\n" " and c.oid=a.attrelid\n" - " and (u.usename = :owner OR u.usesysid IS NULL)\n" + " and (n.nspname = :owner OR u.usesysid IS NULL)\n" " and c.relname=:table", "", "7.2", diff -ru tora-1.3.18/utils.cpp tora-1.3.18-pg/utils.cpp --- tora-1.3.18/utils.cpp Wed Apr 20 22:40:30 2005 +++ tora-1.3.18-pg/utils.cpp Tue Aug 15 08:52:54 2006 @@ -108,7 +108,7 @@ ""); static toSQL SQLUserNamesPgSQL(toSQL::TOSQL_USERLIST, - "SELECT usename AS UserName FROM pg_user ORDER BY UserName", + "SELECT nspname AS UserName FROM pg_namespace ORDER BY nspname", "", "7.1", "PostgreSQL");