From: Rafael Kitover <rkitover@cpan.org>
Date: Fri, 24 Jul 2009 04:32:26 +0000 (+0000)
Subject: Merge 'trunk' into 'reduce_pings'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=820eebf7142f5a0bead4a67b522cea0a4523c82b;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'trunk' into 'reduce_pings'

r6075@hlagh (orig r7074):  tomboh | 2009-07-20 12:20:37 -0400
Fix POD changes from r7040.
r6081@hlagh (orig r7077):  norbi | 2009-07-20 18:59:30 -0400

r6082@hlagh (orig r7078):  norbi | 2009-07-20 18:59:58 -0400
 r7232@vger:  mendel | 2009-07-21 00:58:12 +0200
 Fixed documentation and added test for the "Arbitrary SQL through a custom ResultSource" Cookbook alternate (subclassing) recipe.

r6083@hlagh (orig r7079):  norbi | 2009-07-20 19:05:32 -0400
 r7235@vger:  mendel | 2009-07-21 01:05:18 +0200
 Fixed 'typo' (removed a word that I left there by accident).

r6084@hlagh (orig r7080):  norbi | 2009-07-21 04:06:21 -0400
 r7237@vger:  mendel | 2009-07-21 10:06:05 +0200
 Fixing what my svk client screwed up.

r6085@hlagh (orig r7081):  caelum | 2009-07-21 10:51:55 -0400
update Storage::Replicated prereqs
r6086@hlagh (orig r7082):  caelum | 2009-07-21 12:16:34 -0400
show Oracle datetime_setup alter session statements in debug output
r6088@hlagh (orig r7085):  ribasushi | 2009-07-21 21:50:57 -0400
Lazy folks do not run the whole test suite before merging >:(
r6287@hlagh (orig r7097):  caelum | 2009-07-23 14:14:11 -0400
 r6092@hlagh (orig r7090):  caelum | 2009-07-23 08:24:39 -0400
 new branch for fixing the MONEY type in MSSQL
 r6093@hlagh (orig r7091):  caelum | 2009-07-23 08:34:01 -0400
 add test
 r6283@hlagh (orig r7093):  caelum | 2009-07-23 10:31:08 -0400
 fix money columns
 r6284@hlagh (orig r7094):  caelum | 2009-07-23 10:34:06 -0400
 minor change
 r6285@hlagh (orig r7095):  caelum | 2009-07-23 11:01:37 -0400
 add test for updating money value to NULL
 r6286@hlagh (orig r7096):  caelum | 2009-07-23 14:09:26 -0400
 add money type tests to dbd::sybase+mssql tests
---

820eebf7142f5a0bead4a67b522cea0a4523c82b
diff --cc lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
index c001b26,9c50a3c..7dcc016
--- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
@@@ -263,14 -264,12 +264,12 @@@ sub _svp_release { 1 
  sub _svp_rollback {
      my ($self, $name) = @_;
  
 -    $self->dbh->do("ROLLBACK TO SAVEPOINT $name")
 +    $self->_get_dbh->do("ROLLBACK TO SAVEPOINT $name")
  }
  
- =head1 AUTHORS
+ =head1 AUTHOR
  
- Andy Grundman <andy@hybridized.org>
- 
- Scott Connelly <scottsweep@yahoo.com>
+ See L<DBIx::Class/CONTRIBUTORS>.
  
  =head1 LICENSE
  
diff --cc t/746mssql.t
index 4e58da9,fa8f137..e5be28a
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@@ -12,7 -12,7 +12,7 @@@ my ($dsn, $user, $pass) = @ENV{map { "D
  plan skip_all => 'Set $ENV{DBICTEST_MSSQL_ODBC_DSN}, _USER and _PASS to run this test'
    unless ($dsn && $user);
  
- plan tests => 28;
 -plan tests => 33;
++plan tests => 34;
  
  my $schema = DBICTest::Schema->connect($dsn, $user, $pass);