X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FModel%2FDBIC%2FSchema.pm;h=24a7ea0b1c4aab0c8af9d0bdd408c163ce95a1b3;hb=f1613faa51dc989e288215e6fd452a67ff8b700e;hp=402ef3c8384c71747c18fb1448afd8845f9dc8ea;hpb=bfcd6e3dec03d5ae54958ccb9c269c4c7b2e378b;p=catagits%2FCatalyst-Model-DBIC-Schema.git

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index 402ef3c..24a7ea0 100644
--- a/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Model/DBIC/Schema.pm
@@ -8,7 +8,7 @@ use Carp;
 use Data::Dumper;
 require DBIx::Class;
 
-our $VERSION = '0.15';
+our $VERSION = '0.17_01';
 
 __PACKAGE__->mk_classaccessor('composed_schema');
 __PACKAGE__->mk_accessors('schema');
@@ -290,46 +290,8 @@ sub new {
     $self->schema->storage_type($self->{storage_type})
         if $self->{storage_type};
 
-    # XXX This is temporary, until DBIx::Class::Storage::DBI supports the
-    #  same syntax and we switch our requisite to that version somewhere
-    #  down the line.  This syntax is already committed into DBIx::Class
-    #  -current branch post-0.06.
-    # At that time, this whole block can revert back to just being:
-    #  $self->schema->connection(@{$self->{connect_info}});
+    $self->schema->connection(@{$self->{connect_info}});
     
-    my $connect_info = [ @{$self->{connect_info}} ];
-    my ($on_connect_do, %sql_maker_opts);
-    if($DBIx::Class::VERSION < 0.069) {
-        my $used;
-        my $last_info = $self->{connect_info}->[-1];
-        if(ref $last_info eq 'HASH') {
-            if($on_connect_do = $last_info->{on_connect_do}) {
-              $used = 1;
-            }
-            for my $sql_maker_opt (qw/limit_dialect quote_char name_sep/) {
-              if(my $opt_val = $last_info->{$sql_maker_opt}) {
-                $used = 1;
-                $sql_maker_opts{$sql_maker_opt} = $opt_val;
-              }
-            }
-            pop(@$connect_info) if $used;
-        }
-    }
-
-    $self->schema->connection(@$connect_info);
-
-    if($DBIx::Class::VERSION < 0.069) {
-        $self->schema->storage->on_connect_do($on_connect_do)
-            if $on_connect_do;
-        foreach my $sql_maker_opt (keys %sql_maker_opts) {
-            $self->schema->storage->sql_maker->$sql_maker_opt(
-                $sql_maker_opts{$sql_maker_opt}
-            );
-        }
-    }
-
-    # XXX end of compatibility block referenced above
-
     no strict 'refs';
     foreach my $moniker ($self->schema->sources) {
         my $classname = "${class}::$moniker";