r44814 - in /trunk/librose-db-perl: ./ debian/ lib/Rose/ lib/Rose/DB/ lib/Rose/DB/Registry/ t/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Fri Sep 25 17:04:19 UTC 2009 

Author: jawnsy-guest
Date: Fri Sep 25 17:02:16 2009
New Revision: 44814

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44814
Log:
* New upstream release
  + do_transaction(): clarify return value and error handling
* Added myself to Uploaders and Copyright
* Standards-Version 3.8.3 (drop perl version dependency)
* Remove version dependencies where they are satisfied in oldstable
* Change to new short debhelper rules format

Modified:
    trunk/librose-db-perl/Changes
    trunk/librose-db-perl/META.yml
    trunk/librose-db-perl/debian/changelog
    trunk/librose-db-perl/debian/control
    trunk/librose-db-perl/debian/copyright
    trunk/librose-db-perl/debian/rules
    trunk/librose-db-perl/lib/Rose/DB.pm
    trunk/librose-db-perl/lib/Rose/DB/Cache.pm
    trunk/librose-db-perl/lib/Rose/DB/Pg.pm
    trunk/librose-db-perl/lib/Rose/DB/Registry/Entry.pm
    trunk/librose-db-perl/t/00-warning.t
    trunk/librose-db-perl/t/basic.t
    trunk/librose-db-perl/t/db_cache.t
    trunk/librose-db-perl/t/list-tables.t
    trunk/librose-db-perl/t/pg.t
    trunk/librose-db-perl/t/pk-columns.t
    trunk/librose-db-perl/t/setup.t
    trunk/librose-db-perl/t/subclass-basic.t
    trunk/librose-db-perl/t/subclass-list-tables.t
    trunk/librose-db-perl/t/subclass-pg.t
    trunk/librose-db-perl/t/subclass-trx.t
    trunk/librose-db-perl/t/test-lib.pl
    trunk/librose-db-perl/t/trx.t

Modified: trunk/librose-db-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/Changes?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/Changes (original)
+++ trunk/librose-db-perl/Changes Fri Sep 25 17:02:16 2009
@@ -1,3 +1,8 @@
+0.754 (09.14.2009) - John Siracusa <siracusa at gmail.com>
+
+    * Removed outdated warning about Oracle support.
+	* Clarified the return value and error handling for do_transaction().
+
 0.753 (07.09.2009) - John Siracusa <siracusa at gmail.com>
 
     * Detect enum-like columns in PostgreSQL.  (RT 46214)

Modified: trunk/librose-db-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/META.yml?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/META.yml (original)
+++ trunk/librose-db-perl/META.yml Fri Sep 25 17:02:16 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Rose-DB
-version:            0.753
+version:            0.754
 abstract:           ~
 author:  []
 license:            perl
@@ -33,7 +33,7 @@
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.52
+generated_by:       ExtUtils::MakeMaker version 6.54
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

Modified: trunk/librose-db-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/changelog?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/changelog (original)
+++ trunk/librose-db-perl/debian/changelog Fri Sep 25 17:02:16 2009
@@ -1,8 +1,17 @@
-librose-db-perl (0.753-2) UNRELEASED; urgency=low
+librose-db-perl (0.754-1) UNRELEASED; urgency=low
 
+  [ Jonathan Yu ]
+  * New upstream release
+    + do_transaction(): clarify return value and error handling
+  * Added myself to Uploaders and Copyright
+  * Standards-Version 3.8.3 (drop perl version dependency)
+  * Remove version dependencies where they are satisfied in oldstable
+  * Change to new short debhelper rules format
+
+  [ Ryan Niebur ]
   * Update ryan52's email address
 
- -- Ryan Niebur <ryan at debian.org>  Fri, 25 Sep 2009 00:26:11 -0700
+ -- Jonathan Yu <jawnsy at cpan.org>  Fri, 25 Sep 2009 06:47:33 -0400
 
 librose-db-perl (0.753-1) unstable; urgency=low
 

Modified: trunk/librose-db-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/control?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/control (original)
+++ trunk/librose-db-perl/debian/control Fri Sep 25 17:02:16 2009
@@ -1,28 +1,28 @@
 Source: librose-db-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50), perl (>= 5.8.8-7)
