Move findoidjoins out of contrib and into src/tools, which is a more

logical place for it since it is of no use to users.  Per recent
discussions on cleaning up contrib.

7 files changed, 33 insertions, 34 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index 480050b214..8a95083138 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -13,7 +13,6 @@ WANTED_DIRS = \
 		dbmirror	\
 		dbsize		\
 		earthdistance	\
-		findoidjoins	\
 		fulltextindex	\
 		fuzzystrmatch	\
 		intagg		\
diff --git a/contrib/README b/contrib/README
index f14481c7ba..3e1ae62b00 100644
--- a/contrib/README
+++ b/contrib/README
@@ -62,11 +62,6 @@ earthdistance -
 	Operator for computing earth distance for two points
 	by Hal Snyder <[email protected]>
 
-findoidjoins -
-	Finds the joins used by oid columns by examining the actual
-	values in the oid columns and row oids.
-	by Bruce Momjian <[email protected]>
-
 fulltextindex -
 	Full text indexing using triggers
 	by Maarten Boekhold <[email protected]>
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
deleted file mode 100644
index f0fac2da25..0000000000
--- a/contrib/findoidjoins/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $PostgreSQL$
-
-PROGRAM = findoidjoins
-OBJS	= findoidjoins.o
-
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
-
-SCRIPTS = make_oidjoins_check
-DOCS = README.findoidjoins
-
-ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
-include $(PGXS)
-else
-subdir = contrib/findoidjoins
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile
new file mode 100644
index 0000000000..98fd49699c
--- /dev/null
+++ b/src/tools/findoidjoins/Makefile
@@ -0,0 +1,25 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for src/tools/findoidjoins
+#
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
+#
+# $PostgreSQL$
+#
+#-------------------------------------------------------------------------
+
+subdir = src/tools/findoidjoins
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
+
+OBJS= findoidjoins.o
+
+all: submake-libpq submake-libpgport findoidjoins
+
+findoidjoins: findoidjoins.o $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) findoidjoins.o $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
+
+clean distclean maintainer-clean:
+	rm -f findoidjoins$(X) $(OBJS)
diff --git a/contrib/findoidjoins/README.findoidjoins b/src/tools/findoidjoins/README
index a96641430a..ce31b19472 100644
--- a/contrib/findoidjoins/README.findoidjoins
+++ b/src/tools/findoidjoins/README
@@ -7,10 +7,10 @@ anything but an empty database, such as template1; else it's likely to
 be very slow.
 
 Run on an empty database, it returns the system join relationships (shown
-below for 8.0).  Note that unexpected matches may indicate bogus entries
+below for 8.1).  Note that unexpected matches may indicate bogus entries
 in system tables --- don't accept a peculiar match without question.
 In particular, a field shown as joining to more than one target table is
-probably messed up.  In 8.0, the *only* fields that should join to more
+probably messed up.  In 8.1, the *only* fields that should join to more
 than one target are pg_description.objoid, pg_depend.objid, and
 pg_depend.refobjid.  (Running make_oidjoins_check is an easy way to spot
 fields joining to more than one table, BTW.)
@@ -26,22 +26,22 @@ revision in the patterns of cross-links between system tables.
 (Ideally we'd just regenerate the script as part of the regression
 tests themselves, but that seems too slow...)
 
-NOTE: in 8.0, make_oidjoins_check produces one bogus join check:
+NOTE: in 8.1, make_oidjoins_check produces two bogus join checks:
 Join pg_catalog.pg_class.relfilenode => pg_catalog.pg_class.oid
-This is an artifact and should not be added to the oidjoins regress test.
-Also beware of any claim that pg_database.datlastsysoid joins to anything;
-this does not actually happen in 8.0, but it did happen before and might
-happen again in future, depending on what operation initdb does last.
+Join pg_catalog.pg_database.datlastsysoid => pg_catalog.pg_database.oid
+These are artifacts and should not be added to the oidjoins regress test.
 
 ---------------------------------------------------------------------------
 
 Join pg_catalog.pg_aggregate.aggfnoid => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_aggregate.aggtransfn => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_aggregate.aggfinalfn => pg_catalog.pg_proc.oid
+Join pg_catalog.pg_aggregate.aggsortop => pg_catalog.pg_operator.oid
 Join pg_catalog.pg_aggregate.aggtranstype => pg_catalog.pg_type.oid
-Join pg_catalog.pg_am.amgettuple => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_am.aminsert => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_am.ambeginscan => pg_catalog.pg_proc.oid
+Join pg_catalog.pg_am.amgettuple => pg_catalog.pg_proc.oid
+Join pg_catalog.pg_am.amgetmulti => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_am.amrescan => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_am.amendscan => pg_catalog.pg_proc.oid
 Join pg_catalog.pg_am.ammarkpos => pg_catalog.pg_proc.oid
diff --git a/contrib/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c
index e58429951c..e58429951c 100644
--- a/contrib/findoidjoins/findoidjoins.c
+++ b/src/tools/findoidjoins/findoidjoins.c
diff --git a/contrib/findoidjoins/make_oidjoins_check b/src/tools/findoidjoins/make_oidjoins_check
index b6a720a504..b6a720a504 100755
--- a/contrib/findoidjoins/make_oidjoins_check
+++ b/src/tools/findoidjoins/make_oidjoins_check