From: Jan Wieck <jwieck@debis.com>

    here  is  the  patch  that  includes  PL/pgSQL into the build
    (currently with make errors ignored) and  adds  a  regression
    test for it. A clean build and regression ran fine here.

    Can you please apply it?

    The  tar  should  be  extracted  in  /usr/local/src/pgsql and
    creates the following files:

    src/pl/Makefile
            called by toplevel GNUmakefile and for now only calls
            src/pl/plpgsql/Makefile

    src/pl/plpgsql/Makefile
            calls  src/pl/plpgsql/src/Makefile  (here the call to
            make ignores build errors  -  this  must  be  changed
            later for the final release).

    src/test/regress/input/install_plpgsql.source
            SQL script installing PL/pgSQL language in regression
            database. Will be modified by  .../input/Makefile  to
            point  to  correct  PGLIB  directory where plpgsql.so
            gets installed.

    src/test/regress/output/install_plpgsql.source
            expected output for installation script.

    src/test/regress/sql/plpgsql.sql
            the main regression  test.  It  tests  functions  and
            triggers written in PL/pgSQL including views that use
            supportfunctions in this language.

    src/test/regress/expected/plpgsql.out
            the expected output for the above regression test.

    make_plpgsql.diff
            patch that adds some lines to

            src/GNUmakefile.in
            src/test/regress/expected/Makefile
            src/test/regress/input/Makefile
            src/test/regress/output/Makefile
            src/test/regress/sql/Makefile
            src/test/regress/sql/tests

diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index fe47f5873b130bdd61ba13928012882d8ef82a5c..57b4b0e94c114d94d376253e8f7e161bf8c745b7 100644 (file)
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.28 1998/09/14 04:17:40 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.29 1998/09/29 12:40:34 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,6 +37,7 @@ all:
        $(MAKE) -C backend all
        $(MAKE) -C interfaces all
        $(MAKE) -C bin all
+       $(MAKE) -C pl all
 ifneq ($(wildcard man), )
        $(MAKE) -C man all
 endif
@@ -49,6 +50,7 @@ install:
        $(MAKE) -C utils install
        $(MAKE) -C backend install
        $(MAKE) -C bin install
+       $(MAKE) -C pl install
 ifneq ($(wildcard man), )
        $(MAKE) -C man install
 endif
@@ -61,6 +63,7 @@ clean:
        $(MAKE) -C backend clean
        $(MAKE) -C interfaces clean
        $(MAKE) -C bin clean
+       $(MAKE) -C pl clean
        $(MAKE) -C test clean
        $(MAKE) -C ../contrib/spi clean
 ifneq ($(wildcard man), )
@@ -98,6 +101,7 @@ distclean: clean
        $(MAKE) -C backend $@
        $(MAKE) -C interfaces $@
        $(MAKE) -C bin $@
+       $(MAKE) -C pl $@
 ifneq ($(wildcard man), )
        $(MAKE) -C man $@
 endif

diff --git a/src/test/regress/expected/Makefile b/src/test/regress/expected/Makefile
index b0f75b2bd4f9255d9ec237bcc666238600303e16..c72b7f431869a22bfe038bcc05dc7cb4914d661c 100644 (file)
--- a/src/test/regress/expected/Makefile
+++ b/src/test/regress/expected/Makefile
@@ -7,11 +7,11 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.3 1998/01/17 23:39:35 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.4 1998/09/29 12:40:52 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-CLFILES=       create_function_1.out create_function_2.out copy.out constraints.out misc.out
+CLFILES=       create_function_1.out create_function_2.out copy.out constraints.out misc.out install_plpgsql.out
 
 clean:
        rm -f $(CLFILES)

diff --git a/src/test/regress/input/Makefile b/src/test/regress/input/Makefile
index 2d00f3ac8a811d8dc3854a37048ac1552e23f596..9a00fc5e4f8039e7e8af8a4d6ec4b74288756112 100644 (file)
--- a/src/test/regress/input/Makefile
+++ b/src/test/regress/input/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.6 1997/08/28 04:49:18 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.7 1998/09/29 12:41:56 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,7 +22,8 @@ INFILES= copy.sql \
          create_function_1.sql \
          create_function_2.sql \
          misc.sql \
-        constraints.sql
+        constraints.sql \
+        install_plpgsql.sql
 
 all: $(INFILES)
 
@@ -34,4 +35,5 @@ all: $(INFILES)
        OBJ=`pwd`; \
        sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
            -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
+           -e "s:_LIBDIR_:$(LIBDIR):g" \
            -e "s/_USER_/$$USER/g" < $< > ../sql/$@

diff --git a/src/test/regress/output/Makefile b/src/test/regress/output/Makefile
index c381fa4b25b518b431f7c19a9cac6b7f6d9a3a78..a31c6c4b6ab67530fc54267c74e868867cbd14b6 100644 (file)
--- a/src/test/regress/output/Makefile
+++ b/src/test/regress/output/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.8 1997/08/28 04:49:23 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.9 1998/09/29 12:42:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,7 +22,8 @@ INFILES= copy.out \
          create_function_1.out \
          create_function_2.out \
          misc.out \
-        constraints.out
+        constraints.out \
+        install_plpgsql.out
 
 all: $(INFILES)
 
@@ -34,6 +35,7 @@ all: $(INFILES)
        OBJ=`pwd`; \
        sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
            -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
+           -e "s:_LIBDIR_:$(LIBDIR):g" \
            -e "s/_USER_/$$USER/g" < $< | \
        sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@
 

diff --git a/src/test/regress/sql/Makefile b/src/test/regress/sql/Makefile
index 8f630a2724c573f8000ef2416563a3bea3a86e4f..d603f5cac11eeefc0e6ca286e64fe02123b400c6 100644 (file)
--- a/src/test/regress/sql/Makefile
+++ b/src/test/regress/sql/Makefile
@@ -7,11 +7,11 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.3 1997/08/28 04:49:31 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.4 1998/09/29 12:43:03 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-CLFILES=       create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql
+CLFILES=       create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql install_plpgsql.sql
 
 clean:
        rm -f $(CLFILES)

diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests
index d4ba89aa345337b88f2d1b0a4d6fbbf0589b72ce..e13da74021ae84883b83f72e058b5cc3d094a0c2 100644 (file)
--- a/src/test/regress/sql/tests
+++ b/src/test/regress/sql/tests
@@ -59,3 +59,5 @@ select_views
 alter_table
 portals_p2
 rules
+install_plpgsql
+plpgsql