database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Fix two bugs in funcs.source that made the tutorial script fail.

Browse Source 
Make a LOT of fixes to syscat.source to:

* Set search_path properly (and reset it)
* Add schema name to all results
* Add schema name to ORDER BY first
* Make checks for user-defined objects match reality
* format_type all type names
* Respect attisdropped
* Change !~ to 'not like' since it's more standard


Christopher Kings-Lynne
This commit is contained in:
Bruce Momjian
2003-10-26 04:51:51 +00:00
parent b3a10a88d7
commit 3c9a32d4a2
2 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tutorial/funcs.source
View File

@ -6,7 +6,7 @@
-- --
-- Copyright (c) 1994-5, Regents of the University of California -- Copyright (c) 1994-5, Regents of the University of California
-- --
-- $Id: funcs.source,v 1.5 2001/10/26 20:45:33 tgl Exp $ -- $Id: funcs.source,v 1.6 2003/10/26 04:51:51 momjian Exp $
-- --
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
@ -153,10 +153,11 @@ DROP FUNCTION c_overpaid(EMP, int4);
DROP FUNCTION copytext(text); DROP FUNCTION copytext(text);
DROP FUNCTION makepoint(point,point); DROP FUNCTION makepoint(point,point);
DROP FUNCTION add_one(int4); DROP FUNCTION add_one(int4);
DROP FUNCTION clean_EMP(); --DROP FUNCTION clean_EMP();
DROP FUNCTION high_pay(); DROP FUNCTION high_pay();
DROP FUNCTION new_emp(); DROP FUNCTION new_emp();
DROP FUNCTION add_em(int4, int4); DROP FUNCTION add_em(int4, int4);
DROP FUNCTION one(); DROP FUNCTION one();
DROP FUNCTION double_salary(EMP);
DROP TABLE EMP; DROP TABLE EMP;

137
src/tutorial/syscat.source
View File

