From c5d49902fb5ac589059b724f78d95ad7d34a50ce Mon Sep 17 00:00:00 2001 From: Edmund Mergl Date: Thu, 25 Sep 1997 21:15:04 +0000 Subject: [PATCH] *** empty log message *** --- src/interfaces/perl5/Changes | 5 ++++- src/interfaces/perl5/Makefile.PL | 31 +++++++++++++++++++------------ src/interfaces/perl5/Pg.pm | 4 ++-- src/interfaces/perl5/Pg.xs | 2 +- src/interfaces/perl5/README | 19 +++++++++++-------- src/interfaces/perl5/eg/ApachePg.pl | 12 ++++++++++-- src/interfaces/perl5/eg/example.newstyle | 15 ++++++++------- src/interfaces/perl5/eg/example.oldstyle | 7 ++++--- src/interfaces/perl5/test.pl | 13 +++++++------ src/interfaces/perl5/typemap | 2 +- 10 files changed, 67 insertions(+), 43 deletions(-) diff --git a/src/interfaces/perl5/Changes b/src/interfaces/perl5/Changes index 48438f7ce4..f724f2c559 100644 --- a/src/interfaces/perl5/Changes +++ b/src/interfaces/perl5/Changes @@ -1,7 +1,10 @@ Revision history for Perl extension Pg. +1.6.3 Sep 25 1997 + - README update + 1.6.2 Sep 20 1997 - - adapted to PostgresqL-6.2: + - adapted to PostgreSQL-6.2: o added support for new method cmdTuples o cmdStatus returns now for DELETE the status followed by the number of affected rows, diff --git a/src/interfaces/perl5/Makefile.PL b/src/interfaces/perl5/Makefile.PL index 7f3c646195..a64fc42ec0 100644 --- a/src/interfaces/perl5/Makefile.PL +++ b/src/interfaces/perl5/Makefile.PL @@ -1,20 +1,22 @@ #------------------------------------------------------- # -# $Id: Makefile.PL,v 1.3 1997/09/17 20:46:20 mergl Exp $ +# $Id: Makefile.PL,v 1.4 1997/09/25 21:14:41 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # #------------------------------------------------------- use ExtUtils::MakeMaker; +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.003); +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/pgsql /usr/local/pgsql /usr/pgsql-6.1 /usr/local/pgsql-6.1)) { + 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; @@ -22,17 +24,22 @@ if (! $ENV{POSTGRES_HOME}) { } } -if ($ENV{POSTGRES_HOME}) { - print "\nFound PostgreSQL in $ENV{POSTGRES_HOME}\n"; +if (-d "$ENV{POSTGRES_HOME}/lib") { + print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n"; } else { - die "Unable to determine \$POSTGRES_HOME !\n"; + die "Unable to determine PostgreSQL\n"; } -WriteMakefile( - 'NAME' => 'Pg', - 'VERSION_FROM' => 'Pg.pm', - 'LIBS' => ["-L$ENV{POSTGRES_HOME}/lib -lpq"], - 'INC' => "-I$ENV{POSTGRES_HOME}/include", +my %opts = ( + NAME => 'Pg', + VERSION_FROM => 'Pg.pm', + INC => "-I$ENV{POSTGRES_HOME}/include", + LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"], ); -# EOF + +WriteMakefile(%opts); + +exit(0); + +# end of Makefile.PL diff --git a/src/interfaces/perl5/Pg.pm b/src/interfaces/perl5/Pg.pm index 4591dcb1fa..a46df8d04c 100644 --- a/src/interfaces/perl5/Pg.pm +++ b/src/interfaces/perl5/Pg.pm @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: Pg.pm,v 1.3 1997/09/17 20:46:21 mergl Exp $ +# $Id: Pg.pm,v 1.4 1997/09/25 21:14:43 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -84,7 +84,7 @@ require 5.002; PGRES_InvalidOid ); -$Pg::VERSION = '1.6.2'; +$Pg::VERSION = '1.6.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 f7661d8840..b1594a73e8 100644 --- a/src/interfaces/perl5/Pg.xs +++ b/src/interfaces/perl5/Pg.xs @@ -1,6 +1,6 @@ /*------------------------------------------------------- * - * $Id: Pg.xs,v 1.3 1997/09/17 20:46:21 mergl Exp $ + * $Id: Pg.xs,v 1.4 1997/09/25 21:14:44 mergl Exp $ * * Copyright (c) 1997 Edmund Mergl * diff --git a/src/interfaces/perl5/README b/src/interfaces/perl5/README index 4b9a68a47b..04fa867a90 100644 --- a/src/interfaces/perl5/README +++ b/src/interfaces/perl5/README @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: README,v 1.3 1997/09/17 20:46:26 mergl Exp $ +# $Id: README,v 1.4 1997/09/25 21:14:46 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -9,7 +9,7 @@ DESCRIPTION: ------------ -This is version 1.6.2 of pgsql_perl5 (previously called pg95perl5). +This is version 1.6.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 @@ -85,14 +85,17 @@ Run 'make test'. Note, that the user running this script must have been created with the access rights to create databases *AND* users ! Do not run this script as root ! -If you are using the shared library libpq.so, make sure, your dynamic loader -is able to find libpq.so. With Linux the command /sbin/ldconfig -v should tell -you, where it finds libpq.so. If not, you need to add an appropriate entry to -/etc/ld.so.conf or to the environment variable LD_LIBRARY_PATH. +If you are using the shared library libpq.so check if your dynamic loader +finds libpq.so. With Linux the command /sbin/ldconfig -v should tell you, +where it finds libpq.so. If ldconfig does not find libpq.so, either add an +appropriate entry to /etc/ld.so.conf and re-run ldconfig or add the path to +the environment variable LD_LIBRARY_PATH. +A typical error message resulting from not finding libpq.so is: + Can't load './blib/arch/auto/Pg/Pg.so' for module Pg: File not found at Some linux distributions have an incomplete perl installation. If you have compile errors like "XS_VERSION_BOOTCHECK undeclared", make a - 'find /usr/lib/perl5 -name XSUB.h -print' + 'find .../lib/perl5 -name XSUB.h -print' If this file is not present, you need to recompile and reinstall perl. @@ -105,6 +108,6 @@ installation to read the documentation. --------------------------------------------------------------------------- - Edmund Mergl September 20, 1997 + Edmund Mergl September 25, 1997 --------------------------------------------------------------------------- diff --git a/src/interfaces/perl5/eg/ApachePg.pl b/src/interfaces/perl5/eg/ApachePg.pl index 39e609cf7c..a43476e5b2 100644 --- a/src/interfaces/perl5/eg/ApachePg.pl +++ b/src/interfaces/perl5/eg/ApachePg.pl @@ -4,7 +4,7 @@ # - PostgreSQL-6.2 # - apache_1.2.4 # - mod_perl-1.00 -# - perl5.004_01 +# - perl5.004_03 use CGI; use Pg; @@ -30,7 +30,15 @@ if ($query->param) { $conn = Pg::connectdb("dbname = $dbname"); $cmd = $query->param('cmd'); $result = $conn->exec($cmd); - $result->print(STDOUT, 0, 0, 0, 1, 0, 0, '', '', ''); + print ""; + for ($i = 0; $i < $result->ntuples; $i++) { + print ""; + for ($j = 0; $j < $result->nfields; $j++) { + print ""; + } + print ""; + } + print "
", $result->getvalue($i, $j), "
"; } print $query->end_html; diff --git a/src/interfaces/perl5/eg/example.newstyle b/src/interfaces/perl5/eg/example.newstyle index a64f144739..04d2964df7 100644 --- a/src/interfaces/perl5/eg/example.newstyle +++ b/src/interfaces/perl5/eg/example.newstyle @@ -1,8 +1,8 @@ -#!/usr/local/bin/perl +#!/usr/local/bin/perl -w #------------------------------------------------------- # -# $Id: example.newstyle,v 1.1 1997/09/17 20:48:14 mergl Exp $ +# $Id: example.newstyle,v 1.2 1997/09/25 21:15:02 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -88,7 +88,7 @@ $SIG{PIPE} = sub { print "broken pipe\n" }; ######################### create and connect to test database # 2-4 -$conn = Pg::connectdb("dbname = $dbmain"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); # might fail if $dbname doesn't exist => don't check resultStatus @@ -97,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"); +$conn = Pg::connectdb("dbname=$dbname"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); ######################### debug, PQtrace @@ -141,7 +141,8 @@ for ($i = 1; $i <= 5; $i++) { $result = $conn->exec("COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, $result->resultStatus); -$i = 1; +$i = 1; +$ret = 0; while (-1 != $ret) { $ret = $conn->getline($string, 256); last if $string eq "\\."; @@ -217,7 +218,7 @@ if (! defined($pid = fork)) { # i'm the child sleep 2; bless $conn; - $conn = Pg::connectdb("dbname = $dbname"); + $conn = Pg::connectdb("dbname=$dbname"); $result = $conn->exec("NOTIFY person"); exit; } @@ -277,7 +278,7 @@ if ($DEBUG) { ######################### disconnect and drop test database # 60-61 -$conn = Pg::connectdb("dbname = $dbmain"); +$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 d6c84e0434..7f0f46b6f2 100644 --- a/src/interfaces/perl5/eg/example.oldstyle +++ b/src/interfaces/perl5/eg/example.oldstyle @@ -1,8 +1,8 @@ -#!/usr/local/bin/perl +#!/usr/local/bin/perl -w #------------------------------------------------------- # -# $Id: example.oldstyle,v 1.1 1997/09/17 20:48:15 mergl Exp $ +# $Id: example.oldstyle,v 1.2 1997/09/25 21:15:04 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -148,7 +148,8 @@ $result = PQexec($conn, "COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, PQresultStatus($result)); PQclear($result); -$i = 1; +$i = 1; +$ret = 0; while (-1 != $ret) { $ret = PQgetline($conn, $string, 256); last if $string eq "\\."; diff --git a/src/interfaces/perl5/test.pl b/src/interfaces/perl5/test.pl index 7a61249601..422ddea10c 100644 --- a/src/interfaces/perl5/test.pl +++ b/src/interfaces/perl5/test.pl @@ -1,8 +1,8 @@ -#!/usr/local/bin/perl +#!/usr/local/bin/perl -w #------------------------------------------------------- # -# $Id: test.pl,v 1.4 1997/09/17 20:53:35 mergl Exp $ +# $Id: test.pl,v 1.5 1997/09/25 21:14:47 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # @@ -88,7 +88,7 @@ $SIG{PIPE} = sub { print "broken pipe\n" }; ######################### create and connect to test database # 2-4 -$conn = Pg::connectdb("dbname = $dbmain"); +$conn = Pg::connectdb("dbname=$dbmain"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); # might fail if $dbname doesn't exist => don't check resultStatus @@ -97,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"); +$conn = Pg::connectdb("dbname=$dbname"); cmp_eq(PGRES_CONNECTION_OK, $conn->status); ######################### debug, PQtrace @@ -141,7 +141,8 @@ for ($i = 1; $i <= 5; $i++) { $result = $conn->exec("COPY person TO STDOUT"); cmp_eq(PGRES_COPY_OUT, $result->resultStatus); -$i = 1; +$i = 1; +$ret = 0; while (-1 != $ret) { $ret = $conn->getline($string, 256); last if $string eq "\\."; @@ -218,7 +219,7 @@ if ($DEBUG) { ######################### disconnect and drop test database # 49-50 -$conn = Pg::connectdb("dbname = $dbmain"); +$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 4eefe795e9..ba18b3c4c5 100644 --- a/src/interfaces/perl5/typemap +++ b/src/interfaces/perl5/typemap @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: typemap,v 1.3 1997/09/17 20:46:29 mergl Exp $ +# $Id: typemap,v 1.4 1997/09/25 21:14:49 mergl Exp $ # # Copyright (c) 1997 Edmund Mergl # -- 2.11.0