X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=1910923e393f871681ea7d464e5093d775b1d59b;hb=f80b0ea749d599898951efc034141d26237a926e;hp=d8a8b9e29aeee2b3ed7ba186f87335a62e5a8d3c;hpb=bc1cb85e84e6a30c75763edd478378a68009c722;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index d8a8b9e..1910923 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -137,16 +137,20 @@ sub _columns_info_for {
 
     my $result = $self->next::method(@_);
 
-    foreach my $col (keys %$result) {
-        my $data_type = $result->{$col}{data_type};
+    while (my ($col, $info) = each %$result) {
+        my $data_type = $info->{data_type};
 
         # these types are fixed size
         if ($data_type =~
-/^(?:bigint|int8|bigserial|serial8|bit|boolean|bool|box|bytea|cidr|circle|date|double precision|float8|inet|integer|int|int4|line|lseg|macaddr|money|path|point|polygon|real|float4|smallint|int2|serial|serial4|text)\z/i) {
-            delete $result->{$col}{size};
+/^(?:bigint|int8|bigserial|serial8|boolean|bool|box|bytea|cidr|circle|date|double precision|float8|inet|integer|int|int4|line|lseg|macaddr|money|path|point|polygon|real|float4|smallint|int2|serial|serial4|text)\z/i) {
+            delete $info->{size};
         }
 # for datetime types, check if it has a precision or not
         elsif ($data_type =~ /^(?:interval|time|timestamp)\b/i) {
+            if (lc($data_type) eq 'timestamp without time zone') {
+                $info->{data_type} = 'timestamp';
+            }
+
             my ($precision) = $self->schema->storage->dbh
                 ->selectrow_array(<<EOF, {}, $table, $col);
 SELECT datetime_precision
@@ -156,7 +160,7 @@ EOF
 
             if ($data_type =~ /^time\b/i) {
                 if ((not $precision) || $precision !~ /^\d/) {
-                    delete $result->{$col}{size};
+                    delete $info->{size};
                 }
                 else {
                     my ($integer_datetimes) = $self->schema->storage->dbh
@@ -166,21 +170,23 @@ EOF
                         $integer_datetimes =~ /^on\z/i ? 6 : 10;
 
                     if ($precision == $max_precision) {
-                        delete $result->{$col}{size};
+                        delete $info->{size};
                     }
                     else {
-                        $result->{$col}{size} = $precision;
+                        $info->{size} = $precision;
                     }
                 }
             }
             elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) {
-                delete $result->{$col}{size};
+                delete $info->{size};
             }
             else {
-                $result->{$col}{size} = $precision;
+                $info->{size} = $precision;
             }
         }
-        elsif ($data_type =~ /^(?:bit varying|varbit)\z/i) {
+        elsif ($data_type =~ /^(?:bit(?: varying)?|varbit)\z/i) {
+            $info->{data_type} = 'varbit' if $data_type =~ /var/i;
+
             my ($precision) = $self->schema->storage->dbh
                 ->selectrow_array(<<EOF, {}, $table, $col);
 SELECT character_maximum_length
@@ -188,27 +194,37 @@ FROM information_schema.columns
 WHERE table_name = ? and column_name = ?
 EOF
 
-            $result->{$col}{size} = $precision;
+            $info->{size} = $precision if $precision;
+
+            $info->{size} = 1 if (not $precision) && lc($data_type) eq 'bit';
         }
-        elsif ($data_type =~ /^(?:numeric|decimal)\z/i && (my $size = $result->{$col}{size})) {
+        elsif ($data_type =~ /^(?:numeric|decimal)\z/i && (my $size = $info->{size})) {
             $size =~ s/\s*//g;
 
             my ($scale, $precision) = split /,/, $size;
 
-            $result->{$col}{size} = [ $precision, $scale ];
+            $info->{size} = [ $precision, $scale ];
+        }
+        elsif (lc($data_type) eq 'character varying') {
+            $info->{data_type} = 'varchar';
+
+            $info->{data_type} = 'text' if not $info->{size};
+        }
+        elsif (lc($data_type) eq 'character') {
+            $info->{data_type} = 'char';
         }
 
 # process SERIAL columns
-        if (ref($result->{$col}{default_value}) eq 'SCALAR' && ${ $result->{$col}{default_value} } =~ /\bnextval\(['"](\w+)/i) {
-            $result->{$col}{is_auto_increment} = 1;
-            $result->{$col}{sequence}          = $1;
-            delete $result->{$col}{default_value};
+        if (ref($info->{default_value}) eq 'SCALAR' && ${ $info->{default_value} } =~ /\bnextval\(['"](\w+)/i) {
+            $info->{is_auto_increment} = 1;
+            $info->{sequence}          = $1;
+            delete $info->{default_value};
         }
 
-# alias now() to CURRENT_TIMESTAMP for deploying to other DBs
-        if (eval { lc ${ $result->{$col}{default_value} }||'' eq 'now()' }) {
+# alias now() to current_timestamp for deploying to other DBs
+        if (eval { lc ${ $info->{default_value} }||'' eq 'now()' }) {
             # do not use a ref to a constant, that breaks Data::Dump output
-            ${$result->{$col}{default_value}} = 'CURRENT_TIMESTAMP';
+            ${$info->{default_value}} = 'current_timestamp';
         }
     }