Added installation of created procedural languages to initdb

Jan Wieck · Jan Wieck · commit ca00c902fbda · 1999-05-12T10:35:44.000Z
Jan
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.11 1998/07/26 04:31:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.12 1999/05/12 10:35:43 wieck Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,9 @@ include ../../Makefile.global
 all: initdb
 
 initdb: initdb.sh
-	sed 's/__MULTIBYTE__/$(MULTIBYTE)/' initdb.sh > initdb
+	sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/' 			\
+		-e 's/__DLSUFFIX__/$(DLSUFFIX)/'			\
+			initdb.sh > initdb
 
 install: initdb
 	$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.58 1999/03/17 22:53:25 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.59 1999/05/12 10:35:43 wieck Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -491,6 +491,26 @@ echo "CREATE RULE \"_RETpg_indexes\" AS ON SELECT TO pg_indexes DO INSTEAD	\
 	           AND I.oid = X.indexrelid;" | \
 	postgres $PGSQL_OPT template1 > /dev/null
 
+if [ -f $PGLIB/plpgsql__DLSUFFIX__ ] ; then
+	echo "Installing PL/pgSQL as trusted procedural language"
+	echo "CREATE FUNCTION plpgsql_call_handler () RETURNS opaque	\
+			AS '$PGLIB/plpgsql__DLSUFFIX__' LANGUAGE 'C';" |		\
+		postgres $PGSQL_OPT template1 > /dev/null
+	echo "CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'				\
+			HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL';" |	\
+		postgres $PGSQL_OPT template1 > /dev/null
+fi
+
+if [ -f $PGLIB/pltcl__DLSUFFIX__ ] ; then
+	echo "Installing PL/Tcl as trusted procedural language"
+	echo "CREATE FUNCTION pltcl_call_handler () RETURNS opaque		\
+			AS '$PGLIB/pltcl__DLSUFFIX__' LANGUAGE 'C';" |		\
+		postgres $PGSQL_OPT template1 > /dev/null
+	echo "CREATE TRUSTED PROCEDURAL LANGUAGE 'pltcl'				\
+			HANDLER pltcl_call_handler LANCOMPILER 'PL/Tcl';" |	\
+		postgres $PGSQL_OPT template1 > /dev/null
+fi
+
 echo "Loading pg_description"
 echo "copy pg_description from '$TEMPLATE_DESCR'" | \
 	postgres $PGSQL_OPT template1 > /dev/null
diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests
@@ -66,6 +66,5 @@ alter_table
 portals_p2
 rules
 limit
-install_plpgsql
 plpgsql
 temp

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.11 1998/07/26 04:31:16 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.12 1999/05/12 10:35:43 wieck Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -17,7 +17,9 @@ include ../../Makefile.global`
`17`	`17`	`all: initdb`
`18`	`18`
`19`	`19`	`initdb: initdb.sh`
`20`		`- sed 's/__MULTIBYTE__/$(MULTIBYTE)/' initdb.sh > initdb`
	`20`	`+ sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/' \`
	`21`	`+ -e 's/__DLSUFFIX__/$(DLSUFFIX)/' \`
	`22`	`+ initdb.sh > initdb`
`21`	`23`
`22`	`24`	`install: initdb`
`23`	`25`	`$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<`