-Build-Depends-Indep: libdatetime-format-mysql-perl, libyaml-syck-perl, 
- libbit-vector-perl (>= 6.4), libdatetime-perl, 
- libdatetime-format-pg-perl (>= 0.11), libdbi-perl, libsql-reservedwords-perl, 
+Build-Depends: debhelper (>= 7.0.50)
+Build-Depends-Indep: perl, libdatetime-format-mysql-perl, libyaml-syck-perl,
+ libbit-vector-perl, libdatetime-perl, libdatetime-format-pg-perl, libdbi-perl,
+ libsql-reservedwords-perl,
  librose-datetime-perl, libclone-pp-perl, libtime-clock-perl, libtest-pod-perl,
  libdbd-sqlite3-perl, librose-object-perl (>= 0.854)
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
  Rene Mayorga <rmayorga at debian.org>, Brian Cassidy <brian.cassidy at gmail.com>,
  gregor herrmann <gregoa at debian.org>, Ryan Niebur <ryan at debian.org>,
- Nathan Handler <nhandler at ubuntu.com>
-Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+ Nathan Handler <nhandler at ubuntu.com>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.3
 Homepage: http://search.cpan.org/dist/Rose::DB/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/librose-db-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/librose-db-perl/
-Standards-Version: 3.8.2
 
 Package: librose-db-perl
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libdatetime-format-mysql-perl,
- libyaml-syck-perl, libbit-vector-perl (>= 6.4), libdatetime-perl, 
- libdatetime-format-pg-perl (>= 0.11), libdbi-perl, 
- libsql-reservedwords-perl, librose-datetime-perl, libclone-pp-perl, 
+ libyaml-syck-perl, libbit-vector-perl, libdatetime-perl,
+ libdatetime-format-pg-perl, libdbi-perl,
+ libsql-reservedwords-perl, librose-datetime-perl, libclone-pp-perl,
  libtime-clock-perl, librose-object-perl (>= 0.854)
 Description: DBI wrapper and abstraction layer
  Rose::DB is a wrapper and abstraction layer for DBI-related functionality. 

Modified: trunk/librose-db-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/copyright?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/copyright (original)
+++ trunk/librose-db-perl/debian/copyright Fri Sep 25 17:02:16 2009
@@ -5,21 +5,24 @@
 Upstream-Name: Rose-DB
 
 Files: *
-Copyright: 2007-2009 John C. Siracusa <siracusa at mindspring.com>
+Copyright: 2007-2009, John C. Siracusa <siracusa at mindspring.com>
 License-Alias: Perl 
 License: Artistic | GPL-1+
 
 Files: lib/Rose/DB/Oracle.pm
-Copyright: 2008 John Siracusa and Ron Savage
-License-Alias: Perl 
+Copyright: 2008, John Siracusa <siracusa at mindspring.com>
+ 2008, Ron Savage <ron at savage.net.au>
+License-Alias: Perl
 License: Artistic | GPL-1+
 
