r53628 - in /trunk/libdbix-recordset-perl: ./ debian/ debian/patches/ debian/source/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Mar 5 14:08:50 UTC 2010
Author: gregoa
Date: Fri Mar 5 14:06:08 2010
New Revision: 53628
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53628
Log:
* Add /me to Uploaders.
* Set Standards-Version to 3.8.4 (no changes).
* Debhelper 7.
* Split out changes to upstream code into patches.
* Convert to source format 3.0 (quilt).
Added:
trunk/libdbix-recordset-perl/debian/compat
trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.docs
trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.examples
trunk/libdbix-recordset-perl/debian/patches/
trunk/libdbix-recordset-perl/debian/patches/Compat.pm.patch
trunk/libdbix-recordset-perl/debian/patches/Database.pm.patch
trunk/libdbix-recordset-perl/debian/patches/Recordset.pm.patch
trunk/libdbix-recordset-perl/debian/patches/test.pl.patch
trunk/libdbix-recordset-perl/debian/source/
trunk/libdbix-recordset-perl/debian/source/format
Removed:
trunk/libdbix-recordset-perl/.cvsignore
Modified:
trunk/libdbix-recordset-perl/Compat.pm
trunk/libdbix-recordset-perl/Database.pm
trunk/libdbix-recordset-perl/Intrors.pod
trunk/libdbix-recordset-perl/Makefile.PL
trunk/libdbix-recordset-perl/Recordset.pm
trunk/libdbix-recordset-perl/debian/changelog
trunk/libdbix-recordset-perl/debian/control
trunk/libdbix-recordset-perl/debian/rules
trunk/libdbix-recordset-perl/test.pl
Modified: trunk/libdbix-recordset-perl/Compat.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/Compat.pm?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/Compat.pm (original)
+++ trunk/libdbix-recordset-perl/Compat.pm Fri Mar 5 14:06:08 2010
@@ -320,7 +320,6 @@
'SupportSQLJoin' => 1, # Driver does not supports INNER/LEFT/RIGHt JOIN Syntax in SQL select
'NumericTypes' => {
- 4 => 1,
20 => 1,
21 => 1,
22 => 1,
Modified: trunk/libdbix-recordset-perl/Database.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/Database.pm?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/Database.pm (original)
+++ trunk/libdbix-recordset-perl/Database.pm Fri Mar 5 14:06:08 2010
@@ -609,7 +609,6 @@
{
$self->{'*DBHdl'} = $data_source;
- $self->{'*Driver'} = $data_source->{Driver}->{Name};
}
else
{
Modified: trunk/libdbix-recordset-perl/Intrors.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/Intrors.pod?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/Intrors.pod (original)
+++ trunk/libdbix-recordset-perl/Intrors.pod Fri Mar 5 14:06:08 2010
@@ -1,8 +1,4 @@
=pod
-
-=head1 NAME
-
-DBIx::Intrors - Embperl and DBIx::Recordset
=head1 Embperl and DBIx::Recordset
Modified: trunk/libdbix-recordset-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/Makefile.PL?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/Makefile.PL (original)
+++ trunk/libdbix-recordset-perl/Makefile.PL Fri Mar 5 14:06:08 2010
@@ -30,18 +30,6 @@
{
do $configfile ;
}
-
-
-## MakeMaker doesn't know about arch :(
-sub MY::libscan {
- my ($self, $path) = @_;
- my ($dirs,$file) = ($self->splitpath($path))[1,2];
-
- return '' if grep /^(?:\.arch-ids|{arch}|,,.*|\+\+.*)$/,
- $self->splitdir($dirs), $file;
-
- return $self->MM::libscan($path);
-}
## ----------------------------------------------------------------------------
@@ -228,12 +216,13 @@
close FH ;
}
+
WriteMakefile
(
'NAME' => 'DBIx::Recordset',
'VERSION_FROM' => 'Recordset.pm', # finds $VERSION
'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'},
'clean' => { FILES => 'test.log' },
- 'realclean' => { FILES => 'test.log test/Config.pl' },
+ 'realclean' => { FILES => './test test.log' },
);
Modified: trunk/libdbix-recordset-perl/Recordset.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/Recordset.pm?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/Recordset.pm (original)
+++ trunk/libdbix-recordset-perl/Recordset.pm Fri Mar 5 14:06:08 2010
@@ -735,7 +735,8 @@
{
my ($self) = @_ ;
- $self->{'*DBHdl'}->begin_work unless $self->{'*DBHdl'}->{'AutoCommit'};
+ # 'begin' method is unhandled by DBI
+ ## ?? $self->{'*DBHdl'} -> func('begin') unless $self->{'*DBHdl'}->{'AutoCommit'};
}
## ----------------------------------------------------------------------------
@@ -865,7 +866,7 @@
sub TableName ($)
{
- return $_[0] -> {'*MainTable'} ;
+ return $_[0] -> {'*Table'} ;
}
## ----------------------------------------------------------------------------
@@ -879,7 +880,7 @@
sub TableNameWithoutFilter ($)
{
- my $tab = $_[0] -> {'*MainTable'} ;
+ my $tab = $_[0] -> {'*Table'} ;
return $1 if ($tab =~ /^$_[0]->{'*TableFilter'}(.*?)$/) ;
return $tab ;
@@ -1035,7 +1036,7 @@
$f = $v -> {'!MainField'} ;
$mf -> {$f} = $k ;
$mf -> {"$tab4f->{$f}.$f"} = $k ;
- print LOG "DB: Field $v->{'!MainField'} has link $k\n" if ($self -> {'*Debug'} > 2) ;
+ print LOG "DB: Field $v->{'!MainField'} has link $k\n" ;
}
$self -> {'*MainFields'} = $mf ;
}
@@ -1202,17 +1203,17 @@
{
my ($self, $fields, $vals, $bind_values, $bind_types) = @_ ;
- $self -> savecroak ("Insert disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmINSERT)) ;
+ $self -> savecroak ("Insert disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmINSERT)) ;
$self->{'*Stats'}{insert}++ ;
if (defined ($bind_values))
{
- return $self->do ("INSERT INTO $self->{'*MainTable'} ($fields) VALUES ($vals)", undef, $bind_values, $bind_types) ;
+ return $self->do ("INSERT INTO $self->{'*Table'} ($fields) VALUES ($vals)", undef, $bind_values, $bind_types) ;
}
else
{
- return $self->do ("INSERT INTO $self->{'*MainTable'} ($fields) VALUES ($vals)") ;
+ return $self->do ("INSERT INTO $self->{'*Table'} ($fields) VALUES ($vals)") ;
}
}
@@ -1232,17 +1233,17 @@
{
my ($self, $data, $where, $bind_values, $bind_types) = @_ ;
- $self -> savecroak ("Update disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmUPDATE)) ;
+ $self -> savecroak ("Update disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmUPDATE)) ;
$self->{'*Stats'}{update}++ ;
if (defined ($bind_values))
{
- return $self->do ("UPDATE $self->{'*MainTable'} SET $data WHERE $where", undef, $bind_values, $bind_types) ;
+ return $self->do ("UPDATE $self->{'*Table'} SET $data WHERE $where", undef, $bind_values, $bind_types) ;
}
else
{
- return $self->do ("UPDATE $self->{'*MainTable'} SET $data WHERE $where") ;
+ return $self->do ("UPDATE $self->{'*Table'} SET $data WHERE $where") ;
}
}
@@ -1261,18 +1262,18 @@
{
my ($self, $where, $bind_values, $bind_types) = @_ ;
- $self -> savecroak ("Delete disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
- $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*MainTable'}") if (!$where && !($self->{'*WriteMode'} & wmCLEAR)) ;
+ $self -> savecroak ("Delete disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
+ $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*Table'}") if (!$where && !($self->{'*WriteMode'} & wmCLEAR)) ;
$self->{'*Stats'}{'delete'}++ ;
if (defined ($bind_values))
{
- return $self->do ("DELETE FROM $self->{'*MainTable'} " . ($where?"WHERE $where":''), undef, $bind_values, $bind_types) ;
+ return $self->do ("DELETE FROM $self->{'*Table'} " . ($where?"WHERE $where":''), undef, $bind_values, $bind_types) ;
}
else
{
- return $self->do ("DELETE FROM $self->{'*MainTable'} " . ($where?"WHERE $where":'')) ;
+ return $self->do ("DELETE FROM $self->{'*Table'} " . ($where?"WHERE $where":'')) ;
}
}
@@ -1321,7 +1322,6 @@
$self->{'*EOD'} = undef ;
$self->{'*SelectFields'} = undef ;
$self->{'*LastRecord'} = undef ;
- $self->{'*LastRecordFetch'} = undef ;
$order ||= '' ;
$expr ||= '' ;
@@ -1486,6 +1486,8 @@
$fetch += $self->{'*FetchStart'} ;
+ return $self->{'*LastRecord'} if (defined ($self->{'*LastRecordFetch'}) && $fetch == $self->{'*LastRecordFetch'} && $self->{'*LastRecord'}) ;
+
my $max ;
my $key ;
my $dat ; # row data
@@ -1604,24 +1606,12 @@
if (ref $dat eq 'ARRAY')
{ # just an Array so tie it now
my $arr = $dat ;
-
- if ($self -> {'*TieRow'})
- {
- $dat = {} ;
- $obj = tie %$dat, 'DBIx::Recordset::Row', $self, $self->{'*SelectFields'} , $arr ;
- $data -> [$fetch] = $dat ;
- $self->{'*LastRow'} = $fetch ;
- $self->{'*LastKey'} = $obj -> FETCH ($self -> {'*PrimKey'}) ;
- } else {
- my $fld = $self->{'*SelectFields'} ;
-
- $dat = {};
- @$dat{@$fld} = @$arr ;
-
- $self->{'*LastRow'} = $fetch ;
- $self->{'*LastKey'} = $dat -> {$self -> {'*PrimKey'}} if ($self -> {'*PrimKey'}) ;
+ $dat = {} ;
+ $obj = tie %$dat, 'DBIx::Recordset::Row', $self, $self->{'*SelectFields'} , $arr ;
+ $data -> [$fetch] = $dat ;
+ $self->{'*LastRow'} = $fetch ;
+ $self->{'*LastKey'} = $obj -> FETCH ($self -> {'*PrimKey'}) ;
}
- }
else
{
#my $v ;
@@ -1683,7 +1673,6 @@
my $self = shift ;
$self->{'*LastRecord'} = undef ;
- $self->{'*LastRecordFetch'} = undef ;
$self ->{'*LastRow'} = 0 ;
}
@@ -1736,7 +1725,7 @@
$lr -= $self -> {'*FetchStart'} ;
$lr = 0 if ($lr < 0) ;
- $lr++ if (defined ($self -> {'*LastRecordFetch'})) ;
+ $lr++ if (defined ($self -> {'*LastRecord'})) ;
##$lr++ if ($_[0] ->{'*CurrRow'} > 0 || $_[0] ->{'*EOD'}) ;
my $rec = $self -> FETCH ($lr) ;
@@ -2740,7 +2729,7 @@
($self = $newself) or return undef ;
}
- $self -> savecroak ("Delete disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
+ $self -> savecroak ("Delete disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
my @bind_values ;
my @bind_types ;
@@ -2748,7 +2737,7 @@
my $clear_disabled_diag =
"(!$expr && !($self->{'*WriteMode'} & wmCLEAR))";
- $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*MainTable'}: $clear_disabled_diag") if (!$expr && !($self->{'*WriteMode'} & wmCLEAR)) ;
+ $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*Table'}: $clear_disabled_diag") if (!$expr && !($self->{'*WriteMode'} & wmCLEAR)) ;
my $links = $self -> {'*Links'} ;
@@ -3135,11 +3124,11 @@
$buttons .= "$esc<input type=$esc\"text$esc\" size=6 name=$esc\"\$gotorow$esc\"$esc>" ;
$buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$goto$esc\" value=$esc\"$textgoto$esc\"$esc> " ;
}
- if ($more && $textnext)
+ if ($more > 0 && $textnext)
{
$buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$next$esc\" value=$esc\"$textnext$esc\"$esc> " ;
}
- if ($more && $textlast)
+ if ($more > 0 && $textlast)
{
$buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$last$esc\" value=$esc\"$textlast$esc\"$esc>" ;
}
@@ -3330,7 +3319,7 @@
print DBIx::Recordset::LOG "DB: ::CurrRow::DESTROY\n" if ($self -> {'*Recordset'} -> {'*Debug'} > 3) ;
}
} ;
- $self -> {'*Recordset'} -> savecroak ($@) if (!$orgerr && $@) ;
+ $self -> savecroak ($@) if (!$orgerr && $@) ;
warn $@ if ($orgerr && $@) ;
}
@@ -3693,7 +3682,7 @@
print DBIx::Recordset::LOG "DB: ::Hash::DESTROY\n" if ($self -> {'*Recordset'} -> {'*Debug'} > 3) ;
}
} ;
- $self -> {'*Recordset'} -> savecroak ($@) if (!$orgerr && $@) ;
+ $self -> savecroak ($@) if (!$orgerr && $@) ;
warn $@ if ($orgerr && $@) ;
}
@@ -4047,7 +4036,7 @@
{
$rc = $rs -> Update ($dat, {$pk => $pko} ) ;
}
- if ($rc ne '' && $rc != 1)
+ if ($rc != 1 && $rc ne '')
{ # must excatly be one row!
print DBIx::Recordset::LOG "DB: ERROR: Row Update has updated $rc rows instead of one ($rs->{'*LastSQLStatement'})\n" if ($rs->{'*Debug'}) ;
#$rs -> savecroak ("DB: ERROR: Row Update has updated $rc rows instead of one ($rs->{'*LastSQLStatement'})") ;
@@ -4127,7 +4116,7 @@
use DBIx::Recordset;
- # Setup a new object and select some records...
+ # Setup a new object and select some recods...
*set = DBIx::Recordset -> Search ({'!DataSource' => 'dbi:Oracle:....',
'!Table' => 'users',
'$where' => 'name = ? and age > ?',
@@ -4166,8 +4155,8 @@
database access.
The goal is to make standard database access (select/insert/update/delete)
-easier to handle and independent of the underlying DBMS. Special attention is
-paid to web applications to make it possible to handle the state-less access
+easier to handle and independend of the underlying DBMS. Special attention is
+made on web applications to make it possible to handle the state-less access
and to process the posted data of formfields, but DBIx::Recordset is not
limited to web applications.
@@ -4183,18 +4172,18 @@
setup step can be made with the same function call as the first database access,
but it can also be handled separately.
-Most functions which set up an object return a B<typeglob>. A typeglob in Perl is an
-object which holds pointers to all datatypes with the same name. Therefore a typeglob
+Most functions which set up an object return a B<typglob>. A typglob in Perl is an
+object which holds pointers to all datatypes with the same name. Therefore a typglob
must always have a name and B<can't> be declared with B<my>. You can only
use it as B<global> variable or declare it with B<local>. The trick for using
-a typeglob is that setup functions can return a B<reference to an object>, an
+a typglob is that setup functions can return a B<reference to an object>, an
B<array> and a B<hash> at the same time.
The object is used to access the object's methods, the array is used to access
the records currently selected in the recordset and the hash is used to access
the current record.
-If you don't like the idea of using typeglobs you can also set up the object,
+If you don't like the idea of using typglobs you can also set up the object,
array and hash separately, or just set the ones you need.
=head1 ARGUMENTS
@@ -4302,7 +4291,7 @@
Fields which should be used for ordering any query. If you have specified multiple
tables the fieldnames should be unique. If the names are not unique you must
-specify them along with the tablename (e.g. tab1.field).
+specify them among with the tablename (e.g. tab1.field).
NOTE 1: Fieldnames specified with !Order can't be overridden. If you plan
Modified: trunk/libdbix-recordset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/changelog?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/debian/changelog (original)
+++ trunk/libdbix-recordset-perl/debian/changelog Fri Mar 5 14:06:08 2010
@@ -12,6 +12,11 @@
[ gregor herrmann ]
* debian/control: Added: ${misc:Depends} to Depends: field.
+ * Add /me to Uploaders.
+ * Set Standards-Version to 3.8.4 (no changes).
+ * Debhelper 7.
+ * Split out changes to upstream code into patches.
+ * Convert to source format 3.0 (quilt).
-- Ryan Niebur <ryanryan52 at gmail.com> Tue, 01 Sep 2009 21:18:40 -0700
Added: trunk/libdbix-recordset-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/compat?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/compat (added)
+++ trunk/libdbix-recordset-perl/debian/compat Fri Mar 5 14:06:08 2010
@@ -1,0 +1,1 @@
+7
Modified: trunk/libdbix-recordset-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/control?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/debian/control (original)
+++ trunk/libdbix-recordset-perl/debian/control Fri Mar 5 14:06:08 2010
@@ -1,11 +1,11 @@
Source: libdbix-recordset-perl
Section: perl
Priority: optional
-Build-Depends-Indep: debhelper (>= 3.0.5), perl (>= 5.6.0-17), libdbi-perl
-Build-Depends: debhelper (>= 3.0.5)
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: perl, libdbi-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Uploaders: Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/DBIx-Recordset/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdbix-recordset-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libdbix-recordset-perl/
@@ -13,7 +13,7 @@
Package: libdbix-recordset-perl
Architecture: all
Depends: ${misc:Depends}, libdbi-perl, ${perl:Depends}
-Description: Perl extension for DBI recordsets
+Description: Perl extension for DBI recordsets
DBIx::Recordset is a perl module for abstraction and simplification of
database access.
.
Added: trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.docs?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.docs (added)
+++ trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.docs Fri Mar 5 14:06:08 2010
@@ -1,0 +1,2 @@
+README
+TODO
Added: trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.examples?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.examples (added)
+++ trunk/libdbix-recordset-perl/debian/libdbix-recordset-perl.examples Fri Mar 5 14:06:08 2010
@@ -1,0 +1,1 @@
+eg/*
Added: trunk/libdbix-recordset-perl/debian/patches/Compat.pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/patches/Compat.pm.patch?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/patches/Compat.pm.patch (added)
+++ trunk/libdbix-recordset-perl/debian/patches/Compat.pm.patch Fri Mar 5 14:06:08 2010
@@ -1,0 +1,14 @@
+Description: Tell Compat.pm that Pg type '4' is numeric (Postgres 7.3).
+Author: Angus Lees <gus at debian.org>
+Date: Tue, 19 Aug 2003 22:36:31 +1000
+
+--- libdbix-recordset-perl-0.26.orig/Compat.pm
++++ libdbix-recordset-perl-0.26/Compat.pm
+@@ -320,6 +320,7 @@
+
+ 'SupportSQLJoin' => 1, # Driver does not supports INNER/LEFT/RIGHt JOIN Syntax in SQL select
+ 'NumericTypes' => {
++ 4 => 1,
+ 20 => 1,
+ 21 => 1,
+ 22 => 1,
Added: trunk/libdbix-recordset-perl/debian/patches/Database.pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/patches/Database.pm.patch?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/patches/Database.pm.patch (added)
+++ trunk/libdbix-recordset-perl/debian/patches/Database.pm.patch Fri Mar 5 14:06:08 2010
@@ -1,0 +1,10 @@
+--- libdbix-recordset-perl-0.26.orig/Database.pm
++++ libdbix-recordset-perl-0.26/Database.pm
+@@ -609,6 +609,7 @@
+ {
+
+ $self->{'*DBHdl'} = $data_source;
++ $self->{'*Driver'} = $data_source->{Driver}->{Name};
+ }
+ else
+ {
Added: trunk/libdbix-recordset-perl/debian/patches/Recordset.pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/patches/Recordset.pm.patch?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/patches/Recordset.pm.patch (added)
+++ trunk/libdbix-recordset-perl/debian/patches/Recordset.pm.patch Fri Mar 5 14:06:08 2010
@@ -1,0 +1,249 @@
+Author: Angus Lees <gus at debian.org>
+
+Date: Sun, 23 Dec 2001 17:47:22 +1100
+Description: Replace several uses of '*Table' with '*MainTable' to try and avoid
+ some of the side affects of !LinkName.
+
+Date: Tue, 29 Jan 2002 16:53:47 +1100
+Description: patch (approved by upstream) to avoid "fully qualifying" fields that
+ aren't in %tab4f - since that means they aren't column names
+ (another side affect of !LinkName).
+
+Date: Sat, 28 Sep 2002 17:20:44 +1000
+Description:
+ * Call savecroak on *Recordset object, not $self.
+ * Use *LastRecordFetch as the "row before the first" indicator. This
+ prevents Next() looping back to the start in some cases.
+ * Remove *LastRecord "cache", fixing Next(), MoreRecords(), Next() bug.
+ * Allow TableAttr's to set an attribute to a false value.
+ (Thanks René Seindal)
+ * Don't return a tied row from Next when TieRow=0 (closes: #133165)
+ (Thanks René Seindal)
+
+--- libdbix-recordset-perl-0.26.orig/Recordset.pm
++++ libdbix-recordset-perl-0.26/Recordset.pm
+@@ -735,8 +735,7 @@
+ {
+ my ($self) = @_ ;
+
+- # 'begin' method is unhandled by DBI
+- ## ?? $self->{'*DBHdl'} -> func('begin') unless $self->{'*DBHdl'}->{'AutoCommit'};
++ $self->{'*DBHdl'}->begin_work unless $self->{'*DBHdl'}->{'AutoCommit'};
+ }
+
+ ## ----------------------------------------------------------------------------
+@@ -866,7 +865,7 @@
+ sub TableName ($)
+
+ {
+- return $_[0] -> {'*Table'} ;
++ return $_[0] -> {'*MainTable'} ;
+ }
+
+ ## ----------------------------------------------------------------------------
+@@ -880,7 +879,7 @@
+ sub TableNameWithoutFilter ($)
+
+ {
+- my $tab = $_[0] -> {'*Table'} ;
++ my $tab = $_[0] -> {'*MainTable'} ;
+
+ return $1 if ($tab =~ /^$_[0]->{'*TableFilter'}(.*?)$/) ;
+ return $tab ;
+@@ -1036,7 +1035,7 @@
+ $f = $v -> {'!MainField'} ;
+ $mf -> {$f} = $k ;
+ $mf -> {"$tab4f->{$f}.$f"} = $k ;
+- print LOG "DB: Field $v->{'!MainField'} has link $k\n" ;
++ print LOG "DB: Field $v->{'!MainField'} has link $k\n" if ($self -> {'*Debug'} > 2) ;
+ }
+ $self -> {'*MainFields'} = $mf ;
+ }
+@@ -1203,17 +1202,17 @@
+ {
+ my ($self, $fields, $vals, $bind_values, $bind_types) = @_ ;
+
+- $self -> savecroak ("Insert disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmINSERT)) ;
++ $self -> savecroak ("Insert disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmINSERT)) ;
+
+ $self->{'*Stats'}{insert}++ ;
+
+ if (defined ($bind_values))
+ {
+- return $self->do ("INSERT INTO $self->{'*Table'} ($fields) VALUES ($vals)", undef, $bind_values, $bind_types) ;
++ return $self->do ("INSERT INTO $self->{'*MainTable'} ($fields) VALUES ($vals)", undef, $bind_values, $bind_types) ;
+ }
+ else
+ {
+- return $self->do ("INSERT INTO $self->{'*Table'} ($fields) VALUES ($vals)") ;
++ return $self->do ("INSERT INTO $self->{'*MainTable'} ($fields) VALUES ($vals)") ;
+ }
+ }
+
+@@ -1233,17 +1232,17 @@
+ {
+ my ($self, $data, $where, $bind_values, $bind_types) = @_ ;
+
+- $self -> savecroak ("Update disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmUPDATE)) ;
++ $self -> savecroak ("Update disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmUPDATE)) ;
+
+ $self->{'*Stats'}{update}++ ;
+
+ if (defined ($bind_values))
+ {
+- return $self->do ("UPDATE $self->{'*Table'} SET $data WHERE $where", undef, $bind_values, $bind_types) ;
++ return $self->do ("UPDATE $self->{'*MainTable'} SET $data WHERE $where", undef, $bind_values, $bind_types) ;
+ }
+ else
+ {
+- return $self->do ("UPDATE $self->{'*Table'} SET $data WHERE $where") ;
++ return $self->do ("UPDATE $self->{'*MainTable'} SET $data WHERE $where") ;
+ }
+ }
+
+@@ -1262,18 +1261,18 @@
+ {
+ my ($self, $where, $bind_values, $bind_types) = @_ ;
+
+- $self -> savecroak ("Delete disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
+- $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*Table'}") if (!$where && !($self->{'*WriteMode'} & wmCLEAR)) ;
++ $self -> savecroak ("Delete disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
++ $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*MainTable'}") if (!$where && !($self->{'*WriteMode'} & wmCLEAR)) ;
+
+ $self->{'*Stats'}{'delete'}++ ;
+
+ if (defined ($bind_values))
+ {
+- return $self->do ("DELETE FROM $self->{'*Table'} " . ($where?"WHERE $where":''), undef, $bind_values, $bind_types) ;
++ return $self->do ("DELETE FROM $self->{'*MainTable'} " . ($where?"WHERE $where":''), undef, $bind_values, $bind_types) ;
+ }
+ else
+ {
+- return $self->do ("DELETE FROM $self->{'*Table'} " . ($where?"WHERE $where":'')) ;
++ return $self->do ("DELETE FROM $self->{'*MainTable'} " . ($where?"WHERE $where":'')) ;
+ }
+ }
+
+@@ -1322,6 +1321,7 @@
+ $self->{'*EOD'} = undef ;
+ $self->{'*SelectFields'} = undef ;
+ $self->{'*LastRecord'} = undef ;
++ $self->{'*LastRecordFetch'} = undef ;
+
+ $order ||= '' ;
+ $expr ||= '' ;
+@@ -1486,8 +1486,6 @@
+
+ $fetch += $self->{'*FetchStart'} ;
+
+- return $self->{'*LastRecord'} if (defined ($self->{'*LastRecordFetch'}) && $fetch == $self->{'*LastRecordFetch'} && $self->{'*LastRecord'}) ;
+-
+ my $max ;
+ my $key ;
+ my $dat ; # row data
+@@ -1606,12 +1604,24 @@
+ if (ref $dat eq 'ARRAY')
+ { # just an Array so tie it now
+ my $arr = $dat ;
+- $dat = {} ;
+- $obj = tie %$dat, 'DBIx::Recordset::Row', $self, $self->{'*SelectFields'} , $arr ;
+- $data -> [$fetch] = $dat ;
+- $self->{'*LastRow'} = $fetch ;
+- $self->{'*LastKey'} = $obj -> FETCH ($self -> {'*PrimKey'}) ;
++
++ if ($self -> {'*TieRow'})
++ {
++ $dat = {} ;
++ $obj = tie %$dat, 'DBIx::Recordset::Row', $self, $self->{'*SelectFields'} , $arr ;
++ $data -> [$fetch] = $dat ;
++ $self->{'*LastRow'} = $fetch ;
++ $self->{'*LastKey'} = $obj -> FETCH ($self -> {'*PrimKey'}) ;
++ } else {
++ my $fld = $self->{'*SelectFields'} ;
++
++ $dat = {};
++ @$dat{@$fld} = @$arr ;
++
++ $self->{'*LastRow'} = $fetch ;
++ $self->{'*LastKey'} = $dat -> {$self -> {'*PrimKey'}} if ($self -> {'*PrimKey'}) ;
+ }
++ }
+ else
+ {
+ #my $v ;
+@@ -1673,6 +1683,7 @@
+ my $self = shift ;
+
+ $self->{'*LastRecord'} = undef ;
++ $self->{'*LastRecordFetch'} = undef ;
+ $self ->{'*LastRow'} = 0 ;
+ }
+
+@@ -1725,7 +1736,7 @@
+
+ $lr -= $self -> {'*FetchStart'} ;
+ $lr = 0 if ($lr < 0) ;
+- $lr++ if (defined ($self -> {'*LastRecord'})) ;
++ $lr++ if (defined ($self -> {'*LastRecordFetch'})) ;
+
+ ##$lr++ if ($_[0] ->{'*CurrRow'} > 0 || $_[0] ->{'*EOD'}) ;
+ my $rec = $self -> FETCH ($lr) ;
+@@ -2729,7 +2740,7 @@
+ ($self = $newself) or return undef ;
+ }
+
+- $self -> savecroak ("Delete disabled for table $self->{'*Table'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
++ $self -> savecroak ("Delete disabled for table $self->{'*MainTable'}") if (!($self->{'*WriteMode'} & wmDELETE)) ;
+
+ my @bind_values ;
+ my @bind_types ;
+@@ -2737,7 +2748,7 @@
+
+ my $clear_disabled_diag =
+ "(!$expr && !($self->{'*WriteMode'} & wmCLEAR))";
+- $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*Table'}: $clear_disabled_diag") if (!$expr && !($self->{'*WriteMode'} & wmCLEAR)) ;
++ $self -> savecroak ("Clear (Delete all) disabled for table $self->{'*MainTable'}: $clear_disabled_diag") if (!$expr && !($self->{'*WriteMode'} & wmCLEAR)) ;
+
+ my $links = $self -> {'*Links'} ;
+
+@@ -3124,11 +3135,11 @@
+ $buttons .= "$esc<input type=$esc\"text$esc\" size=6 name=$esc\"\$gotorow$esc\"$esc>" ;
+ $buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$goto$esc\" value=$esc\"$textgoto$esc\"$esc> " ;
+ }
+- if ($more > 0 && $textnext)
++ if ($more && $textnext)
+ {
+ $buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$next$esc\" value=$esc\"$textnext$esc\"$esc> " ;
+ }
+- if ($more > 0 && $textlast)
++ if ($more && $textlast)
+ {
+ $buttons .= "$esc<input type=$esc\"submit$esc\" name=$esc\"\$last$esc\" value=$esc\"$textlast$esc\"$esc>" ;
+ }
+@@ -3319,7 +3330,7 @@
+ print DBIx::Recordset::LOG "DB: ::CurrRow::DESTROY\n" if ($self -> {'*Recordset'} -> {'*Debug'} > 3) ;
+ }
+ } ;
+- $self -> savecroak ($@) if (!$orgerr && $@) ;
++ $self -> {'*Recordset'} -> savecroak ($@) if (!$orgerr && $@) ;
+ warn $@ if ($orgerr && $@) ;
+ }
+
+@@ -3682,7 +3693,7 @@
+ print DBIx::Recordset::LOG "DB: ::Hash::DESTROY\n" if ($self -> {'*Recordset'} -> {'*Debug'} > 3) ;
+ }
+ } ;
+- $self -> savecroak ($@) if (!$orgerr && $@) ;
++ $self -> {'*Recordset'} -> savecroak ($@) if (!$orgerr && $@) ;
+ warn $@ if ($orgerr && $@) ;
+ }
+
+@@ -4036,7 +4047,7 @@
+ {
+ $rc = $rs -> Update ($dat, {$pk => $pko} ) ;
+ }
+- if ($rc != 1 && $rc ne '')
++ if ($rc ne '' && $rc != 1)
+ { # must excatly be one row!
+ print DBIx::Recordset::LOG "DB: ERROR: Row Update has updated $rc rows instead of one ($rs->{'*LastSQLStatement'})\n" if ($rs->{'*Debug'}) ;
+ #$rs -> savecroak ("DB: ERROR: Row Update has updated $rc rows instead of one ($rs->{'*LastSQLStatement'})") ;
Added: trunk/libdbix-recordset-perl/debian/patches/test.pl.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/patches/test.pl.patch?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/patches/test.pl.patch (added)
+++ trunk/libdbix-recordset-perl/debian/patches/test.pl.patch Fri Mar 5 14:06:08 2010
@@ -1,0 +1,30 @@
+Description: Fix incorrect use of DBI::SQL_* constants in test.pl.
+Author: Angus Lees <gus at debian.org>
+Date: Sat, 28 Sep 2002 17:20:44 +1000
+
+--- libdbix-recordset-perl-0.26.orig/test.pl
++++ libdbix-recordset-perl-0.26/test.pl
+@@ -412,7 +412,7 @@
+
+ sub DropTestTables {
+ my ($_dbh, @tlist) =@_;
+- return unless ($dbh and @tlist);
++ return unless ($_dbh and @tlist);
+ foreach (@tlist)
+ {
+ if ($QuoteIdentifier)
+@@ -3711,12 +3711,12 @@
+
+ $db -> TableAttr ($Table[1], '!Filter',
+ {
+- DBI::SQL_CHAR =>
++ DBI::SQL_CHAR,
+ [
+ sub { shift =~ /(\d\d)\.(\d\d)\.(\d\d)/ ; "19$3$2$1"},
+ sub { shift =~ /\d\d(\d\d)(\d\d)(\d\d)/ ; "$3.$2.$1"}
+ ],
+- DBI::SQL_VARCHAR =>
++ DBI::SQL_VARCHAR,
+ [
+ sub { shift =~ /(\d\d)\.(\d\d)\.(\d\d)/ ; "19$3$2$1"},
+ sub { shift =~ /\d\d(\d\d)(\d\d)(\d\d)/ ; "$3.$2.$1"}
Modified: trunk/libdbix-recordset-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/rules?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/debian/rules (original)
+++ trunk/libdbix-recordset-perl/debian/rules Fri Mar 5 14:06:08 2010
@@ -1,94 +1,9 @@
#!/usr/bin/make -f
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
+%:
+ dh $@
-# Ignore arch (tla) meta directories
-export DH_ALWAYS_EXCLUDE = ++pristine-trees:\\\\{arch\\\\}:.arch-ids:,,\\*
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-test/Config.pl:
- mkdir -p test
- echo '%Drivers = ();' > $@
-
-build: build-stamp
-build-stamp: test/Config.pl
- dh_testdir
-
-# fix occasional upstream permission problems
- chmod a-x *.pod
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor < /dev/null
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) realclean
- -rmdir test
-
- dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install PREFIX=$(TMP)/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs TODO README
- dh_installexamples eg
-# dh_installmenu
-# dh_installemacsen
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_undocumented
- dh_installchangelogs Changes
-# dh_link
-# dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do (yay perl)
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_auto_configure:
+ mkdir $(CURDIR)/test
+ echo '%Drivers = ();' > test/Config.pl
+ dh_auto_configure
Added: trunk/libdbix-recordset-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/debian/source/format?rev=53628&op=file
==============================================================================
--- trunk/libdbix-recordset-perl/debian/source/format (added)
+++ trunk/libdbix-recordset-perl/debian/source/format Fri Mar 5 14:06:08 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libdbix-recordset-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-recordset-perl/test.pl?rev=53628&op=diff
==============================================================================
--- trunk/libdbix-recordset-perl/test.pl (original)
+++ trunk/libdbix-recordset-perl/test.pl Fri Mar 5 14:06:08 2010
@@ -412,7 +412,7 @@
sub DropTestTables {
my ($_dbh, @tlist) =@_;
- return unless ($_dbh and @tlist);
+ return unless ($dbh and @tlist);
foreach (@tlist)
{
if ($QuoteIdentifier)
@@ -3711,12 +3711,12 @@
$db -> TableAttr ($Table[1], '!Filter',
{
- DBI::SQL_CHAR,
+ DBI::SQL_CHAR =>
[
sub { shift =~ /(\d\d)\.(\d\d)\.(\d\d)/ ; "19$3$2$1"},
sub { shift =~ /\d\d(\d\d)(\d\d)(\d\d)/ ; "$3.$2.$1"}
],
- DBI::SQL_VARCHAR,
+ DBI::SQL_VARCHAR =>
[
sub { shift =~ /(\d\d)\.(\d\d)\.(\d\d)/ ; "19$3$2$1"},
sub { shift =~ /\d\d(\d\d)(\d\d)(\d\d)/ ; "$3.$2.$1"}
More information about the Pkg-perl-cvs-commits
mailing list