Browse Source

fcl-db: postgresql: add schema name into schema query.
stSysTables should return only system tables.

git-svn-id: trunk@23163 -

lacak 12 years ago
parent
commit
01753385e4
1 changed files with 6 additions and 6 deletions
  1. 6 6
      packages/fcl-db/src/sqldb/postgres/pqconnection.pp

+ 6 - 6
packages/fcl-db/src/sqldb/postgres/pqconnection.pp

@@ -1005,25 +1005,25 @@ begin
     stTables     : s := 'select '+
                           'relfilenode              as recno, '+
                           '''' + DatabaseName + ''' as catalog_name, '+
-                          '''''                     as schema_name, '+
+                          'nspname                  as schema_name, '+
                           'relname                  as table_name, '+
                           '0                        as table_type '+
                         'from '+
-                          'pg_class '+
+                          'pg_class c left join pg_namespace n on c.relnamespace=n.oid '+
                         'where '+
-                          '(relowner > 1) and relkind=''r''' +
+                          'relkind=''r''' +
                         'order by relname';
 
     stSysTables  : s := 'select '+
                           'relfilenode              as recno, '+
                           '''' + DatabaseName + ''' as catalog_name, '+
-                          '''''                     as schema_name, '+
+                          'nspname                  as schema_name, '+
                           'relname                  as table_name, '+
                           '0                        as table_type '+
                         'from '+
-                          'pg_class '+
+                          'pg_class c left join pg_namespace n on c.relnamespace=n.oid '+
                         'where '+
-                          'relkind=''r''' +
+                          'relkind=''r'' and nspname=''pg_catalog'' ' + // only system tables
                         'order by relname';
     stColumns    : s := 'select '+
                           'a.attnum                 as recno, '+