r18511 - in /branches/upstream/librose-db-perl/current: Changes META.yml lib/Rose/DB.pm lib/Rose/DB/Cache.pm lib/Rose/DB/Informix.pm lib/Rose/DB/MySQL.pm

[eloy at users.alioth.debian.org]

Author: eloy
Date: Sat Apr 12 19:11:02 2008
New Revision: 18511

URL: http://svn.debian.org/wsvn/?sc=1&rev=18511
Log:
[svn-upgrade] Integrating new upstream version, librose-db-perl (0.743)

Modified:
    branches/upstream/librose-db-perl/current/Changes
    branches/upstream/librose-db-perl/current/META.yml
    branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
    branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm
    branches/upstream/librose-db-perl/current/lib/Rose/DB/Informix.pm
    branches/upstream/librose-db-perl/current/lib/Rose/DB/MySQL.pm

Modified: branches/upstream/librose-db-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/Changes?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/Changes (original)
+++ branches/upstream/librose-db-perl/current/Changes Sat Apr 12 19:11:02 2008
@@ -1,3 +1,12 @@
+0.743 (04.02.2008) - John Siracusa <siracusa at gmail.com>
+
+    * Fixed some warnings and made nice with the CPAN version extractor.
+
+0.742 (04.01.2008) - John Siracusa <siracusa at gmail.com>
+
+    * Added warning for ancient DBD::mysql versions.
+    * Support for Rose::DB::Object 0.769.
+
 0.741 (02.25.2008) - John Siracusa <siracusa at gmail.com>
 
     * Changed mailing list URLs.

Modified: branches/upstream/librose-db-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/META.yml?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/META.yml (original)
+++ branches/upstream/librose-db-perl/current/META.yml Sat Apr 12 19:11:02 2008
@@ -1,10 +1,10 @@
 --- #YAML:1.0
 name:                Rose-DB
-version:             0.741
+version:             0.743
 abstract:            ~
 license:             ~
 author:              ~
-generated_by:        ExtUtils::MakeMaker version 6.42
+generated_by:        ExtUtils::MakeMaker version 6.44
 distribution_type:   module
 requires:     
     Bit::Vector::Overload:         6.4

Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/lib/Rose/DB.pm?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB.pm Sat Apr 12 19:11:02 2008
@@ -20,7 +20,7 @@
 
 our $Error;
 
-our $VERSION = '0.741';
+our $VERSION = '0.743';
 
 our $Debug = 0;
 

Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm Sat Apr 12 19:11:02 2008
@@ -35,7 +35,7 @@
   my($self) = shift;
 
   return $self->{'use_cache_during_apache_startup'} = $_[0] ? 1 : 0  if(@_);
-  
+
   if(defined $self->{'use_cache_during_apache_startup'})
   {
     return $self->{'use_cache_during_apache_startup'};

Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB/Informix.pm
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/lib/Rose/DB/Informix.pm?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB/Informix.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB/Informix.pm Sat Apr 12 19:11:02 2008
@@ -29,7 +29,7 @@
   return "dbi:Informix:" . ($args{'db'} || $args{'database'});
 }
 
-sub last_insertid_from_sth { $_[1]->{'ix_sqlerrd'}[1] }
+sub last_insertid_from_sth { $_[1]->{'ix_sqlerrd'}[1] || $_[1]->{'ix_serial8'} }
 
 sub likes_lowercase_table_names { 1 }
 sub generate_primary_key_values { return; } # old perls seem to like this...

Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB/MySQL.pm
URL: http://svn.debian.org/wsvn/branches/upstream/librose-db-perl/current/lib/Rose/DB/MySQL.pm?rev=18511&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB/MySQL.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB/MySQL.pm Sat Apr 12 19:11:02 2008
@@ -7,9 +7,11 @@
 use DateTime::Format::MySQL;
 use SQL::ReservedWords::MySQL();
 
+eval { require DBD::mysql }; # Ignore errors
+
 use Rose::DB;
 
-our $VERSION = '0.740';
+our $VERSION = '0.743';
 
 our $Debug = 0;
 
@@ -451,6 +453,12 @@
   return \@columns;
 }
 
+# Bury warning down here to make nice with version extractors
+if(defined $DBD::mysql::VERSION && $DBD::mysql::VERSION <= 2.9)
+{
+  warn "WARNING: Rose::DB may not work correctly with DBD::mysql ",
+       "version 2.9 or earlier.  You have version $DBD::mysql::VERSION";
+}
 
 1;