From: Rafael Kitover <rkitover@cpan.org>
Date: Sun, 13 Sep 2009 08:29:25 +0000 (+0000)
Subject: Merge 'trunk' into 'sybase'
X-Git-Tag: v0.08112~14^2~15
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5d9c76e106f9ac8929bf1dddeeb157bed8d404ac;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'sybase'

r20609@hlagh (orig r7621):  mo | 2009-09-10 12:53:32 -0400
added test to make sure that store_column is called even for non-dirty columns
r20610@hlagh (orig r7622):  bluefeet | 2009-09-10 13:03:21 -0400
Fix RSC->reset() to no longer return $self, which fixes Cursor::Cached + RSC.
r20611@hlagh (orig r7623):  ribasushi | 2009-09-10 13:32:03 -0400
The real fix
r20612@hlagh (orig r7624):  matthewt | 2009-09-10 20:33:17 -0400
make it clear that we are not supposed to have optional deps
r20613@hlagh (orig r7625):  ribasushi | 2009-09-11 00:30:03 -0400
Changes so far
r20614@hlagh (orig r7626):  ribasushi | 2009-09-11 00:39:45 -0400
Fix borked makefile
r20615@hlagh (orig r7627):  ribasushi | 2009-09-11 09:39:42 -0400
Fixed minor problem with txn scope guard - rollback exceptions were never reported
r20617@hlagh (orig r7629):  ribasushi | 2009-09-11 17:06:54 -0400
Extend prefetch tests
r20618@hlagh (orig r7630):  ribasushi | 2009-09-11 17:13:45 -0400
Reverting http://dev.catalyst.perl.org/svnweb/bast/revision?rev=4278 - it seems to pass fine now
r20619@hlagh (orig r7631):  ribasushi | 2009-09-11 18:15:50 -0400
Add single() ro RSC
r20620@hlagh (orig r7632):  ribasushi | 2009-09-11 18:44:01 -0400
This is how the txnguard should really work
r20621@hlagh (orig r7633):  ribasushi | 2009-09-11 18:58:21 -0400
Fix borked example
r20622@hlagh (orig r7634):  ribasushi | 2009-09-11 18:58:58 -0400
scopeguard almost done
r20623@hlagh (orig r7635):  brunov | 2009-09-11 19:25:12 -0400
Update DBIx::Class::Manual::Example.pod to reflect previous changes in examples/Schema/insertdb.pl

r20624@hlagh (orig r7636):  brunov | 2009-09-11 19:27:17 -0400
Added Bruno Vecchi to the Contributors section in DBIx/Class.pm


r20625@hlagh (orig r7637):  ribasushi | 2009-09-11 19:31:16 -0400
Final scopeguard tweak (?)
r20629@hlagh (orig r7641):  ribasushi | 2009-09-12 06:46:51 -0400
Even better localization of $@, and don't use Test::Warn for the time being, as something is freaking out Sub::UpLevel
---

5d9c76e106f9ac8929bf1dddeeb157bed8d404ac
diff --cc Changes
index 2365696,a0d6efb..28d0239
--- a/Changes
+++ b/Changes
@@@ -1,16 -1,18 +1,29 @@@
  Revision history for DBIx::Class
  
+         - Remove the recommends from Makefile.PL, DBIx::Class is not
+           supposed to have optional dependencies. ever.
+         - Mangle the DBIx/Class.pm POD to be more clear about
+           copyright and license
+         - Put back PG's multiple autoinc per table support, accidentally
+           dropped during the serial-autodetection rwrite
+         - Make sure ResultSetColumn does not depend on the (undefined)
+           return value of ->cursor->reset()
+         - Add single() to ResultSetColumn (same semantics as ResultSet)
+         - Make sure to turn off IDENTITY_INSERT after insert() on MSSQL
+           tables that needed it
+         - More informative exception on failing _resolve_relationship
+         - Fix unreported rollback exceptions in TxnScopeGuard
 +        - Complete Sybase RDBMS support including:
 +          - Support for TEXT/IMAGE columns
 +          - Support for the 'money' datatype
 +          - Transaction savepoints support
 +          - DateTime inflation support
 +          - Support for bind variables when connecting to a newer Sybase with
 +            OpenClient libraries
 +          - Support for connections via FreeTDS with CASTs for bind variables
 +            when needed
 +          - Support for interpolated variables with proper quoting when
 +            connecting to an older Sybase and/or via FreeTDS
  
  0.08111 2009-09-06 21:58:00 (UTC)
          - The hashref to connection_info now accepts a 'dbh_maker'
diff --cc lib/DBIx/Class/Storage/DBI/Cursor.pm
index c4c9806,3d5da26..b2c1354
--- a/lib/DBIx/Class/Storage/DBI/Cursor.pm
+++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm
@@@ -154,17 -146,17 +154,17 @@@ sub reset 
    my ($self) = @_;
  
    # No need to care about failures here
 -  eval { $self->{sth}->finish if $self->{sth} && $self->{sth}->{Active} };
 +  eval { $self->sth->finish if $self->sth && $self->sth->{Active} };
    $self->_soft_reset;
+   return undef;
  }
  
  sub _soft_reset {
    my ($self) = @_;
  
 -  delete $self->{sth};
 +  $self->sth(undef);
    delete $self->{done};
    $self->{pos} = 0;
-   return $self;
  }
  
  sub _check_dbh_gen {