/contrib patch from Karel.

Author: bmomjian

contrib/Makefile

@@ -1,27 +1,59 @@
-# Makefile for contrib code
 #
-# The following subdirs don't have a Makefile:
+# The PostgreSQL contrib tree Makefile
 #
-#   apache_logging
-#   linux
-#   mSQL-interface
-#   noupdate
-#   unixdate
+#	Portions Copyright (c) 1999-2000, PostgreSQL, Inc
 #
-# The following subdirs give make errors:
+# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.4 2000/06/15 18:54:29 momjian Exp $
 #
-#   earthdistance
-#   os2client
+
+TOPDIR = ..
+include Makefile.global
+
+WANTED_DIRS =	array		\
+		earthdistance	\
+		findoidjoins	\
+		fulltextindex	\
+		isbn_issn	\
+		likeplanning	\
+		linux		\
+		lo		\
+		mSQL-interface	\
+		miscutil	\
+		noupdate	\
+		pg_dumplo	\
+		pgbench		\
+		soundex		\
+		spi		\
+		string		\
+		tips		\
+		tools		\
+		unixdate	\
+		userlock	\
+		vacuumlo	
+	#	odbc
+	#	os2client	
+
 
 all:
-	for dir in *; do \
+	for dir in $(WANTED_DIRS); do \
+	    if [ -e $$dir/Makefile ]; then \
+		$(MAKE) -C $$dir $@ ; \
+	    fi; \
+	done
+
+
+install:
+	../config/mkinstalldirs $(CONTRIB_BINDIR) $(CONTRIB_MODDIR) $(CONTRIB_DOCDIR) $(CONTRIB_SQLDIR) $(CONTRIB_EXAMPLESDIR)
+	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \
 	done
+	$(INSTALL) $(INSTL_LIB_OPTS) Contrib.index $(CONTRIB_DOCDIR);
+
 
 .DEFAULT:
-	for dir in *; do \
+	for dir in $(WANTED_DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir $@ ; \
 	    fi; \

contrib/README

@@ -1,94 +1,81 @@
-This directory contains the contribution functions or tools.
 
----------------------------------------------------------------------------
+ The PostgreSQL contrib tree
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-apache_logging -
-	Getting Apache to log to PostgreSQL
-	by Terry Mackintosh <terry@terrym.com>
+	FIXME:
+		os2client	
+		odbc
+		spi/preprocessor
+		tools		
+	
 
-array -
-	Array iterator functions
-	by Massimo Dal Zotto <dz@cs.unitn.it>
+ - in each directory must be Makefile, possible Makefile template
+   is below this text,
 
-bit -
-	Bit type
-	by Adriaan Joubert <a.joubert@albourne.com>
+--------
+#
+# $Header: /cvsroot/pgsql/contrib/README,v 1.18 2000/06/15 18:54:29 momjian Exp $
+#
 
-datetime -
-	Date & time functions
-	by Massimo Dal Zotto <dz@cs.unitn.it>
+TOPDIR=../..
 
-earthdistance -
-	Operator for computing earth distance for two points
-	by Hal Snyder <hal@vailsys.com>
+include ../Makefile.global
 
-findoidjoins -
-	Finds the joins used by oid columns by examining the actual
-	values in the oid columns and row oids.
-	by Bruce Momjian <root@candle.pha.pa.us>
+NAME	= some_name
 
-fulltextindex -
-	Full text indexing using triggers
-	by Maarten Boekhold <maartenb@dutepp0.et.tudelft.nl>
+PROGRAM	= 
+OBJS	= $(NAME).o
+DOCS	= $(NAME).doc
+SQLS	= $(NAME).sql
+BINS	=
+EXAMPLES=
+MODS	= $(NAME)$(DLSUFFIX)
 
-isbn_issn -
-	PostgreSQL type extensions for ISBN (books) and ISSN (serials)
-	by Garrett A. Wollman <wollman@khavrinen.lcs.mit.edu>
+CFLAGS += -I. $(CFLAGS_SL)
 
-likeplanning -
-	Scripts to enable/disable new planning code for LIKE and regexp
-	pattern match operators.  These will go away again once the code
-	is mature enough to enable by default.
-	by Tom Lane <tgl@sss.pgh.pa.us>
+OTHER_CLEAN = $(SQLS)
 
-linux -
-	Start postgres back end system
-	by Thomas Lockhart <lockhart@alumni.caltech.edu>
+all: $(MODS) $(SQLS)
 
-lo -
-	Large Object maintenance
-	by Peter Mount <peter@retep.org.uk> 
+%.sql: %.sql.in
+	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$@|" < $< > $@
 
-miscutil -
-	Postgres assert checking and various utility functions
-	by Dal Zotto <dz@cs.unitn.it>
 
-mSQL-interface -
-	mSQL API translation library
-	by Aldrin Leal <aldrin@americasnet.com>
+install: install_doc install_sql install_mod install_bin install_example
 
-noupdate -
-	trigger to prevent updates on single columns
+install_doc:
+	for inst_file in $(DOCS); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
+	done
 
-pg_dumplo -
-	Dump large objects
+install_sql:
+	for inst_file in $(SQLS); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
+	done
 
-soundex -
-	Prototype for soundex function
+install_mod:
+	for inst_file in $(MODS); do \
+		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
+	done
 
-spi -
-	A general trigger function autoinc() and so on.
+install_bin:
+	for inst_file in $(BINS); do \
+		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
+	done
 
-string -
-	C-like input/output conversion routines for strings
-	by Massimo Dal Zotto <dz@cs.unitn.it>
+install_example:
+	for inst_file in $(EXAMPLES); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_EXAMPLESDIR); \
+	done
 
