r70815 - in /trunk/libdancer-plugin-database-perl: Changes META.yml debian/changelog lib/Dancer/Plugin/Database.pm

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Mon Mar  7 23:59:12 2011
New Revision: 70815

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70815
Log:
integrate new upstream version, still waiting...

Modified:
    trunk/libdancer-plugin-database-perl/Changes
    trunk/libdancer-plugin-database-perl/META.yml
    trunk/libdancer-plugin-database-perl/debian/changelog
    trunk/libdancer-plugin-database-perl/lib/Dancer/Plugin/Database.pm

Modified: trunk/libdancer-plugin-database-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdancer-plugin-database-perl/Changes?rev=70815&op=diff
==============================================================================
--- trunk/libdancer-plugin-database-perl/Changes (original)
+++ trunk/libdancer-plugin-database-perl/Changes Mon Mar  7 23:59:12 2011
@@ -1,4 +1,8 @@
 Revision history for Dancer-Plugin-Database
+
+1.21    2011-03-06
+        - Bugfix: return undef if connection fails, rather than attempting to
+          re-bless and blowing up. Fixes GH-7, thanks to Nick Hibma
 
 1.20    2011-02-23
         - New feature - automatically enable UTF-8 support if the app's charset

Modified: trunk/libdancer-plugin-database-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdancer-plugin-database-perl/META.yml?rev=70815&op=diff
==============================================================================
--- trunk/libdancer-plugin-database-perl/META.yml (original)
+++ trunk/libdancer-plugin-database-perl/META.yml Mon Mar  7 23:59:12 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Dancer-Plugin-Database
-version:            1.20
+version:            1.21
 abstract:           easy database connections for Dancer applications
 author:
     - David Precious <davidp at preshweb.co.uk>

Modified: trunk/libdancer-plugin-database-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdancer-plugin-database-perl/debian/changelog?rev=70815&op=diff
==============================================================================
--- trunk/libdancer-plugin-database-perl/debian/changelog (original)
+++ trunk/libdancer-plugin-database-perl/debian/changelog Mon Mar  7 23:59:12 2011
@@ -1,4 +1,4 @@
-libdancer-plugin-database-perl (1.20-1) UNRELEASED; urgency=low
+libdancer-plugin-database-perl (1.21-1) UNRELEASED; urgency=low
 
   Contacted the author about build-depends issue, waiting for a new
   release: https://rt.cpan.org/Ticket/Display.html?id=66204
@@ -9,7 +9,7 @@
   * Add Build-Depends on libjson-perl, as it is needed for tests. It
     is not needed during runtime, as nothing in lib/ contains 'json'
 
- -- Jonathan Yu <jawnsy at cpan.org>  Sat, 26 Feb 2011 13:26:49 -0500
+ -- Jonathan Yu <jawnsy at cpan.org>  Mon, 07 Mar 2011 19:22:23 -0500
 
 libdancer-plugin-database-perl (1.00-1) unstable; urgency=low
 

Modified: trunk/libdancer-plugin-database-perl/lib/Dancer/Plugin/Database.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdancer-plugin-database-perl/lib/Dancer/Plugin/Database.pm?rev=70815&op=diff
==============================================================================
--- trunk/libdancer-plugin-database-perl/lib/Dancer/Plugin/Database.pm (original)
+++ trunk/libdancer-plugin-database-perl/lib/Dancer/Plugin/Database.pm Mon Mar  7 23:59:12 2011
@@ -12,7 +12,7 @@
 
 =cut
 
-our $VERSION = '1.20';
+our $VERSION = '1.21';
 
 my $settings = undef;
 
@@ -152,6 +152,7 @@
         Dancer::Logger::error(
             "Database connection failed - " . $DBI::errstr
         );
+        return;
     } elsif (exists $settings->{on_connect_do}) {
         for (@{ $settings->{on_connect_do} }) {
             $dbh->do($_) or Dancer::Logger::error(