From: Darren King <[email protected]>

1. Make 'all' works without complaint.  Don't have to add the .exp
   files to the files list.  They are made automagically when
   making the respective shared lib file.

   Only port that actually uses EXPSUFF (from makefiles/Makefile.*)
   is Aix, so if this breaks anybody else, let me know, asap.

2. Make 'clean' actually cleans up correctly.  Previously, it would
   leave the .o files in C-code directory.

3. Changed references to reflect new location of .c files.

4. Added DELETE statements to complex.source so that it tidies up
   when done.  Previously, it would leave things in pg_amop,
   pg_amproc and pg_opclass.  Only possible to do this with the
   new SUBSELECT code in 6.3.  Nice work, fellas...

   Not deleting the index entries would cause a non-fatal error if
   complex.sql was run again on the same database.  Much tidier now.

5. Corrected the README.  obj directory hasn't existed since Bryan
   redid the make way back when.  Also changed the snipet from psql
   to match the current version. POSTGRES95?!?  I don't think so. :)

4 files changed, 53 insertions, 29 deletions

diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index cc7ac77b2c..4d7009abd2 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -29,16 +29,7 @@ DLOBJS= complex$(DLSUFFIX) funcs$(DLSUFFIX)
 
 QUERIES= advanced.sql basics.sql complex.sql funcs.sql syscat.sql
 
-INFILES= $(DLOBJS)
-
-#
-# plus exports files
-#
-ifdef EXPSUFF
-INFILES+= $(DLOBJS:.o=$(EXPSUFF))
-endif
-
-all: $(QUERIES)
+all: $(DLOBJS) $(QUERIES)
 
 %.sql: %.source
 	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
@@ -51,12 +42,7 @@ all: $(QUERIES)
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
 	    -e "s/_USER_/$$USER/g" < $< > $@
 
-funcs.sql: $(INFILES)
-
-$(INFILES): 
-	$(MAKE) -C C-code $@
-	cp C-code/$@ .
+funcs.sql: $(DLOBJS)
 
 clean:
-	$(MAKE) -C C-code clean
-	rm -f $(QUERIES) $(INFILES)
+	rm -f $(DLOBJS) $(QUERIES)
diff --git a/src/tutorial/README b/src/tutorial/README
index b35f7b2b07..9115c3d9db 100644
--- a/src/tutorial/README
+++ b/src/tutorial/README
@@ -4,13 +4,11 @@ to compile all the scripts and C files for the user-defined functions
 and types.  (make needs to be GNU make and may be named something
 different on your system)
 
-Then, change to the object directory
-	% cd obj
-
-and run psql with the -s flag:
+Then, run psql with the -s flag:
 	% psql -s
 
-Welcome to the POSTGRES95 interactive sql monitor:
+Welcome to the POSTGRESQL interactive sql monitor:
+  Please read the file COPYRIGHT for copyright terms of POSTGRESQL
 
    type \? for help on slash commands
    type \q to quit
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index e5bea2d113..bf8b09eb17 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -8,8 +8,6 @@
 /* do not include libpq-fe.h for backend-loaded functions*/
 /* #include "libpq-fe.h"  */
 #include "postgres.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/mcxt.h"
 
 typedef struct Complex
diff --git a/src/tutorial/complex.source b/src/tutorial/complex.source
index b637677836..00198f5095 100644
--- a/src/tutorial/complex.source
+++ b/src/tutorial/complex.source
@@ -19,7 +19,7 @@
 -----------------------------
 
 -- Assume the user defined functions are in _OBJWD_/complex.so
--- Look at $PWD/C-code/complex.c for the source.
+-- Look at $PWD/complex.c for the source.
 
 -- the input function 'complex_in' takes a null-terminated string (the 
 -- textual representation of the type) and turns it into the internal
@@ -77,7 +77,7 @@ SELECT * FROM test_complex;
 --	arguments.)
 -----------------------------
 
--- first, define a function complex_add (also in C-code/complex.c)
+-- first, define a function complex_add (also in complex.c)
 CREATE FUNCTION complex_add(complex, complex)
    RETURNS complex
    AS '_OBJWD_/complex.so'
@@ -224,8 +224,6 @@ INSERT INTO pg_amop (amopid, amopclaid, amopopr, amopstrategy,
    WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
       and c.oprname = '>';
 
-DROP table complex_ops_tmp;
-
 --
 CREATE FUNCTION complex_abs_cmp(complex, complex) RETURNS int4
    AS '_OBJWD_/complex.so' LANGUAGE 'c';
@@ -251,6 +249,50 @@ SELECT * from test_complex where a = '(56.0,-22.5)';
 SELECT * from test_complex where a < '(56.0,-22.5)';
 SELECT * from test_complex where a > '(56.0,-22.5)';
 
+DELETE FROM pg_amop where (amopid, amopclaid, amopopr, amopstrategy)
+   = (
+   SELECT am.oid, opcl.oid, c.opoid, 1
+   FROM pg_am am, pg_opclass opcl, complex_ops_tmp c
+   WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
+      and c.oprname = '<');
+
+DELETE FROM pg_amop where (amopid, amopclaid, amopopr, amopstrategy)
+   = (
+   SELECT am.oid, opcl.oid, c.opoid, 2
+   FROM pg_am am, pg_opclass opcl, complex_ops_tmp c
+   WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
+      and c.oprname = '<=');
+
+DELETE FROM pg_amop where (amopid, amopclaid, amopopr, amopstrategy)
+   = (
+   SELECT am.oid, opcl.oid, c.opoid, 3
+   FROM pg_am am, pg_opclass opcl, complex_ops_tmp c
+   WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
+      and c.oprname = '=');
+
+DELETE FROM pg_amop where (amopid, amopclaid, amopopr, amopstrategy)
+   = (
+   SELECT am.oid, opcl.oid, c.opoid, 4
+   FROM pg_am am, pg_opclass opcl, complex_ops_tmp c
+   WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
+      and c.oprname = '>=');
+
+DELETE FROM pg_amop where (amopid, amopclaid, amopopr, amopstrategy)
+   = (
+   SELECT am.oid, opcl.oid, c.opoid, 5
+   FROM pg_am am, pg_opclass opcl, complex_ops_tmp c
+   WHERE amname = 'btree' and opcname = 'complex_abs_ops' 
+      and c.oprname = '>');
+
+DELETE FROM pg_amproc where (amid, amopclaid, amproc, amprocnum)
+   = (
+   SELECT am.oid, opcl.oid, pro.oid, 1
+   FROM pg_am am, pg_opclass opcl, pg_proc pro
+   WHERE  amname = 'btree' and opcname = 'complex_abs_ops'
+      and proname = 'complex_abs_cmp');
+
+DELETE FROM pg_opclass WHERE opcname = 'complex_abs_ops';
+
 DROP FUNCTION complex_in(opaque);
 DROP FUNCTION complex_out(opaque);
 DROP FUNCTION complex_add(complex, complex);
@@ -268,4 +310,4 @@ DROP OPERATOR >= (complex, complex);
 DROP OPERATOR > (complex, complex);
 DROP AGGREGATE complex_sum complex;
 DROP TYPE complex;
-DROP TABLE test_complex;
+DROP TABLE test_complex, complex_ops_tmp;