cvsuser 02/07/30 13:50:15
Modified: P5EEx/Blue/P5EEx/Blue Repository.pm
Log:
cleaned up the init2() signature and added an exception for misconfigured primary key
Revision Changes Path
1.19 +11 -7 p5ee/P5EEx/Blue/P5EEx/Blue/Repository.pm
Index: Repository.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Repository.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- Repository.pm 30 Jul 2002 16:32:03 -0000 1.18
+++ Repository.pm 30 Jul 2002 20:50:15 -0000 1.19
@@ -1,6 +1,6 @@
#############################################################################
-## $Id: Repository.pm,v 1.18 2002/07/30 16:32:03 spadkins Exp $
+## $Id: Repository.pm,v 1.19 2002/07/30 20:50:15 spadkins Exp $
#############################################################################
package P5EEx::Blue::Repository;
@@ -1987,11 +1987,19 @@
sub set_required_columns_fetched {
my ($self, $table) = @_;
my ($prikeycolumns, @prikeyidx);
+
$prikeycolumns = $self->{table}{$table}{prikey};
+
+ $self->{context}->dbgprint("set_required_columns_fetched($table)")
+ if ($P5EEx::Blue::DEBUG && $self->{context}->dbg(3));
+
if (ref($prikeycolumns) eq "ARRAY") {
$self->add_columns_fetched($table, $prikeycolumns, \@prikeyidx);
$self->{table}{$table}{prikeyidx} = \@prikeyidx;
}
+ elsif ($prikeycolumns) {
+ die "set_required_columns_fetched($table): prikey should be an array, not a
scalar ($prikeycolumns)";
+ }
}
#############################################################################
@@ -2712,7 +2720,6 @@
=head2 init()
* Signature: $repository->init();
- * Signature: $repository->init($named);
* Param: deferConnection integer
* Return: void
* Throws: P5EEx::Blue::Exception::Repository
@@ -2733,14 +2740,12 @@
=cut
sub init {
- my ($self, $args) = @_;
- my ($dbidriver, $dbname, $dbuser, $dbpass, $dbioptions, $dbschema);
- my ($name);
+ my ($self) = @_;
$self->{numrows} = 0;
$self->{error} = "";
- $self->init2($args);
+ $self->init2();
if (!$self->{deferConnection} && !$self->connect()) {
print STDERR "Error on connect():";
@@ -2761,7 +2766,6 @@
=head2 init2()
* Signature: $repository->init2();
- * Signature: $repository->init2($named);
* Param: deferConnection integer
* Return: void
* Throws: P5EEx::Blue::Exception::Repository
