X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FDB2.pm;h=f7cf9efb4a0dfbb269c9901728111458ceb8abbd;hb=c697835eacc34e76036a6e91cc4b0bc1ccd05f69;hp=ed699250c569d8ee28e9b0c0a8c3397e2d88f46c;hpb=6e566cc4a06b1661597200611a03320f969e2566;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
index ed69925..f7cf9ef 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
@@ -7,9 +7,9 @@ use base qw/
     DBIx::Class::Schema::Loader::DBI
 /;
 use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
 
-our $VERSION = '0.07000';
+our $VERSION = '0.07005';
 
 =head1 NAME
 
@@ -41,6 +41,10 @@ sub _setup {
     if (not defined $self->preserve_case) {
         $self->preserve_case(0);
     }
+    elsif ($self->preserve_case) {
+        $self->schema->storage->sql_maker->quote_char('"');
+        $self->schema->storage->sql_maker->name_sep('.');
+    }
 }
 
 sub _table_uniq_info {
@@ -58,12 +62,12 @@ sub _table_uniq_info {
         WHERE tc.TABSCHEMA = ? and tc.TABNAME = ? and tc.TYPE = 'U'}
     ) or die $DBI::errstr;
 
-    $sth->execute($self->db_schema, uc $table) or die $DBI::errstr;
+    $sth->execute($self->db_schema, $self->_uc($table)) or die $DBI::errstr;
 
     my %keydata;
     while(my $row = $sth->fetchrow_arrayref) {
         my ($col, $constname, $seq) = @$row;
-        push(@{$keydata{$constname}}, [ $seq, lc $col ]);
+        push(@{$keydata{$constname}}, [ $seq, $self->_lc($col) ]);
     }
     foreach my $keyname (keys %keydata) {
         my @ordered_cols = map { $_->[1] } sort { $a->[0] <=> $b->[0] }
@@ -81,7 +85,7 @@ sub _tables_list {
     my ($self, $opts) = @_;
     
     my $dbh = $self->schema->storage->dbh;
-    my @tables = map { lc } $dbh->tables(
+    my @tables = map $self->_lc($_), $dbh->tables(
         $self->db_schema ? { TABLE_SCHEM => $self->db_schema } : undef
     );
     s/\Q$self->{_quoter}\E//g for @tables;
@@ -92,16 +96,16 @@ sub _tables_list {
 
 sub _table_pk_info {
     my ($self, $table) = @_;
-    return $self->next::method(uc $table);
+    return $self->next::method($self->_uc($table));
 }
 
 sub _table_fk_info {
     my ($self, $table) = @_;
 
-    my $rels = $self->next::method(uc $table);
+    my $rels = $self->next::method($self->_uc($table));
 
     foreach my $rel (@$rels) {
-        $rel->{remote_table} = lc $rel->{remote_table};
+        $rel->{remote_table} = $self->_lc($rel->{remote_table});
     }
 
     return $rels;
@@ -111,7 +115,7 @@ sub _columns_info_for {
     my $self = shift;
     my ($table) = @_;
 
-    my $result = $self->next::method(uc $table);
+    my $result = $self->next::method($self->_uc($table));
 
     my $dbh = $self->schema->storage->dbh;
 
@@ -125,15 +129,67 @@ sub _columns_info_for {
                 AND identity = 'Y' AND generated != ''
             },
             {}, 1);
-        $sth->execute($self->db_schema, uc $table, uc $col);
+        $sth->execute($self->db_schema, $self->_uc($table), $self->_uc($col));
         if ($sth->fetchrow_array) {
             $info->{is_auto_increment} = 1;
         }
 
-        if (eval { lc ${ $info->{default_value} } }||'' eq 'current timestamp') {
-            ${ $info->{default_value} } = 'current_timestamp';
+        my $data_type = $info->{data_type};
+
+        if ($data_type !~ /^(?:(?:var)?(?:char|graphic)|decimal)\z/i) {
             delete $info->{size};
         }
+
+        if ($data_type eq 'double') {
+            $info->{data_type} = 'double precision';
+        }
+        elsif ($data_type eq 'decimal') {
+            no warnings 'uninitialized';
+
+            $info->{data_type} = 'numeric';
+
+            my @size = @{ $info->{size} || [] };
+
+            if ($size[0] == 5 && $size[1] == 0) {
+                delete $info->{size};
+            }
+        }
+        elsif ($data_type =~ /^(?:((?:var)?char) \(\) for bit data|(long varchar) for bit data)\z/i) {
+            my $base_type = lc($1 || $2);
+
+            (my $original_type = $data_type) =~ s/[()]+ //;
+
+            $info->{original}{data_type} = $original_type;
+
+            if ($base_type eq 'long varchar') {
+                $info->{data_type} = 'blob';
+            }
+            else {
+                if ($base_type eq 'char') {
+                    $info->{data_type} = 'binary';
+                }
+                elsif ($base_type eq 'varchar') {
+                    $info->{data_type} = 'varbinary';
+                }
+
+                my ($size) = $dbh->selectrow_array(<<'EOF', {}, $self->db_schema, $self->_uc($table), $self->_uc($col));
+SELECT length
+FROM syscat.columns
+WHERE tabschema = ? AND tabname = ? AND colname = ?
+EOF
+
+                $info->{size} = $size if $size;
+            }
+        }
+
+        if ((eval { lc ${ $info->{default_value} } }||'') =~ /^current (date|time(?:stamp)?)\z/i) {
+            my $type = lc($1);
+
+            ${ $info->{default_value} } = 'current_timestamp';
+
+            my $orig_deflt = "current $type";
+            $info->{original}{default_value} = \$orig_deflt;
+        }
     }
 
     return $result;