Update of /cvsroot/openinteract/SPOPS/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv31422
Modified Files:
DBI.pm
Log Message:
ensure we access the type info with lowercased fields
Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/SPOPS/DBI.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** DBI.pm 2001/10/22 11:50:00 1.52
--- DBI.pm 2001/10/23 02:38:38 1.53
***************
*** 169,173 ****
? $id_field
: join( '.', $item->table_name, $id_field );
! return join(' = ', $use_id_field, $db->quote( $id, $type_info->{ $id_field } ) );
}
--- 169,173 ----
? $id_field
: join( '.', $item->table_name, $id_field );
! return join(' = ', $use_id_field, $db->quote( $id, $type_info->{ lc $id_field } ) );
}
***************
*** 303,307 ****
ROW:
while ( my $row = $sth->fetchrow_arrayref ) {
! my $obj = $class->new;
$obj->_fetch_assign_row( $p->{raw_fields}, $row, $p );
next ROW unless ( $obj );
--- 303,307 ----
ROW:
while ( my $row = $sth->fetchrow_arrayref ) {
! my $obj = $class->new({ skip_default_values => 1 });
$obj->_fetch_assign_row( $p->{raw_fields}, $row, $p );
next ROW unless ( $obj );
***************
*** 352,358 ****
my @select = ();
for ( my $i = 0; $i < scalar @{ $raw_fields }; $i++ ) {
! push @select, ( $raw_fields->[ $i ] eq $select_fields->[ $i ] )
! ? join( '.', $table_name, $raw_fields->[ $i ] )
! : $select_fields->[ $i ];
}
return ( $raw_fields, \@select );
--- 352,364 ----
my @select = ();
for ( my $i = 0; $i < scalar @{ $raw_fields }; $i++ ) {
! if ( $raw_fields->[ $i ] ne $select_fields->[ $i ] ) {
! push @select, $select_fields->[ $i ];
! }
! elsif ( $raw_fields->[ $i ] =~ /^$table_name/ ) {
! push @select, $select_fields->[ $i ];
! }
! else {
! push @select, join( '.', $table_name, $raw_fields->[ $i ] );
! }
}
return ( $raw_fields, \@select );
|
