Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 44e01bf

Browse files
committed
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
1 parent 376fbad commit 44e01bf

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

src/GNUmakefile.in

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.28 1998/09/14 04:17:40 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.29 1998/09/29 12:40:34 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -37,6 +37,7 @@ all:
3737
$(MAKE) -C backend all
3838
$(MAKE) -C interfaces all
3939
$(MAKE) -C bin all
40+
$(MAKE) -C pl all
4041
ifneq ($(wildcard man), )
4142
$(MAKE) -C man all
4243
endif
@@ -49,6 +50,7 @@ install:
4950
$(MAKE) -C utils install
5051
$(MAKE) -C backend install
5152
$(MAKE) -C bin install
53+
$(MAKE) -C pl install
5254
ifneq ($(wildcard man), )
5355
$(MAKE) -C man install
5456
endif
@@ -61,6 +63,7 @@ clean:
6163
$(MAKE) -C backend clean
6264
$(MAKE) -C interfaces clean
6365
$(MAKE) -C bin clean
66+
$(MAKE) -C pl clean
6467
$(MAKE) -C test clean
6568
$(MAKE) -C ../contrib/spi clean
6669
ifneq ($(wildcard man), )
@@ -98,6 +101,7 @@ distclean: clean
98101
$(MAKE) -C backend $@
99102
$(MAKE) -C interfaces $@
100103
$(MAKE) -C bin $@
104+
$(MAKE) -C pl $@
101105
ifneq ($(wildcard man), )
102106
$(MAKE) -C man $@
103107
endif

src/test/regress/expected/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.3 1998/01/17 23:39:35 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.4 1998/09/29 12:40:52 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
CLFILES= create_function_1.out create_function_2.out copy.out constraints.out misc.out
14+
CLFILES= create_function_1.out create_function_2.out copy.out constraints.out misc.out install_plpgsql.out
1515

1616
clean:
1717
rm -f $(CLFILES)

src/test/regress/input/Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.6 1997/08/28 04:49:18 vadim Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.7 1998/09/29 12:41:56 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,7 +22,8 @@ INFILES= copy.sql \
2222
create_function_1.sql \
2323
create_function_2.sql \
2424
misc.sql \
25-
constraints.sql
25+
constraints.sql \
26+
install_plpgsql.sql
2627

2728
all: $(INFILES)
2829

@@ -34,4 +35,5 @@ all: $(INFILES)
3435
OBJ=`pwd`; \
3536
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
3637
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
38+
-e "s:_LIBDIR_:$(LIBDIR):g" \
3739
-e "s/_USER_/$$USER/g" < $< > ../sql/$@

src/test/regress/output/Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.8 1997/08/28 04:49:23 vadim Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.9 1998/09/29 12:42:11 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,7 +22,8 @@ INFILES= copy.out \
2222
create_function_1.out \
2323
create_function_2.out \
2424
misc.out \
25-
constraints.out
25+
constraints.out \
26+
install_plpgsql.out
2627

2728
all: $(INFILES)
2829

@@ -34,6 +35,7 @@ all: $(INFILES)
3435
OBJ=`pwd`; \
3536
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
3637
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
38+
-e "s:_LIBDIR_:$(LIBDIR):g" \
3739
-e "s/_USER_/$$USER/g" < $< | \
3840
sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@
3941

src/test/regress/sql/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.3 1997/08/28 04:49:31 vadim Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.4 1998/09/29 12:43:03 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
CLFILES= create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql
14+
CLFILES= create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql install_plpgsql.sql
1515

1616
clean:
1717
rm -f $(CLFILES)

src/test/regress/sql/tests

+2
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ select_views
5959
alter_table
6060
portals_p2
6161
rules
62+
install_plpgsql
63+
plpgsql

0 commit comments

Comments
 (0)