-tools -
-	Assorted developer tools
-	by Massimo Dal Zotto <dz@cs.unitn.it>
+depend dep:
+	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-unixdate -
-	Conversions from integer to datetime
-	by Thomas Lockhart <lockhart@alumni.caltech.edu>
+clean:
+	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
 
-userlock -
-	User locks
-	by Massimo Dal Zotto <dz@cs.unitn.it>
-
-vacuumlo -
-	Remove orphaned large objects
-	by Peter T Mount <peter@retep.org.uk>
-
-pgbench -
-	TPC-B like benchmarking tool
-	by Tatsuo Ishii <t-ishii@sra.co.jp>
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+-----------
+  

contrib/apache_logging/apachelog.sql

@@ -1,3 +0,0 @@
-drop table access;
-CREATE TABLE access (host char(200), ident char(200), authuser char(200), accdate datetime, request char(500), ttime int2, status int2, bytes int4) archive = none;
-grant all on access to nobody;

contrib/apache_logging/httpconf.txt

@@ -1,12 +0,0 @@
-# This is mostly the same as the default, except for no square brakets around
-# the time or the extra timezone info, also added the download time, 3rd from
-# the end, number of seconds.
-
-LogFormat "insert into access values ( '%h', '%l', '%u', '%{%d/%b/%Y:%H:%M:%S}t', '%r', %T, %s, %b );"
-
-
-# The above format ALMOST eleminates the need to use sed, except that I noticed
-# that when a frameset page is called, then the bytes transfered is '-', which
-# will choke the insert, so replaced it with '-1'.
-
-TransferLog '| su -c "sed \"s/, - );$/, -1 );/\" | /usr/local/pgsql/bin/psql www_log" nobody'

contrib/array/Makefile

@@ -1,65 +1,53 @@
-#-------------------------------------------------------------------------
 #
-# Makefile --
+# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.8 2000/06/15 18:54:31 momjian Exp $
 #
-#    Makefile for array iterator module.
-#
-#-------------------------------------------------------------------------
-
-PGDIR = ../..
-SRCDIR = $(PGDIR)/src
-
-include $(SRCDIR)/Makefile.global
-
-CFLAGS += -I. $(CFLAGS_SL)
 
-MODNAME =	array_iterator
+TOPDIR=../..
 
-SQLDEFS =	$(MODNAME).sql
+include ../Makefile.global
 
-MODULE =	$(MODNAME)$(DLSUFFIX)
+NAME	= array_iterator
 
