Switch to C3 mro throughout the ::Storage hierarchy (DBIx::Class brings in MRO::Compa...

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / ODBC / DB2_400_SQL.pm

diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/DB2_400_SQL.pm b/lib/DBIx/Class/Storage/DBI/ODBC/DB2_400_SQL.pm
index d4e6218..33a4e7a 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ODBC/DB2_400_SQL.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC/DB2_400_SQL.pm
@@ -3,12 +3,10 @@ use strict;
 use warnings;
 
 use base qw/DBIx::Class::Storage::DBI::ODBC/;
+use mro 'c3';
 
-sub last_insert_id
-{
-    my ($self) = @_;
-
-    my $dbh = $self->_dbh;
+sub _dbh_last_insert_id {
+    my ($self, $dbh, $source, $col) = @_;
 
     # get the schema/table separator:
     #    '.' when SQL naming is active
@@ -23,13 +21,17 @@ sub last_insert_id
     return @res ? $res[0] : undef;
 }
 
-sub _sql_maker_args {
+sub _sql_maker_opts {
     my ($self) = @_;
     
-    return (
-        limit_dialect => 'FetchFirst',
-        name_sep => $self->_dbh->get_info(41)
-    );
+    $self->dbh_do(sub {
+        my ($self, $dbh) = @_;
+
+        return {
+            limit_dialect => 'FetchFirst',
+            name_sep => $dbh->get_info(41)
+        };
+    });
 }
 
 1;
@@ -50,12 +52,12 @@ over ODBC
 
 This class implements support specific to DB2/400 over ODBC, including
 auto-increment primary keys, SQL::Abstract::Limit dialect, and name separator
-for for connections using either SQL naming or System naming.
+for connections using either SQL naming or System naming.
 
 
 =head1 AUTHORS
 
-Marc Mims C<< <marc@sssonline.com> >>
+Marc Mims C<< <marc@questright.com> >>
 
 Based on DBIx::Class::Storage::DBI::DB2 by Jess Robinson.