@ -7,10 +7,16 @@
-- Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group -- Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
-- Portions Copyright (c) 1994, Regents of the University of California -- Portions Copyright (c) 1994, Regents of the University of California
-- --
-- $Id: syscat.source,v 1.9 2003/08/04 23:59:41 tgl Exp $ -- $Id: syscat.source,v 1.10 2003/10/26 04:51:51 momjian Exp $
-- --
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
--
-- Sets the schema search path to pg_catalog first, so that we do not
-- need to qualify every system object
--
SET SEARCH_PATH TO pg_catalog;
-- --
-- lists the name of all database adminstrators and the name of their -- lists the name of all database adminstrators and the name of their
-- database(s) -- database(s)
@ -23,117 +29,140 @@ SELECT usename, datname
-- --
-- lists all user-defined classes -- lists all user-defined classes
-- --
SELECT relname SELECT pgn.nspname, pgc.relname
FROM pg_class FROM pg_class pgc, pg_namespace pgn
WHERE relkind = 'r' -- not indices, views, etc WHERE pgc.relnamespace=pgn.oid
and relname !~ '^pg_' -- not catalogs and pgc.relkind = 'r' -- not indices, views, etc
ORDER BY relname; and pgn.nspname not like 'pg_%' -- not catalogs
and pgn.nspname != 'information_schema' -- not information_schema
ORDER BY nspname, relname;
-- --
-- lists all simple indices (ie. those that are defined over one simple -- lists all simple indices (ie. those that are defined over one simple
-- column reference) -- column reference)
-- --
SELECT bc.relname AS class_name, SELECT n.nspname AS schema_name,
bc.relname AS class_name,
ic.relname AS index_name, ic.relname AS index_name,
a.attname a.attname
FROM pg_class bc, -- base class FROM pg_namespace n,
pg_class bc, -- base class
pg_class ic, -- index class pg_class ic, -- index class
pg_index i, pg_index i,
pg_attribute a -- att in base pg_attribute a -- att in base
WHERE i.indrelid = bc.oid WHERE bc.relnamespace = n.oid
and i.indrelid = bc.oid
and i.indexrelid = ic.oid and i.indexrelid = ic.oid
and i.indkey[0] = a.attnum and i.indkey[0] = a.attnum
and i.indnatts = 1 and i.indnatts = 1
and a.attrelid = bc.oid and a.attrelid = bc.oid
ORDER BY class_name, index_name, attname; ORDER BY schema_name, class_name, index_name, attname;
-- --
-- lists the user-defined attributes and their types for all user-defined -- lists the user-defined attributes and their types for all user-defined
-- classes -- classes
-- --
SELECT c.relname, a.attname, t.typname SELECT n.nspname, c.relname, a.attname, format_type(t.oid, null) as typname
FROM pg_class c, pg_attribute a, pg_type t FROM pg_namespace n, pg_class c,
WHERE c.relkind = 'r' -- no indices pg_attribute a, pg_type t
and c.relname !~ '^pg_' -- no catalogs WHERE n.oid = c.relnamespace
and c.relkind = 'r' -- no indices
and n.nspname not like 'pg_%' -- no catalogs
and n.nspname != 'information_schema' -- no information_schema
and a.attnum > 0 -- no system att's and a.attnum > 0 -- no system att's
and not a.attisdropped -- no dropped columns
and a.attrelid = c.oid and a.attrelid = c.oid
and a.atttypid = t.oid and a.atttypid = t.oid
ORDER BY relname, attname; ORDER BY nspname, relname, attname;
-- --
-- lists all user-defined base types (not including array types) -- lists all user-defined base types (not including array types)
-- --
SELECT u.usename, t.typname SELECT n.nspname, u.usename, format_type(t.oid, null) as typname
FROM pg_type t, pg_user u FROM pg_type t, pg_user u, pg_namespace n
WHERE u.usesysid = t.typowner WHERE u.usesysid = t.typowner
and t.typnamespace = n.oid
and t.typrelid = '0'::oid -- no complex types and t.typrelid = '0'::oid -- no complex types
and t.typelem = '0'::oid -- no arrays and t.typelem = '0'::oid -- no arrays
and u.usename <> 'postgres' and n.nspname not like 'pg_%' -- no catalogs
ORDER BY usename, typname; and n.nspname != 'information_schema' -- no information_schema
ORDER BY nspname, usename, typname;
-- --
-- lists all left unary operators -- lists all left unary operators
-- --
SELECT o.oprname AS left_unary, SELECT n.nspname, o.oprname AS left_unary,
right_type.typname AS operand, format_type(right_type.oid, null) AS operand,
result.typname AS return_type format_type(result.oid, null) AS return_type
FROM pg_operator o, pg_type right_type, pg_type result FROM pg_namespace n, pg_operator o,
WHERE o.oprkind = 'l' -- left unary pg_type right_type, pg_type result
WHERE o.oprnamespace = n.oid
and o.oprkind = 'l' -- left unary
and o.oprright = right_type.oid and o.oprright = right_type.oid
and o.oprresult = result.oid and o.oprresult = result.oid
ORDER BY operand; ORDER BY nspname, operand;
-- --
-- lists all right unary operators -- lists all right unary operators
-- --
SELECT o.oprname AS right_unary, SELECT n.nspname, o.oprname AS right_unary,
left_type.typname AS operand, format_type(left_type.oid, null) AS operand,
result.typname AS return_type format_type(result.oid, null) AS return_type
FROM pg_operator o, pg_type left_type, pg_type result FROM pg_namespace n, pg_operator o,
WHERE o.oprkind = 'r' -- right unary pg_type left_type, pg_type result
WHERE o.oprnamespace = n.oid
and o.oprkind = 'r' -- right unary
and o.oprleft = left_type.oid and o.oprleft = left_type.oid
and o.oprresult = result.oid and o.oprresult = result.oid
ORDER BY operand; ORDER BY nspname, operand;
-- --
-- lists all binary operators -- lists all binary operators
-- --
SELECT o.oprname AS binary_op, SELECT n.nspname, o.oprname AS binary_op,
left_type.typname AS left_opr, format_type(left_type.oid, null) AS left_opr,
right_type.typname AS right_opr, format_type(right_type.oid, null) AS right_opr,
result.typname AS return_type format_type(result.oid, null) AS return_type
FROM pg_operator o, pg_type left_type, pg_type right_type, pg_type result FROM pg_namespace n, pg_operator o, pg_type left_type,
WHERE o.oprkind = 'b' -- binary pg_type right_type, pg_type result
WHERE o.oprnamespace = n.oid
and o.oprkind = 'b' -- binary
and o.oprleft = left_type.oid and o.oprleft = left_type.oid
and o.oprright = right_type.oid and o.oprright = right_type.oid
and o.oprresult = result.oid and o.oprresult = result.oid
ORDER BY left_opr, right_opr; ORDER BY nspname, left_opr, right_opr;
-- --
-- lists the name, number of arguments and the return type of all user-defined -- lists the name, number of arguments and the return type of all user-defined
-- C functions -- C functions
-- --
SELECT p.proname, p.pronargs, t.typname SELECT n.nspname, p.proname, p.pronargs, format_type(t.oid, null) as return_type
FROM pg_proc p, pg_language l, pg_type t FROM pg_namespace n, pg_proc p,
WHERE p.prolang = l.oid pg_language l, pg_type t
WHERE p.pronamespace = n.oid
and n.nspname not like 'pg_%' -- no catalogs
and n.nspname != 'information_schema' -- no information_schema
and p.prolang = l.oid
and p.prorettype = t.oid and p.prorettype = t.oid
and l.lanname = 'c' and l.lanname = 'c'
ORDER BY proname; ORDER BY nspname, proname, pronargs, return_type;
-- --
-- lists all aggregate functions and the types to which they can be applied -- lists all aggregate functions and the types to which they can be applied
-- --
SELECT p.proname, t.typname SELECT n.nspname, p.proname, format_type(t.oid, null) as typname
FROM pg_aggregate a, pg_proc p, pg_type t FROM pg_namespace n, pg_aggregate a,
WHERE a.aggfnoid = p.oid pg_proc p, pg_type t
WHERE p.pronamespace = n.oid
and a.aggfnoid = p.oid
and p.proargtypes[0] = t.oid and p.proargtypes[0] = t.oid
ORDER BY proname, typname; ORDER BY nspname, proname, typname;
-- --
@ -141,9 +170,17 @@ SELECT p.proname, t.typname
-- as well as the operators that cn be used with the respective operator -- as well as the operators that cn be used with the respective operator
-- classes -- classes
-- --
SELECT am.amname, opc.opcname, opr.oprname SELECT n.nspname, am.amname, opc.opcname, opr.oprname
FROM pg_am am, pg_opclass opc, pg_amop amop, pg_operator opr FROM pg_namespace n, pg_am am, pg_opclass opc,
WHERE opc.opcamid = am.oid pg_amop amop, pg_operator opr
WHERE opc.opcnamespace = n.oid
and opc.opcamid = am.oid
and amop.amopclaid = opc.oid and amop.amopclaid = opc.oid
and amop.amopopr = opr.oid and amop.amopopr = opr.oid
ORDER BY amname, opcname, oprname; ORDER BY nspname, amname, opcname, oprname;
--
-- Reset the search path
--
RESET SEARCH_PATH;