From bc3cb0bc3161a02413f6df8611a60665348a762e Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 12 Aug 2006 20:07:34 +0000 Subject: [PATCH] r11016: * sql/generic-postgresql.lisp: Revert patch from Joel Reymont since it fails on versions of postgresql that lack the pg_role table --- ChangeLog | 2 ++ sql/generic-postgresql.lisp | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65d2952..c7394da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ as name candidates. * db-odbc/odbc-api.lisp: Work-around Allegro/Windows FFI bug that generates incorrect integer return type + * sql/generic-postgresql.lisp: Revert patch from Joel Reymont since + it fails on versions of postgresql that lack the pg_role table 07 Jul 2006 Kevin Rosenberg * Version 3.6.3 diff --git a/sql/generic-postgresql.lisp b/sql/generic-postgresql.lisp index 5e3e177..4958eaa 100644 --- a/sql/generic-postgresql.lisp +++ b/sql/generic-postgresql.lisp @@ -77,8 +77,12 @@ (mapcar #'car (database-query (format nil + "SELECT relname FROM pg_class WHERE (relkind = '~A')~A" + #+nil (if (not (eq owner :all)) - " + ;; The below query fails on versions of postgresql + ;; (such as 7.4) that lack the pg_roles table + " SELECT c.relname FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_roles r ON r.oid = c.relowner @@ -87,7 +91,7 @@ AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid) ~A" - "SELECT relname FROM pg_class WHERE (relkind = + "SELECT relname FROM pg_class WHERE (relkind = '~A')~A") type (owner-clause owner)) -- 2.34.1