From 11c091272adcc7e2d125ef0aa2b4f6954fd13ac4 Mon Sep 17 00:00:00 2001 From: Edmund Mergl Date: Tue, 14 Apr 1998 21:14:52 +0000 Subject: [PATCH] 1.7.3 --- src/interfaces/perl5/Changes | 11 ++++++++ src/interfaces/perl5/Makefile.PL | 24 +++++++++++++--- src/interfaces/perl5/Pg.pm | 4 +-- src/interfaces/perl5/Pg.xs | 2 +- src/interfaces/perl5/README | 6 ++-- src/interfaces/perl5/eg/example.newstyle | 36 +++++++++++------------- src/interfaces/perl5/eg/example.oldstyle | 36 +++++++++++------------- src/interfaces/perl5/test.pl | 28 ++++++++---------- src/interfaces/perl5/typemap | 2 +- 9 files changed, 82 insertions(+), 67 deletions(-) diff --git a/src/interfaces/perl5/Changes b/src/interfaces/perl5/Changes index 99be7ab7d2..3806a73b50 100644 --- a/src/interfaces/perl5/Changes +++ b/src/interfaces/perl5/Changes @@ -1,5 +1,16 @@ Revision history for Perl extension Pg. +1.7.3 Mar 28 1998 + - linking again with the shared version of libpq + due to problems on several operating systems. + +1.7.2 Mar 06 1998 + - module is now linked with static libpq.a + +1.7.1 Mar 03 1998 + - expanded the search path for include files + - return to UNIX domain sockets in test-scripts + 1.7.0 Feb 20 1998 - adapted to PostgreSQL-6.3: add host=localhost to the conninfo-string diff --git a/src/interfaces/perl5/Makefile.PL b/src/interfaces/perl5/Makefile.PL index 8c758c0802..e27ba627bb 100644 --- a/src/interfaces/perl5/Makefile.PL +++ b/src/interfaces/perl5/Makefile.PL @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: Makefile.PL,v 1.6 1998/04/06 01:36:30 momjian Exp $ +# $Id: Makefile.PL,v 1.7 1998/04/14 21:14:34 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -14,12 +14,28 @@ 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 = ( NAME => 'Pg', VERSION_FROM => 'Pg.pm', - INC => "-I../libpq -I../../include", - LIBS => ["-L../libpq -lpq"], - CC => 'gcc', + 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"], ); diff --git a/src/interfaces/perl5/Pg.pm b/src/interfaces/perl5/Pg.pm index f234a1d25a..15765836e7 100644 --- a/src/interfaces/perl5/Pg.pm +++ b/src/interfaces/perl5/Pg.pm @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: Pg.pm,v 1.5 1998/02/20 21:25:35 mergl Exp $ +# $Id: Pg.pm,v 1.6 1998/04/14 21:14:35 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -84,7 +84,7 @@ require 5.002; PGRES_InvalidOid ); -$Pg::VERSION = '1.7.0'; +$Pg::VERSION = '1.7.3'; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff --git a/src/interfaces/perl5/Pg.xs b/src/interfaces/perl5/Pg.xs index 80929de033..919b698542 100644 --- a/src/interfaces/perl5/Pg.xs +++ b/src/interfaces/perl5/Pg.xs @@ -1,6 +1,6 @@ /*------------------------------------------------------- * - * $Id: Pg.xs,v 1.5 1998/02/20 21:25:36 mergl Exp $ + * $Id: Pg.xs,v 1.6 1998/04/14 21:14:36 mergl Exp $ * * Copyright (c) 1997 Edmund Mergl * diff --git a/src/interfaces/perl5/README b/src/interfaces/perl5/README index b49ca34fdf..6b699c2159 100644 --- a/src/interfaces/perl5/README +++ b/src/interfaces/perl5/README @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: README,v 1.5 1998/02/20 21:25:42 mergl Exp $ +# $Id: README,v 1.6 1998/04/14 21:14:37 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -9,7 +9,7 @@ DESCRIPTION: ------------ -This is version 1.7.0 of pgsql_perl5 (previously called pg95perl5). +This is version 1.7.3 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 @@ -127,6 +127,6 @@ installation to read the documentation. --------------------------------------------------------------------------- - Edmund Mergl February 20, 1998 + Edmund Mergl March 28, 1998 --------------------------------------------------------------------------- diff --git a/src/interfaces/perl5/eg/example.newstyle b/src/interfaces/perl5/eg/example.newstyle index 8b80e94b38..9f5e095d3f 100644 --- a/src/interfaces/perl5/eg/example.newstyle +++ b/src/interfaces/perl5/eg/example.newstyle @@ -2,7 +2,7 @@ #------------------------------------------------------- # -# $Id: example.newstyle,v 1.3 1998/02/20 21:26:06 mergl Exp $ +# $Id: example.newstyle,v 1.4 1998/04/14 21:14:50 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -13,7 +13,7 @@ ######################### We start with some black magic to print on failure. -BEGIN { $| = 1; print "1..57\n"; } +BEGIN { $| = 1; print "1..56\n"; } END {print "not ok 1\n" unless $loaded;} use Pg; $loaded = 1; @@ -23,7 +23,6 @@ print "ok 1\n"; $dbmain = 'template1'; $dbname = 'pgperltest'; -$dbhost = 'localhost'; $trace = '/tmp/pgtrace.out'; $cnt = 2; $DEBUG = 0; # set this to 1 for traces @@ -35,7 +34,6 @@ $| = 1; # connectdb # db # user -# host # port # finish # status @@ -69,6 +67,7 @@ $| = 1; # conndefaults # reset # options +# host # tty # getlength # getisnull @@ -89,7 +88,7 @@ $SIG{PIPE} = sub { print "broken pipe\n" }; ######################### create and connect to test database # 2-4 -$conn = Pg::connectdb("dbname=$dbmain host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); # might fail if $dbname doesn't exist => don't check resultStatus @@ -98,7 +97,7 @@ $result = $conn->exec("DROP DATABASE $dbname"); $result = $conn->exec("CREATE DATABASE $dbname"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); -$conn = Pg::connectdb("dbname=$dbname host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbname"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); ######################### debug, PQtrace @@ -109,7 +108,7 @@ if ($DEBUG) { } ######################### check PGconn -# 5-8 +# 5-7 $db = $conn->db; cmp_eq($dbname, $db); @@ -117,14 +116,11 @@ cmp_eq($dbname, $db); $user = $conn->user; cmp_ne("", $user); -$host = $conn->host; -cmp_ne("", $host); - $port = $conn->port; cmp_ne("", $port); ######################### create and insert into table -# 9-20 +# 8-19 $result = $conn->exec("CREATE TABLE person (id int4, name char16)"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); @@ -137,7 +133,7 @@ for ($i = 1; $i <= 5; $i++) { } ######################### copy to stdout, PQgetline -# 21-27 +# 20-26 $result = $conn->exec("COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, $result->resultStatus); @@ -154,7 +150,7 @@ while (-1 != $ret) { cmp_eq(0, $conn->endcopy); ######################### delete and copy from stdin, PQputline -# 28-34 +# 27-33 $result = $conn->exec("BEGIN"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); @@ -179,7 +175,7 @@ $result = $conn->exec("END"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); ######################### select from person, PQgetvalue -# 35-48 +# 34-47 $result = $conn->exec("SELECT * FROM person"); cmp_eq(PGRES_TUPLES_OK, $result->resultStatus); @@ -208,7 +204,7 @@ while (@row = $result->fetchrow) { cmp_eq("5 Edmund Mergl", $string); ######################### PQnotifies -# 44-47 +# 43-46 if (! defined($pid = fork)) { die "can not fork: $!"; @@ -216,7 +212,7 @@ if (! defined($pid = fork)) { # i'm the child sleep 2; bless $conn; - $conn = Pg::connectdb("dbname=$dbname host=$dbhost"); + $conn = Pg::connectdb("dbname=$dbname"); $result = $conn->exec("NOTIFY person"); exit; } @@ -234,7 +230,7 @@ while (1) { cmp_eq("person", $table); ######################### PQprint -# 48-49 +# 47-48 $result = $conn->exec("SELECT name FROM person WHERE id = 2"); cmp_eq(PGRES_TUPLES_OK, $result->resultStatus); @@ -244,7 +240,7 @@ $result->print(PRINT, 0, 0, 0, 0, 1, 0, " ", "", "", "myName"); close(PRINT) || die "bad PRINT: $!"; ######################### PQlo_import, PQlo_export, PQlo_unlink -# 50-55 +# 49-54 $filename = 'ApachePg.pl'; $cwd = `pwd`; @@ -274,9 +270,9 @@ if ($DEBUG) { } ######################### disconnect and drop test database -# 56-57 +# 55-56 -$conn = Pg::connectdb("dbname=$dbmain host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); $result = $conn->exec("DROP DATABASE $dbname"); diff --git a/src/interfaces/perl5/eg/example.oldstyle b/src/interfaces/perl5/eg/example.oldstyle index 6c537af1b8..49f5898238 100644 --- a/src/interfaces/perl5/eg/example.oldstyle +++ b/src/interfaces/perl5/eg/example.oldstyle @@ -2,7 +2,7 @@ #------------------------------------------------------- # -# $Id: example.oldstyle,v 1.3 1998/02/20 21:26:08 mergl Exp $ +# $Id: example.oldstyle,v 1.4 1998/04/14 21:14:52 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -13,7 +13,7 @@ ######################### We start with some black magic to print on failure. -BEGIN { $| = 1; print "1..61\n"; } +BEGIN { $| = 1; print "1..60\n"; } END {print "not ok 1\n" unless $loaded;} use Pg; $loaded = 1; @@ -23,7 +23,6 @@ print "ok 1\n"; $dbmain = 'template1'; $dbname = 'pgperltest'; -$dbhost = 'localhost'; $trace = '/tmp/pgtrace.out'; $cnt = 2; $DEBUG = 0; # set this to 1 for traces @@ -34,7 +33,6 @@ $| = 1; # PQsetdb() # PQdb() -# PQhost() # PQport() # PQfinish() # PQstatus() @@ -69,6 +67,7 @@ $| = 1; # PQconndefaults() # PQreset() # PQoptions() +# PQhost() # PQtty() # PQgetlength() # PQgetisnull() @@ -89,7 +88,7 @@ $SIG{PIPE} = sub { print "broken pipe\n" }; ######################### create and connect to test database # 2-4 -$conn = PQsetdb($dbhost, '', '', '', $dbmain); +$conn = PQsetdb('', '', '', '', $dbmain); cmp_eq(PGRES_CONNECTION_OK, PQstatus($conn)); # might fail if $dbname doesn't exist => don't check resultStatus @@ -102,7 +101,7 @@ PQclear($result); PQfinish($conn); -$conn = PQsetdb($dbhost, '', '', '', $dbname); +$conn = PQsetdb('', '', '', '', $dbname); cmp_eq(PGRES_CONNECTION_OK, PQstatus($conn)); ######################### debug, PQtrace @@ -113,7 +112,7 @@ if ($DEBUG) { } ######################### check PGconn -# 5-8 +# 5-7 $db = PQdb($conn); cmp_eq($dbname, $db); @@ -121,14 +120,11 @@ cmp_eq($dbname, $db); $user = PQuser($conn); cmp_ne("", $user); -$host = PQhost($conn); -cmp_ne("", $host); - $port = PQport($conn); cmp_ne("", $port); ######################### create and insert into table -# 9-20 +# 8-19 $result = PQexec($conn, "CREATE TABLE person (id int4, name char16)"); cmp_eq(PGRES_COMMAND_OK, PQresultStatus($result)); @@ -143,7 +139,7 @@ for ($i = 1; $i <= 5; $i++) { } ######################### copy to stdout, PQgetline -# 21-27 +# 20-26 $result = PQexec($conn, "COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, PQresultStatus($result)); @@ -161,7 +157,7 @@ while (-1 != $ret) { cmp_eq(0, PQendcopy($conn)); ######################### delete and copy from stdin, PQputline -# 28-34 +# 27-33 $result = PQexec($conn, "BEGIN"); cmp_eq(PGRES_COMMAND_OK, PQresultStatus($result)); @@ -190,7 +186,7 @@ cmp_eq(PGRES_COMMAND_OK, PQresultStatus($result)); PQclear($result); ######################### select from person, PQgetvalue -# 35-48 +# 34-47 $result = PQexec($conn, "SELECT * FROM person"); cmp_eq(PGRES_TUPLES_OK, PQresultStatus($result)); @@ -224,14 +220,14 @@ for ($k = 0; $k < PQntuples($result); $k++) { PQclear($result); ######################### PQnotifies -# 49-51 +# 48-50 if (! defined($pid = fork)) { die "can not fork: $!"; } elsif (! $pid) { # i'm the child sleep 2; - $conn = PQsetdb($dbhost, '', '', '', $dbname); + $conn = PQsetdb('', '', '', '', $dbname); $result = PQexec($conn, "NOTIFY person"); PQclear($result); PQfinish($conn); @@ -253,7 +249,7 @@ while (1) { cmp_eq("person", $table); ######################### PQprint -# 52-53 +# 51-52 $result = PQexec($conn, "SELECT name FROM person WHERE id = 2"); cmp_eq(PGRES_TUPLES_OK, PQresultStatus($result)); @@ -264,7 +260,7 @@ PQclear($result); close(PRINT) || die "bad PRINT: $!"; ######################### PQlo_import, PQlo_export, PQlo_unlink -# 54-60 +# 53-59 $filename = 'ApachePg.pl'; $cwd = `pwd`; @@ -296,11 +292,11 @@ if ($DEBUG) { } ######################### disconnect and drop test database -# 60-61 +# 59-60 PQfinish($conn); -$conn = PQsetdb($dbhost, '', '', '', $dbmain); +$conn = PQsetdb('', '', '', '', $dbmain); cmp_eq(PGRES_CONNECTION_OK, PQstatus($conn)); $result = PQexec($conn, "DROP DATABASE $dbname"); diff --git a/src/interfaces/perl5/test.pl b/src/interfaces/perl5/test.pl index d6414bee7f..ac351741f9 100644 --- a/src/interfaces/perl5/test.pl +++ b/src/interfaces/perl5/test.pl @@ -2,7 +2,7 @@ #------------------------------------------------------- # -# $Id: test.pl,v 1.6 1998/02/20 21:25:45 mergl Exp $ +# $Id: test.pl,v 1.7 1998/04/14 21:14:38 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -13,7 +13,7 @@ ######################### We start with some black magic to print on failure. -BEGIN { $| = 1; print "1..46\n"; } +BEGIN { $| = 1; print "1..45\n"; } END {print "not ok 1\n" unless $loaded;} use Pg; $loaded = 1; @@ -23,7 +23,6 @@ print "ok 1\n"; $dbmain = 'template1'; $dbname = 'pgperltest'; -$dbhost = 'localhost'; $trace = '/tmp/pgtrace.out'; $cnt = 2; $DEBUG = 0; # set this to 1 for traces @@ -35,7 +34,6 @@ $| = 1; # connectdb # db # user -# host # port # finish # status @@ -64,6 +62,7 @@ $| = 1; # conndefaults # reset # options +# host # tty # getlength # getisnull @@ -89,7 +88,7 @@ $SIG{PIPE} = sub { print "broken pipe\n" }; ######################### create and connect to test database # 2-4 -$conn = Pg::connectdb("dbname=$dbmain host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); # might fail if $dbname doesn't exist => don't check resultStatus @@ -98,7 +97,7 @@ $result = $conn->exec("DROP DATABASE $dbname"); $result = $conn->exec("CREATE DATABASE $dbname"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); -$conn = Pg::connectdb("dbname=$dbname host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbname"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); ######################### debug, PQtrace @@ -109,7 +108,7 @@ if ($DEBUG) { } ######################### check PGconn -# 5-8 +# 5-7 $db = $conn->db; cmp_eq($dbname, $db); @@ -117,14 +116,11 @@ cmp_eq($dbname, $db); $user = $conn->user; cmp_ne("", $user); -$host = $conn->host; -cmp_ne("", $host); - $port = $conn->port; cmp_ne("", $port); ######################### create and insert into table -# 9-20 +# 8-19 $result = $conn->exec("CREATE TABLE person (id int4, name char16)"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); @@ -137,7 +133,7 @@ for ($i = 1; $i <= 5; $i++) { } ######################### copy to stdout, PQgetline -# 21-27 +# 20-26 $result = $conn->exec("COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, $result->resultStatus); @@ -154,7 +150,7 @@ while (-1 != $ret) { cmp_eq(0, $conn->endcopy); ######################### delete and copy from stdin, PQputline -# 28-34 +# 27-33 $result = $conn->exec("BEGIN"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); @@ -179,7 +175,7 @@ $result = $conn->exec("END"); cmp_eq(PGRES_COMMAND_OK, $result->resultStatus); ######################### select from person, PQgetvalue -# 31-44 +# 34-43 $result = $conn->exec("SELECT * FROM person"); cmp_eq(PGRES_TUPLES_OK, $result->resultStatus); @@ -215,9 +211,9 @@ if ($DEBUG) { } ######################### disconnect and drop test database -# 45-46 +# 44-45 -$conn = Pg::connectdb("dbname=$dbmain host=$dbhost"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); $result = $conn->exec("DROP DATABASE $dbname"); diff --git a/src/interfaces/perl5/typemap b/src/interfaces/perl5/typemap index 27b440c53a..e3d14a8fed 100644 --- a/src/interfaces/perl5/typemap +++ b/src/interfaces/perl5/typemap @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: typemap,v 1.5 1998/02/20 21:25:47 mergl Exp $ +# $Id: typemap,v 1.6 1998/04/14 21:14:39 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # -- 2.40.0