+#-------------------------------------------------------
+#
+# $Id: Changes,v 1.7 1998/06/01 16:41:18 mergl Exp $
+#
+# Copyright (c) 1997, 1998 Edmund Mergl
+#
+#-------------------------------------------------------
+
Revision history for Perl extension Pg.
+
+1.7.4 May 28 1998
+ - applied patches from
+ Brook Milligan :
+ o changed Makefile.PL to look for include files
+ and libs in the source tree, except when the
+ environment variable POSTGRES_HOME is set.
+ o bug-fix in test.pl
+
1.7.3 Mar 28 1998
- linking again with the shared version of libpq
due to problems on several operating systems.
#-------------------------------------------------------
#
-# $Id: Makefile.PL,v 1.7 1998/04/14 21:14:34 mergl Exp $
+# $Id: Makefile.PL,v 1.8 1998/06/01 16:41:19 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
use Config;
use strict;
-print "\nConfiguring Pg\n";
-print "Remember to actually read the README file !\n";
-die "\nYou didn't read the README file !\n" unless ($] >= 5.002);
+# because the perl5 interface is always contained in the source tree,
+# we can be sure about the location of the include files and libs.
+# For development and testing we still test for POSTGRES_HOME.
+#
+#print "\nConfiguring Pg\n";
+#print "Remember to actually read the README file !\n";
+#die "\nYou didn't read the README file !\n" unless ($] >= 5.002);
+#
+#if (! $ENV{POSTGRES_HOME}) {
+# warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n";
+# foreach(qw(../../../ /usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) {
+# if (-d "$_/lib") {
+# $ENV{POSTGRES_HOME} = $_;
+# last;
+# }
+# }
+#}
+#
+#if (-d "$ENV{POSTGRES_HOME}/lib") {
+# print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
+#} else {
+# die "Unable to determine PostgreSQL\n";
+#}
+
+my %opts;
if (! $ENV{POSTGRES_HOME}) {
- warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n";
- foreach(qw(/usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) {
- if (-d "$_/lib") {
- $ENV{POSTGRES_HOME} = $_;
- last;
- }
- }
-}
-if (-d "$ENV{POSTGRES_HOME}/lib") {
- print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
+ my $cwd = `pwd`;
+ chop $cwd;
+
+ %opts = (
+ NAME => 'Pg',
+ VERSION_FROM => 'Pg.pm',
+ INC => "-I$cwd/../libpq -I$cwd/../../include",
+ OBJECT => "Pg\$(OBJ_EXT)",
+ LIBS => ["-L$cwd/../libpq -lpq"],
+ );
+
} else {
- die "Unable to determine PostgreSQL\n";
-}
-my %opts = (
- NAME => 'Pg',
- VERSION_FROM => 'Pg.pm',
- INC => "-I$ENV{POSTGRES_HOME}/include -I/usr/local/include/pgsql -I/usr/include/pgsql",
- OBJECT => "Pg\$(OBJ_EXT)",
- LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"],
-);
+ %opts = (
+ NAME => 'Pg',
+ VERSION_FROM => 'Pg.pm',
+ INC => "-I$ENV{POSTGRES_HOME}/include",
+ OBJECT => "Pg\$(OBJ_EXT)",
+ LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"],
+ );
+}
WriteMakefile(%opts);
#-------------------------------------------------------
#
-# $Id: Pg.pm,v 1.6 1998/04/14 21:14:35 mergl Exp $
+# $Id: Pg.pm,v 1.7 1998/06/01 16:41:19 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
PGRES_InvalidOid
);
-$Pg::VERSION = '1.7.3';
+$Pg::VERSION = '1.7.4';
sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
/*-------------------------------------------------------
*
- * $Id: Pg.xs,v 1.6 1998/04/14 21:14:36 mergl Exp $
+ * $Id: Pg.xs,v 1.7 1998/06/01 16:41:19 mergl Exp $
*
- * Copyright (c) 1997 Edmund Mergl
+ * Copyright (c) 1997, 1998 Edmund Mergl
*
*-------------------------------------------------------*/
#-------------------------------------------------------
#
-# $Id: README,v 1.6 1998/04/14 21:14:37 mergl Exp $
+# $Id: README,v 1.7 1998/06/01 16:41:19 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
DESCRIPTION:
------------
-This is version 1.7.3 of pgsql_perl5 (previously called pg95perl5).
+This is version 1.7.4 of pgsql_perl5 (previously called pg95perl5).
Pgsql_perl5 is an interface between Larry Wall's language perl version 5 and
the database PostgreSQL (previously Postgres95). This has been done by using
INSTALLATION:
-------------
-Using dynamic loading for perl extensions, the preferred method is to unpack
-the tar file outside the perl source tree. This assumes, that you already
-have installed perl5.
+Since the perl5 interface is always contained in the source tree of PostgreSQL,
+it is usually build together with PostgreSQL itself. This can be obtained by
+adding the option '--with-perl' to the configure command.
+
+In case you need to build the perl interface stand alone, you need to set the
+environment variable POSTGRES_HOME, pointing to the PostgreSQL home-directory.
+Also PostgreSQL needs to be installed having the include files in
+$POSTGRES_HOME/include and the libs in $POSTGRES_HOME/lib. Then you have to
+build the module as any standard perl-module with the following commands:
-The Makefile checks the environment variable POSTGRES_HOME as well some
-standard locations, to find the root directory of your Postgres installation.
-
1. perl Makefile.PL
2. make
3. make test
Dan Lauterbach
-
DOCUMENTATION:
--------------
---------------------------------------------------------------------------
- Edmund Mergl March 28, 1998
+ Edmund Mergl May 28, 1998
---------------------------------------------------------------------------
#!/usr/local/bin/perl
+#-------------------------------------------------------
+#
+# $Id: ApachePg.pl,v 1.4 1998/06/01 16:41:26 mergl Exp $
+#
+# Copyright (c) 1997, 1998 Edmund Mergl
+#
+#-------------------------------------------------------
+
# demo script, tested with:
# - PostgreSQL-6.3
# - apache_1.3
my @row;
while (@row = $result->fetchrow) {
- print "
| ", join(" | ", @row), " |
\n";
+ print "
| ", join(" | ", @row), " |
";
}
} else {
#-------------------------------------------------------
#
-# $Id: example.newstyle,v 1.4 1998/04/14 21:14:50 mergl Exp $
+# $Id: example.newstyle,v 1.5 1998/06/01 16:41:27 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
######################### create and insert into table
# 8-19
-$result = $conn->exec("CREATE TABLE person (id int4, name char16)");
+$result = $conn->exec("CREATE TABLE person (id int4, name char(16))");
cmp_eq(PGRES_COMMAND_OK, $result->resultStatus);
cmp_eq("CREATE", $result->cmdStatus);
while (-1 != $ret) {
$ret = $conn->getline($string, 256);
last if $string eq "\\.";
- cmp_eq("$i Edmund Mergl", $string);
+ cmp_eq("$i Edmund Mergl ", $string);
$i ++;
}
cmp_eq(4, $fsize);
} else {
cmp_eq("name", $fname);
- cmp_eq(20, $ftype);
- cmp_eq(16, $fsize);
+ cmp_eq(1042, $ftype);
+ cmp_eq(-1, $fsize);
}
$fnumber = $result->fnumber($fname);
cmp_eq($k, $fnumber);
while (@row = $result->fetchrow) {
$string = join(" ", @row);
}
-cmp_eq("5 Edmund Mergl", $string);
+cmp_eq("5 Edmund Mergl ", $string);
######################### PQnotifies
# 43-46
#-------------------------------------------------------
#
-# $Id: example.oldstyle,v 1.4 1998/04/14 21:14:52 mergl Exp $
+# $Id: example.oldstyle,v 1.5 1998/06/01 16:41:27 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
######################### create and insert into table
# 8-19
-$result = PQexec($conn, "CREATE TABLE person (id int4, name char16)");
+$result = PQexec($conn, "CREATE TABLE person (id int4, name char(16))");
cmp_eq(PGRES_COMMAND_OK, PQresultStatus($result));
cmp_eq("CREATE", PQcmdStatus($result));
PQclear($result);
while (-1 != $ret) {
$ret = PQgetline($conn, $string, 256);
last if $string eq "\\.";
- cmp_eq("$i Edmund Mergl", $string);
+ cmp_eq("$i Edmund Mergl ", $string);
$i++;
}
cmp_eq(4, $fsize);
} else {
cmp_eq("name", $fname);
- cmp_eq(20, $ftype);
- cmp_eq(16, $fsize);
+ cmp_eq(1042, $ftype);
+ cmp_eq(-1, $fsize);
}
$fnumber = PQfnumber($result, $fname);
cmp_eq($k, $fnumber);
$string .= PQgetvalue($result, $k, $l) . " ";
}
$i = $k + 1;
- cmp_eq("$i Edmund Mergl ", $string);
+ cmp_eq("$i Edmund Mergl ", $string);
}
PQclear($result);
#-------------------------------------------------------
#
-# $Id: test.pl,v 1.7 1998/04/14 21:14:38 mergl Exp $
+# $Id: test.pl,v 1.8 1998/06/01 16:41:20 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
######################### create and insert into table
# 8-19
-$result = $conn->exec("CREATE TABLE person (id int4, name char16)");
+$result = $conn->exec("CREATE TABLE person (id int4, name char(16))");
cmp_eq(PGRES_COMMAND_OK, $result->resultStatus);
cmp_eq("CREATE", $result->cmdStatus);
while (-1 != $ret) {
$ret = $conn->getline($string, 256);
last if $string eq "\\.";
- cmp_eq("$i Edmund Mergl", $string);
- $i ++;
+ cmp_eq("$i Edmund Mergl ", $string);
+ $i++;
}
cmp_eq(0, $conn->endcopy);
cmp_eq(4, $fsize);
} else {
cmp_eq("name", $fname);
- cmp_eq(20, $ftype);
- cmp_eq(16, $fsize);
+ cmp_eq(1042, $ftype);
+ cmp_eq(-1, $fsize);
}
$fnumber = $result->fnumber($fname);
cmp_eq($k, $fnumber);
while (@row = $result->fetchrow) {
$string = join(" ", @row);
}
-cmp_eq("5 Edmund Mergl", $string);
+cmp_eq("5 Edmund Mergl ", $string);
######################### debug, PQuntrace
#-------------------------------------------------------
#
-# $Id: typemap,v 1.6 1998/04/14 21:14:39 mergl Exp $
+# $Id: typemap,v 1.7 1998/06/01 16:41:20 mergl Exp $
#
-# Copyright (c) 1997 Edmund Mergl
+# Copyright (c) 1997, 1998 Edmund Mergl
#
#-------------------------------------------------------
projects / postgresql.git / commitdiff