-Files: debian/* 
-Copyright: © 2007-2008 Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-           © 2008-2009 Rene Mayorga <rmayorga at debian.org>
-	   © 2008 gregor herrmann <gregoa at debian.org>
-	   © 2008-2009 Brian Cassidy <brian.cassidy at gmail.com>
- debian/changelog
+Files: debian/*
+Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+ 2009, Nathan Handler <nhandler at ubuntu.com>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2008-2009, Rene Mayorga <rmayorga at debian.org>
+ 2008-2009, Brian Cassidy <brian.cassidy at gmail.com>
+ 2008, gregor herrmann <gregoa at debian.org>
+ 2007-2008, Krzysztof Krzyzaniak <eloy at debian.org>
 License: Artistic | GPL-1+
 
 License: Artistic

Modified: trunk/librose-db-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/rules?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/rules (original)
+++ trunk/librose-db-perl/debian/rules Fri Sep 25 17:02:16 2009
@@ -1,29 +1,14 @@
 #!/usr/bin/make -f
 
-build: build-stamp
-build-stamp:
-	dh build
-	touch $@
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-CMD=$(subst override_,,$@)
+%:
+	dh $@
 
 override_dh_auto_test:
-	echo | $(CMD)
+	echo | dh_auto_test
 
-clean:
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	chmod 644 $(CURDIR)/debian/librose-db-perl/usr/share/perl5/Rose/DB/Tutorial.pod
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+override_dh_fixperms:
+	dh_fixperms
+	chmod 644 $(TMP)/usr/share/perl5/Rose/DB/Tutorial.pod

Modified: trunk/librose-db-perl/lib/Rose/DB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB.pm?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB.pm Fri Sep 25 17:02:16 2009
@@ -20,7 +20,7 @@
 
 our $Error;
 
-our $VERSION = '0.753';
+our $VERSION = '0.754';
 
 our $Debug = 0;
 
@@ -1130,6 +1130,8 @@
 
   my $dbh = $self->dbh or return undef;  
 
+  local $@;
+
   eval
   {
     local $dbh->{'RaiseError'} = 1;
@@ -1140,7 +1142,7 @@
 
   if($@)
   {
-    my $error = "do_transaction() failed - $@";
+    my $error = ref $@ ? $@ : "do_transaction() failed - $@";
 
     if($self->rollback)
     {
@@ -2172,12 +2174,12 @@
 
     # The getpwuid() function is often(?) unimplemented in perl on Windows.
     eval { $username = lc getpwuid($<) };
-    
+
     unless($@)
     {
       $rosedb_devinit = "Rose::DB::Devel::Init::$username";
       eval qq(require $rosedb_devinit);
-  
+
       if($@)
       {
         eval { do $rosedb_devinit };
@@ -2215,7 +2217,7 @@
   unless($YAML_Class)
   {
     eval { require YAML::Syck };
-    
+
     if($@)
     {
       require YAML;
@@ -2427,8 +2429,7 @@
     DBD::mysql    (MySQL)
     DBD::SQLite   (SQLite)
     DBD::Informix (Informix)
-
-Oracle (L<DBD::Oracle>) is mostly supported, but some features may not yet work correctly.
+    DBD::Oracle   (Oracle)
 
 L<Rose::DB> will attempt to service an unsupported database using a L<generic|Rose::DB::Generic> implementation that may or may not work.  Support for more drivers may be added in the future.  Patches are welcome.
 
@@ -3053,6 +3054,8 @@
       $dbh->do("UPDATE acct SET bal = bal + $amt WHERE id = $id2");
     },
     100, 5, 9) or warn "Transfer failed: ", $db->error;
+
+If the CODE block threw an exception or the transaction could not be started and committed successfully, then undef is returned and the exception thrown is available in the L<error|/error> attribute.  Otherwise, a true value is returned.
 
 =item B<error [MSG]>
 

Modified: trunk/librose-db-perl/lib/Rose/DB/Cache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB/Cache.pm?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB/Cache.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB/Cache.pm Fri Sep 25 17:02:16 2009
@@ -143,7 +143,7 @@
       {
         $Debug && warn "Refusing to cache $db during apache server start-up ",
                        "because use_cache_during_apache_startup is false";
-  
+
         return $db;
       }
     }
@@ -207,7 +207,7 @@
 sub apache_has_started
 {
   my($class) = shift;
-  
+
   if(@_)
   {
     return $Apache_Has_Started = $_[0] ? 1 : 0;
@@ -219,7 +219,7 @@
   {
     return $Apache_Has_Started = $MP2_Is_Child;
   }
-  
+
   if(MOD_PERL_1)
   {
     return $Apache_Has_Started = $Apache::Server::Starting;
@@ -293,7 +293,7 @@
       }
 
       my $r;
-      
+
       eval { $r = Apache2::RequestUtil->request };
 
       if($@)

Modified: trunk/librose-db-perl/lib/Rose/DB/Pg.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB/Pg.pm?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB/Pg.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB/Pg.pm Fri Sep 25 17:02:16 2009
@@ -77,7 +77,7 @@
 {
   #my($self, $sth, $obj) = @_;
 
-  # Postgres demands that the primary key column not be in the insert
+  # PostgreSQL demands that the primary key column not be in the insert
   # statement at all in order for it to auto-generate a value.  The
   # insert SQL will need to be modified to make this work for
   # Rose::DB::Object...
@@ -451,7 +451,7 @@
   {
     my $default = $1;
 
-    # Single quotes are backslash-escaped, but Postgres 8.1 and
+    # Single quotes are backslash-escaped, but PostgreSQL 8.1 and
     # later uses doubled quotes '' instead.  Strangely, I see
     # doubled quotes in 8.0.x as well...
     if($pg_vers >= 80000 && index($default, q('')) > 0)

Modified: trunk/librose-db-perl/lib/Rose/DB/Registry/Entry.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB/Registry/Entry.pm?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB/Registry/Entry.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB/Registry/Entry.pm Fri Sep 25 17:02:16 2009
@@ -16,7 +16,7 @@
 #
 
 our %Attrs;
-  
+
 BEGIN
 {
   our %Attrs =
@@ -78,7 +78,7 @@
 sub _attrs
 {
   my(%args) = @_;
-  
+
   my $type = $args{'type'};
 
   # Type filter first
@@ -110,9 +110,9 @@
 sub _attr_method_specs
 {  
   my $attrs = _attrs(@_);
- 
+
   my @specs;
-  
+
   foreach my $attr (@$attrs)
   {
     next if(exists $Attrs{$attr}{'make_method'} && !$Attrs{$attr}{'make_method'});
@@ -126,7 +126,7 @@
       push(@specs, $attr);
     }
   }
-  
+
   return wantarray ? @specs : \@specs;
 }
 
@@ -181,7 +181,7 @@
     next  unless(defined $value);
     $dump{$attr} = $value;
   }
-  
+
   foreach my $attr (_attrs(type => 'hash'), _attrs(type => 'array'))
   {
     my $value = $self->$attr();

Modified: trunk/librose-db-perl/t/00-warning.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/00-warning.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/00-warning.t (original)
+++ trunk/librose-db-perl/t/00-warning.t Fri Sep 25 17:02:16 2009
@@ -21,7 +21,7 @@
 ## these values, set the following environment variables before running tests.
 ## (The current values are shown in parentheses.)
 ##
-## Postgres:
+## PostgreSQL:
 ##
 ##     RDBO_PG_DSN        (@{[ nvl('RDBO_PG_DSN', 'dbi:Pg:dbname=test;host=localhost') ]})
 ##     RDBO_PG_USER       (@{[ nvl('RDBO_PG_USER', 'postgres') ]})

Modified: trunk/librose-db-perl/t/basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/basic.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/basic.t (original)
+++ trunk/librose-db-perl/t/basic.t Fri Sep 25 17:02:16 2009
@@ -470,7 +470,7 @@
   );
 
   my $dbh = $db->dbh;
-  
+
   is($db->dsn, "dbi:SQLite:dbname=$Bin/sqlite.db", 'dsn preservation 1');
 
   $db = Rose::DB->new
@@ -481,7 +481,7 @@
   );
 
   $dbh = $db->dbh;
-  
+
   is($db->dsn, "dbi:SQLite:dbname=$Bin/sqlitex.db", 'dsn preservation 2');
 
   unlink("$Bin/sqlite.db");
@@ -510,7 +510,7 @@
 {
   push(@entry, $attr => $i++ % 2);
 }
-                       
+
 foreach my $attr (sort(Rose::DB::Registry::Entry::_attrs(type => 'hash')))
 {
   push(@entry, $attr => { $i++ => $i++ });
@@ -530,7 +530,7 @@
 if(have_db('mysql'))
 {
   my %mysql_entry = map { $_ => $dump->{$_} } grep { /^mysql_/ } keys %$dump;
-  
+
   Rose::DB->register_db(
     domain   => 'abc',
     type     => 'def',

Modified: trunk/librose-db-perl/t/db_cache.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/db_cache.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/db_cache.t (original)
+++ trunk/librose-db-perl/t/db_cache.t Fri Sep 25 17:02:16 2009
@@ -38,7 +38,7 @@
   ok($db2 = Rose::DB->new_or_cached(), "new_or_cached 3 - $db_type");
 
   is($db->dbh, $db2->dbh, "new_or_cached dbh check - $db_type");
-  
+
   is_deeply([ sort Rose::DB->db_cache->db_cache_keys ],
             [ sort map { $_->key } Rose::DB->db_cache->db_cache_entries ],
             "db_cache_entries, db_cache_keys - $db_type");

Modified: trunk/librose-db-perl/t/list-tables.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/list-tables.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/list-tables.t (original)
+++ trunk/librose-db-perl/t/list-tables.t Fri Sep 25 17:02:16 2009
@@ -86,7 +86,7 @@
   our %Have;
 
   #
-  # Postgres
+  # PostgreSQL
   #
 
   my $dbh;
@@ -686,7 +686,7 @@
 
   if($Have{'pg'})
   {
-    # Postgres
+    # PostgreSQL
     my $dbh = Rose::DB->new('pg_admin')->retain_dbh()
       or die Rose::DB->error;
 

Modified: trunk/librose-db-perl/t/pg.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/pg.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/pg.t (original)
+++ trunk/librose-db-perl/t/pg.t Fri Sep 25 17:02:16 2009
@@ -52,9 +52,9 @@
   }
 
   ok(!$db->pg_enable_utf8, 'pg_enable_utf8 false');
-  
+
   $db->pg_enable_utf8(1);
-  
+
   ok($db->pg_enable_utf8 && $db->dbh->{'pg_enable_utf8'}, 'pg_enable_utf8 true');
 
   $db->disconnect;

Modified: trunk/librose-db-perl/t/pk-columns.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/pk-columns.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/pk-columns.t (original)
+++ trunk/librose-db-perl/t/pk-columns.t Fri Sep 25 17:02:16 2009
@@ -126,7 +126,7 @@
 BEGIN
 {
   #
-  # Postgres
+  # PostgreSQL
   #
 
   if(my $dbh = get_dbh('pg_admin'))

Modified: trunk/librose-db-perl/t/setup.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/setup.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/setup.t (original)
+++ trunk/librose-db-perl/t/setup.t Fri Sep 25 17:02:16 2009
@@ -13,7 +13,7 @@
 if($@)
 {
   eval { require YAML };
-  
+
   plan(skip_all => 'YAML or YAML::Syck required for setup tests')  if($@); 
 }
 

Modified: trunk/librose-db-perl/t/subclass-basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/subclass-basic.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/subclass-basic.t (original)
+++ trunk/librose-db-perl/t/subclass-basic.t Fri Sep 25 17:02:16 2009
@@ -470,7 +470,7 @@
   );
 
   my $dbh = $db->dbh;
-  
+
   is($db->dsn, "dbi:SQLite:dbname=$Bin/sqlite.db", 'dsn preservation 1');
 
   $db = My::DB2->new
@@ -481,7 +481,7 @@
   );
 
   $dbh = $db->dbh;
-  
+
   is($db->dsn, "dbi:SQLite:dbname=$Bin/sqlitex.db", 'dsn preservation 2');
 
   unlink("$Bin/sqlite.db");
@@ -510,7 +510,7 @@
 {
   push(@entry, $attr => $i++ % 2);
 }
-                       
+
 foreach my $attr (sort(Rose::DB::Registry::Entry::_attrs(type => 'hash')))
 {
   push(@entry, $attr => { $i++ => $i++ });
@@ -530,7 +530,7 @@
 if(have_db('mysql'))
 {
   my %mysql_entry = map { $_ => $dump->{$_} } grep { /^mysql_/ } keys %$dump;
-  
+
   My::DB2->register_db(
     domain   => 'abc',
     type     => 'def',

Modified: trunk/librose-db-perl/t/subclass-list-tables.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/subclass-list-tables.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/subclass-list-tables.t (original)
+++ trunk/librose-db-perl/t/subclass-list-tables.t Fri Sep 25 17:02:16 2009
@@ -86,7 +86,7 @@
   our %Have;
 
   #
-  # Postgres
+  # PostgreSQL
   #
 
   my $dbh;
@@ -686,7 +686,7 @@
 
   if($Have{'pg'})
   {
-    # Postgres
+    # PostgreSQL
     my $dbh = My::DB2->new('pg_admin')->retain_dbh()
       or die My::DB2->error;
 

Modified: trunk/librose-db-perl/t/subclass-pg.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/subclass-pg.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/subclass-pg.t (original)
+++ trunk/librose-db-perl/t/subclass-pg.t Fri Sep 25 17:02:16 2009
@@ -52,9 +52,9 @@
   }
 
   ok(!$db->pg_enable_utf8, 'pg_enable_utf8 false');
-  
+
   $db->pg_enable_utf8(1);
-  
+
   ok($db->pg_enable_utf8 && $db->dbh->{'pg_enable_utf8'}, 'pg_enable_utf8 true');
 
   $db->disconnect;

Modified: trunk/librose-db-perl/t/subclass-trx.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/subclass-trx.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/subclass-trx.t (original)
+++ trunk/librose-db-perl/t/subclass-trx.t Fri Sep 25 17:02:16 2009
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 72;
+use Test::More tests => 74;
 
 BEGIN 
 {
@@ -15,12 +15,12 @@
 My::DB2->default_domain('test');
 
 #
-# Postgres
+# PostgreSQL
 #
 
 SKIP: foreach my $db_type ('pg')
 {
-  skip("Postgres tests", 21)  unless($HAVE_PG);
+  skip("PostgreSQL tests", 23)  unless($HAVE_PG);
 
   My::DB2->default_type($db_type);
 
@@ -72,7 +72,7 @@
     $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("$1.%03d%03d", $2, $3)/e; # lame conversion of three-part version number
     # This broke in DBD::Pg 1.47, and 1.44-6 are broken in other ways
     # so only run these tests with 1.43 or earlier, or 1.48 or later.
-    skip('DBD::Pg 1.43-7 bug?', 5)  if($version > 1.43 && $version < 1.48);
+    skip('DBD::Pg 1.43-7 bug?', 7)  if($version > 1.43 && $version < 1.48);
 
     ok($db->begin_work, "begin_work() 3 - $db_type");
 
@@ -99,6 +99,13 @@
     my $count = $sth->fetchrow_array;
 
     is($count, 4, "do_transaction() 3 - $db_type");
+
+    is($db->do_transaction(sub
+    {
+      die bless { msg => 'Test' }, 'My::Exception';
+    }), undef, "do_transaction() exception 1 - $db_type");
+
+    is(ref $db->error, 'My::Exception', "do_transaction() exception 1 - $db_type");
   }
 }
 
@@ -293,7 +300,7 @@
 BEGIN
 {
   #
-  # Postgres
+  # PostgreSQL
   #
 
   my $dbh;
@@ -449,7 +456,7 @@
 
   if($HAVE_PG)
   {
-    # Postgres
+    # PostgreSQL
     my $dbh = My::DB2->new('pg_admin')->retain_dbh()
       or die My::DB2->error;
 

Modified: trunk/librose-db-perl/t/test-lib.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/test-lib.pl?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/test-lib.pl (original)
+++ trunk/librose-db-perl/t/test-lib.pl Fri Sep 25 17:02:16 2009
@@ -11,7 +11,7 @@
   Rose::DB->default_domain('test');
 
   #
-  # Postgres
+  # PostgreSQL
   #
 
   # Main

Modified: trunk/librose-db-perl/t/trx.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/trx.t?rev=44814&op=diff
==============================================================================
--- trunk/librose-db-perl/t/trx.t (original)
+++ trunk/librose-db-perl/t/trx.t Fri Sep 25 17:02:16 2009
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 72;
+use Test::More tests => 74;
 
 BEGIN 
 {
@@ -15,12 +15,12 @@
 Rose::DB->default_domain('test');
 
 #
-# Postgres
+# PostgreSQL
 #
 
 SKIP: foreach my $db_type ('pg')
 {
-  skip("Postgres tests", 21)  unless($HAVE_PG);
+  skip("PostgreSQL tests", 23)  unless($HAVE_PG);
 
   Rose::DB->default_type($db_type);
 
@@ -72,7 +72,7 @@
     $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("$1.%03d%03d", $2, $3)/e; # lame conversion of three-part version number
     # This broke in DBD::Pg 1.47, and 1.44-6 are broken in other ways
     # so only run these tests with 1.43 or earlier, or 1.48 or later.
-    skip('DBD::Pg 1.43-7 bug?', 5)  if($version > 1.43 && $version < 1.48);
+    skip('DBD::Pg 1.43-7 bug?', 7)  if($version > 1.43 && $version < 1.48);
 
     ok($db->begin_work, "begin_work() 3 - $db_type");
 
@@ -99,6 +99,13 @@
     my $count = $sth->fetchrow_array;
 
     is($count, 4, "do_transaction() 3 - $db_type");
+
+    is($db->do_transaction(sub
+    {
+      die bless { msg => 'Test' }, 'My::Exception';
+    }), undef, "do_transaction() exception 1 - $db_type");
+
+    is(ref $db->error, 'My::Exception', "do_transaction() exception 1 - $db_type");
   }
 }
 
@@ -293,7 +300,7 @@
 BEGIN
 {
   #
-  # Postgres
+  # PostgreSQL
   #
 
   my $dbh;
@@ -449,7 +456,7 @@
 
   if($HAVE_PG)
   {
-    # Postgres
+    # PostgreSQL
     my $dbh = Rose::DB->new('pg_admin')->retain_dbh()
       or die Rose::DB->error;

More information about the Pkg-perl-cvs-commits mailing list