mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bogosity in the tutorial examples.

Browse Source
This commit is contained in:
Tom Lane 2000-03-28 02:49:19 +00:00
parent 081cba45e6
commit 1f7ba1ebaf
3 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tutorial/Makefile
View File

@ -4,22 +4,14 @@
# Makefile for tutorial
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.8 1998/03/01 04:52:55 scrappy Exp $
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.9 2000/03/28 02:49:19 tgl Exp $
#
#-------------------------------------------------------------------------
SRCDIR= ..
include ../Makefile.global
include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(LIBPQDIR) -I../../include
#
# And where libpq goes, so goes the authentication stuff...
#
ifdef KRBVERS
LDFLAGS+= $(KRBLIBS)
CFLAGS+= $(KRBFLAGS)
endif
CFLAGS+= -I$(SRCDIR)/include $(CFLAGS_SL)
#
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
@ -42,7 +34,5 @@ all: $(DLOBJS) $(QUERIES)
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < $< > $@
funcs.sql: $(DLOBJS)
clean:
rm -f $(DLOBJS) $(QUERIES)

28
src/tutorial/complex.source
View File

@ -7,7 +7,7 @@
--
-- Copyright (c) 1994, Regents of the University of California
--
-- $Id: complex.source,v 1.6 2000/01/24 07:16:48 tgl Exp $
-- $Id: complex.source,v 1.7 2000/03/28 02:49:19 tgl Exp $
--
---------------------------------------------------------------------------
@ -18,7 +18,7 @@
-- called 'complex' which represents complex numbers.
-----------------------------
-- Assume the user defined functions are in _OBJWD_/complex.so
-- Assume the user defined functions are in _OBJWD_/complex_DLSUFFIX_
-- Look at $PWD/complex.c for the source.
-- the input function 'complex_in' takes a null-terminated string (the
@ -28,7 +28,7 @@
CREATE FUNCTION complex_in(opaque)
RETURNS complex
AS '_OBJWD_/complex.so'
AS '_OBJWD_/complex_DLSUFFIX_'
LANGUAGE 'c';
-- the output function 'complex_out' takes the internal representation and
@ -36,7 +36,7 @@ CREATE FUNCTION complex_in(opaque)
CREATE FUNCTION complex_out(opaque)
RETURNS opaque
AS '_OBJWD_/complex.so'
AS '_OBJWD_/complex_DLSUFFIX_'
LANGUAGE 'c';
-- now, we can create the type. The internallength specifies the size of the
@ -80,7 +80,7 @@ SELECT * FROM test_complex;
-- first, define a function complex_add (also in complex.c)
CREATE FUNCTION complex_add(complex, complex)
RETURNS complex
AS '_OBJWD_/complex.so'
AS '_OBJWD_/complex_DLSUFFIX_'
LANGUAGE 'c';
-- we can now define the operator. We show a binary operator here but you
@ -138,15 +138,15 @@ SELECT 'READ ABOVE!' AS STOP;
-- first, define the required operators
CREATE FUNCTION complex_abs_lt(complex, complex) RETURNS bool
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION complex_abs_le(complex, complex) RETURNS bool
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION complex_abs_eq(complex, complex) RETURNS bool
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION complex_abs_ge(complex, complex) RETURNS bool
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION complex_abs_gt(complex, complex) RETURNS bool
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
CREATE OPERATOR < (
leftarg = complex, rightarg = complex, procedure = complex_abs_lt,
@ -169,9 +169,11 @@ CREATE OPERATOR > (
restrict = scalargtsel, join = scalargtjoinsel
);
INSERT INTO pg_opclass VALUES ('complex_abs_ops');
INSERT INTO pg_opclass (opcname, opcdeftype)
SELECT 'complex_abs_ops', oid FROM pg_type WHERE typname = 'complex';
SELECT oid, opcname FROM pg_opclass WHERE opcname = 'complex_abs_ops';
SELECT oid, opcname, opcdeftype
FROM pg_opclass WHERE opcname = 'complex_abs_ops';
SELECT o.oid AS opoid, o.oprname
INTO TABLE complex_ops_tmp
@ -214,7 +216,7 @@ INSERT INTO pg_amop (amopid, amopclaid, amopopr, amopstrategy)
--
CREATE FUNCTION complex_abs_cmp(complex, complex) RETURNS int4
AS '_OBJWD_/complex.so' LANGUAGE 'c';
AS '_OBJWD_/complex_DLSUFFIX_' LANGUAGE 'c';
SELECT oid, proname FROM pg_proc WHERE proname = 'complex_abs_cmp';

10
src/tutorial/funcs.source
View File

@ -6,7 +6,7 @@
--
-- Copyright (c) 1994-5, Regents of the University of California
--
-- $Id: funcs.source,v 1.3 1999/03/14 15:22:15 momjian Exp $
-- $Id: funcs.source,v 1.4 2000/03/28 02:49:19 tgl Exp $
--
---------------------------------------------------------------------------
@ -126,16 +126,16 @@ SELECT name(high_pay()) AS overpaid;
-----------------------------
CREATE FUNCTION add_one(int4) RETURNS int4
AS '_OBJWD_/funcs.so' LANGUAGE 'c';
AS '_OBJWD_/funcs_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION makepoint(point, point) RETURNS point
AS '_OBJWD_/funcs.so' LANGUAGE 'c';
AS '_OBJWD_/funcs_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION copytext(text) RETURNS text
AS '_OBJWD_/funcs.so' LANGUAGE 'c';
AS '_OBJWD_/funcs_DLSUFFIX_' LANGUAGE 'c';
CREATE FUNCTION c_overpaid(EMP, int4) RETURNS bool
AS '_OBJWD_/funcs.so' LANGUAGE 'c';
AS '_OBJWD_/funcs_DLSUFFIX_' LANGUAGE 'c';
SELECT add_one(3) AS four;