I cleaned those out as well (the echo -n "bug" was in there ;) and moved

them into the scripts dir. I also added a --list option to show already
installed languages.

This whole moving and renaming totally confused CVS and my checked out
copy got completely fried last night. When you apply the source patch,
please make sure that all the directories src/bin/{create|destroy}* as
well as vacuumdb, cleardbdir are gone and that all the scripts (7) are
in
scripts/.

Meanwhile I am still puzzled about what happened with the docs patch.
Because I don't know what you got now, the second attachment contains
the
files

ref/allfiles.sgml
ref/commands.sgml
ref/createlang.sgml
ref/droplang.sgml
doc/src/sgml/Makefile

Peter Eisentraut                  Sernanders väg 10:115

1 files changed, 210 insertions, 0 deletions

diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang
new file mode 100644
index 0000000000..1040c33dd4
--- /dev/null
+++ b/src/bin/scripts/droplang
@@ -0,0 +1,210 @@
+#!/bin/sh
+#-------------------------------------------------------------------------
+#
+# createlang--
+#    Remove a procedural language from a database
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.1 1999/12/05 20:02:48 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+CMDNAME=`basename $0`
+
+PSQLOPT=
+dbname=
+langname=
+echo=
+list=
+
+# Check for echo -n vs echo \c
+
+if echo '\c' | grep -s c >/dev/null 2>&1
+then
+    ECHO_N="echo -n"
+    ECHO_C=""
+else
+    ECHO_N="echo"
+    ECHO_C='\c'
+fi
+
+
+# ----------
+# Get options, language name and dbname
+# ----------
+while [ $# -gt 0 ]
+do
+    case "$1" in 
+	--help|-\?)
+		usage=t
+		break
+		;;
+        --list|-l)
+                list=t
+                ;;
+# options passed on to psql
+	--host|-h)
+		PSQLOPT="$PSQLOPT -h $2"
+		shift;;
+        -h*)
+                PSQLOPT="$PSQLOPT $1"
+                ;;
+        --host=*)
+                PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
+                ;;
+	--port|-p)
+		PSQLOPT="$PSQLOPT -p $2"
+		shift;;
+        -p*)
+                PSQLOPT="$PSQLOPT $1"
+                ;;
+        --port=*)
+                PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
+                ;;
+	--user|--username|-U)
+		PSQLOPT="$PSQLOPT -U '$2'"
+		shift;;
+        -U*)
+                PSQLOPT="$PSQLOPT $1"
+                ;;
+        --user=*)
+                PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
+                ;;
+        --username=*)
+                PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
+                ;;
+	--password|-W)
+		PSQLOPT="$PSQLOPT -W"
+		;;
+	--echo|-e)
+                echo=t
+		;;
+	--dbname|--database|-d)
+		dbname="$2"
+		shift;;
+        -d*)
+                dbname=`echo $1 | sed 's/^-d//'`
+                ;;
+        --dbname=*)
+                dbname=`echo $1 | sed 's/^--dbname=//'`
+                ;;
+        --database=*)
+                dbname=`echo $1 | sed 's/^--database=//'`
+                ;;
+
+	 *)
+ 		langname="$1"
+                if [ "$2" ]; then
+                        shift
+			dbname="$1"
+		fi
+                ;;
+    esac
+    shift
+done
+
+
+if [ "$usage" ]; then
+	echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-d dbname] [langname [dbname]]"
+	exit 0
+fi
+
+if [ "$list" ]; then
+        psql $PSQLOPT -d "$dbname" -c "SELECT lanname, lanpltrusted, lancompiler FROM pg_language WHERE lanispl = 't'"
+        exit $?
+fi
+
+
+# ----------
+# Check that we have a database
+# ----------
+if [ -z "$dbname" ]; then
+	echo "$CMDNAME: Missing required argument database name. Try -? for help."
+	exit 1
+fi
+
+
+# ----------
+# If not given on the commandline, ask for the language
+# ----------
+if [ -z "$langname" ]; then
+	$ECHO_N "Language to remove from database $dbname: "$ECHO_C
+	read langname
+fi
+
+# ----------
+# Check if supported and set related values
+# ----------
+case "$langname" in
+	plpgsql)
+                lancomp="PL/pgSQL"
+		handler="plpgsql_call_handler"
+                ;;
+	pltcl)
+		lancomp="PL/Tcl"
+		handler="pltcl_call_handler"
+                ;;
+	*)
+		echo "$CMDNAME: Unsupported language '$langname'."
+		echo "          Supported languages are 'plpgsql' and 'pltcl'."
+		exit 1
+                ;;
+esac
+
+
+if [ "$echo" ]; then
+        PSQLOPT="$PSQLOPT -e"
+else
+        PSQLOPT="$PSQLOPT -q"
+fi
+
+PSQL="psql -A -t $PSQLOPT -d $dbname -c"
+
+
+# ----------
+# Make sure the language is installed
+# ----------
+res=`$PSQL "SELECT oid FROM pg_language WHERE lanname = '$langname'"`
+if [ $? -ne 0 ]; then
+	echo "Language removal failed."
+	exit 1
+fi
+if [ -z "$res" ]; then
+	echo "The language '$langname' isn't installed in database $dbname."
+	exit 1
+fi
+
+
+# ----------
+# Check that there are no functions left defined in that language
+# ----------
+res=`$PSQL "SELECT COUNT(proname) FROM pg_proc P, pg_language L WHERE P.prolang = L.oid AND L.lanname = '$langname'"`
+if [ $? -ne 0 ]; then
+	echo "Language removal failed."
+	exit 1
+fi
+if [ $res -ne 0 ]; then
+	echo "There are $res functions/trigger procedures declared in language"
+        echo "$lancomp."
+        echo "Language not removed."
+	exit 1
+fi
+
+# ----------
+# Drop the language and the call handler function
+# ----------
+$PSQL "DROP PROCEDURAL LANGUAGE '$langname'"
+if [ $? -ne 0 ]; then
+	echo "Language removal failed."
+	exit 1
+fi
+$PSQL "DROP FUNCTION $handler()"
+if [ $? -ne 0 ]; then
+	echo "Language removal failed."
+	exit 1
+fi
+
+exit 0