-MODDIR =	$(LIBDIR)/modules
+PROGRAM	= 
+OBJS	= $(NAME).o
+DOCS	= $(NAME).doc
+SQLS	= $(NAME).sql
+BINS	=
+EXAMPLES=
+MODS	= $(NAME)$(DLSUFFIX)
 
-SQLDIR =	$(LIBDIR)/sql
-
-all:		module sql
-
-module:		$(MODULE)
+CFLAGS += -I. $(CFLAGS_SL)
 
-sql:		$(SQLDEFS)
+OTHER_CLEAN = $(SQLS)
 
-install:	$(MODULE) $(SQLDEFS) $(MODDIR) $(SQLDIR)
-		cp -p $(MODULE) $(MODDIR)/
-		strip $(MODDIR)/$(MODULE)
-		cp -p $(SQLDEFS) $(SQLDIR)/
+all: $(MODS) $(SQLS)
 
-install-doc:	
-		if [ -d "$(DOCDIR)" ]; then \
-		    cp -p *.doc $(DOCDIR); \
-		else \
-		    cp -p *.doc $(SQLDIR); \
-		fi
+%.sql: %.sql.in
+	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$@|" < $< > $@
 
-$(MODDIR):
-		mkdir -p $@
+install: install_doc install_sql install_mod 
 
-$(SQLDIR):
-		mkdir -p $@
+install_doc:
+	for inst_file in $(DOCS); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
+	done
 
-%.sql: %.sql.in
-		sed "s|MODULE_PATHNAME|$(MODDIR)/$(MODULE)|" < $< > $@
+install_sql:
+	for inst_file in $(SQLS); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
+	done
 
-.SUFFIXES: $(DLSUFFIX)
+install_mod:
+	for inst_file in $(MODS); do \
+		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
+	done
 
-%$(DLSUFFIX): %.c
-		$(CC) $(CFLAGS) -shared -o $@ $<
 
 depend dep:
-		$(CC) -MM $(CFLAGS) *.c >depend
+	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
 clean:
-		rm -f *~ $(MODULE) $(MODNAME).sql
+	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
 
 ifeq (depend,$(wildcard depend))
 include depend

contrib/array/README

@@ -0,0 +1,49 @@
+Array iterator functions, by Massimo Dal Zotto <dz@cs.unitn.it>
+Copyright (C) 1999, Massimo Dal Zotto <dz@cs.unitn.it>
+
+This software is distributed under the GNU General Public License
+either version 2, or (at your option) any later version.
+
+
+This loadable module defines a new class of functions which take
+an array and a scalar value, iterate a scalar operator over the
+elements of the array and the value, and compute a result as
+the logical OR or AND of the iteration results.
+For example array_int4eq returns true if some of the elements
+of an array of int4 is equal to the given value:
+
+	array_int4eq({1,2,3}, 1)  -->  true
+	array_int4eq({1,2,3}, 4)  -->  false
+
+If we have defined T array types and O scalar operators we can
+define T x O x 2 array functions, each of them has a name like
+"array_[all_]<basetype><operation>" and takes an array of type T
+iterating the operator O over all the elements. Note however
+that some of the possible combination are invalid, for example
+the array_int4_like because there is no like operator for int4.
+
+We can then define new operators based on these functions and use
+them to write queries with qualification clauses based on the
+values of some of the elements of an array.
+For example to select rows having some or all element of an array
+attribute equal to a given value or matching a regular expression:
+
+	create table t(id int4[], txt text[]);
+
+	-- select tuples with some id element equal to 123
+	select * from t where t.id *= 123;
+
+	-- select tuples with some txt element matching '[a-z]'
+	select * from t where t.txt *~ '[a-z]';
+
+	-- select tuples with all txt elements matching '^[A-Z]'
+	select * from t where t.txt[1:3] **~ '^[A-Z]';
+
+The scheme is quite general, each operator which operates on a base type
+can be iterated over the elements of an array. It seem to work well but
+defining each new operators requires writing a different C function.
+Furthermore in each function there are two hardcoded OIDs which reference
+a base type and a procedure. Not very portable. Can anyone suggest a
+better and more portable way to do it ?
+
+See also array_iterator.sql for an example on how to use this module.