X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=aa16d1370cabfedea6e739796383cf8c14a51aaa;hb=e17ad40aef83aaa623d02c61dc0ee10d33f472aa;hp=1e3f4233a21252d9ec5a096d3d42f8e4571b46af;hpb=b45a0999ad7b944b6371a0055c103ccfaa01d75c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index 1e3f423..aa16d13 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -6,10 +6,11 @@ use base qw/DBIx::Class::Schema::Loader::Base/;
 use mro 'c3';
 use Try::Tiny;
 use List::MoreUtils 'any';
+use Carp::Clan qw/^DBIx::Class/;
 use namespace::clean;
 use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.07017';
+our $VERSION = '0.07021';
 
 __PACKAGE__->mk_group_accessors('simple', qw/
     _disable_pk_detection
@@ -53,9 +54,10 @@ sub new {
         my $driver = $self->dbh->{Driver}->{Name};
 
         my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver;
-        if ($self->load_optional_class($subclass)) {
-            bless $self, $subclass unless $self->isa($subclass);
+        if ((not $self->isa($subclass)) && $self->load_optional_class($subclass)) {
+            bless $self, $subclass;
             $self->_rebless;
+            Class::C3::reinitialize() if $] < 5.009005;
         }
     }
 
@@ -65,7 +67,7 @@ sub new {
 
     $self->_setup;
 
-    $self;
+    return $self;
 }
 
 sub _build_quote_char {
@@ -256,10 +258,12 @@ sub _table_columns {
 
     my $sth = $self->_sth_for($table, undef, \'1 = 0');
     $sth->execute;
-    my $retval = $self->preserve_case ? \@{$sth->{NAME}} : \@{$sth->{NAME_lc}};
+
+    my $retval = [ map $self->_lc($_), @{$sth->{NAME}} ];
+
     $sth->finish;
 
-    $retval;
+    return $retval;
 }
 
 # Returns arrayref of pk col names
@@ -364,9 +368,10 @@ EOF
 
     # Failback: try the REMARKS column on column_info
     if (!$comment && $dbh->can('column_info')) {
-        my $sth = $self->_dbh_column_info( $dbh, undef, $table->schema, $table->name, $column_name );
-        my $info = $sth->fetchrow_hashref();
-        $comment = $info->{REMARKS};
+        if (my $sth = try { $self->_dbh_column_info( $dbh, undef, $table->schema, $table->name, $column_name ) }) {
+            my $info = $sth->fetchrow_hashref();
+            $comment = $info->{REMARKS};
+        }
     }
 
     return $comment;
@@ -402,7 +407,7 @@ sub _table_fk_info {
         my $relid   = ($raw_rel->[11] || ( "__dcsld__" . $i++ ));
 
         foreach my $var ($uk_scm, $uk_tbl, $uk_col, $fk_scm, $fk_col, $relid) {
-            $var =~ s/[\Q$self->{quote_char}\E]//g;
+            $var =~ s/[\Q$self->{quote_char}\E]//g if defined $var;
         }
 
         if ($self->db_schema && $self->db_schema->[0] ne '%'
@@ -443,9 +448,10 @@ sub _columns_info_for {
 
     my %result;
 
-    if ($dbh->can('column_info')) {
-        my $sth = $self->_dbh_column_info($dbh, undef, $table->schema, $table->name, '%' );
-        while ( my $info = $sth->fetchrow_hashref() ){
+    if (my $sth = try { $self->_dbh_column_info($dbh, undef, $table->schema, $table->name, '%' ) }) {
+        COL_INFO: while (my $info = try { $sth->fetchrow_hashref } catch { +{} }) {
+            next COL_INFO unless %$info;
+
             my $column_info = {};
             $column_info->{data_type}     = lc $info->{TYPE_NAME};
 
@@ -463,8 +469,6 @@ sub _columns_info_for {
             my $col_name = $info->{COLUMN_NAME};
             $col_name =~ s/^\"(.*)\"$/$1/;
 
-            $col_name = $self->_lc($col_name);
-
             my $extra_info = $self->_extra_column_info(
                 $table, $col_name, $column_info, $info
             ) || {};
@@ -473,8 +477,6 @@ sub _columns_info_for {
             $result{$col_name} = $column_info;
         }
         $sth->finish;
-
-        return \%result if %result;
     }
 
     my $sth = $self->_sth_for($table, undef, \'1 = 0');
@@ -482,7 +484,9 @@ sub _columns_info_for {
 
     my @columns = @{ $sth->{NAME} };
 
-    for my $i (0 .. $#columns) {
+    COL: for my $i (0 .. $#columns) {
+        next COL if %{ $result{ $columns[$i] }||{} };
+
         my $column_info = {};
         $column_info->{data_type} = lc $sth->{TYPE}[$i];
 
@@ -505,7 +509,7 @@ sub _columns_info_for {
         my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info, $sth) || {};
         $column_info = { %$column_info, %$extra_info };
 
-        $result{ $self->_lc($columns[$i]) } = $column_info;
+        $result{ $columns[$i] } = $column_info;
     }
     $sth->finish;
 
@@ -519,6 +523,32 @@ sub _columns_info_for {
         }
     }
 
+    # check for instances of the same column name with different case in preserve_case=0 mode
+    if (not $self->preserve_case) {
+        my %lc_colnames;
+
+        foreach my $col (keys %result) {
+            push @{ $lc_colnames{lc $col} }, $col;
+        }
+
+        if (keys %lc_colnames != keys %result) {
+            my @offending_colnames = map @$_, grep @$_ > 1, values %lc_colnames;
+
+            my $offending_colnames = join ", ", map "'$_'", @offending_colnames;
+
+            croak "columns $offending_colnames in table @{[ $table->sql_name ]} collide in preserve_case=0 mode. preserve_case=1 mode required";
+        }
+
+        # apply lowercasing
+        my %lc_result;
+
+        while (my ($col, $info) = each %result) {
+            $lc_result{ $self->_lc($col) } = $info;
+        }
+
+        %result = %lc_result;
+    }
+
     return \%result;
 }