X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=47f82c0f8d3f3bce9a51dbec9bd2e98f5ce78644;hb=e94ccbea965501f951f77e650f5b0e589a967112;hp=efc6c6833f181baa38a5a370b05e9c7987737854;hpb=fdd8ff1628c48e9c540958039b5bc1f490af8d88;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 efc6c68..47f82c0 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -2,11 +2,14 @@ package DBIx::Class::Schema::Loader::DBI::Pg;
 
 use strict;
 use warnings;
-use base 'DBIx::Class::Schema::Loader::DBI';
+use base qw/
+    DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault
+    DBIx::Class::Schema::Loader::DBI
+/;
 use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
 
-our $VERSION = '0.04999_11';
+our $VERSION = '0.07006';
 
 =head1 NAME
 
@@ -32,9 +35,17 @@ sub _setup {
     my $self = shift;
 
     $self->next::method(@_);
+
     $self->{db_schema} ||= 'public';
-}
 
+    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 {
     my ($self, $table) = @_;
@@ -122,15 +133,144 @@ sub _column_comment {
     $column_number );
 }
 
-sub _extra_column_info {
-    my ($self, $info) = @_;
-    my %extra_info;
+# Make sure data_type's that don't need it don't have a 'size' column_info, and
+# set the correct precision for datetime and varbit types.
+sub _columns_info_for {
+    my $self = shift;
+    my ($table) = @_;
+
+    my $result = $self->next::method(@_);
 
-    if ($info->{COLUMN_DEF} && $info->{COLUMN_DEF} =~ /\bnextval\(/i) {
-        $extra_info{is_auto_increment} = 1;
+    while (my ($col, $info) = each %$result) {
+        my $data_type = $info->{data_type};
+
+        # these types are fixed size
+        # XXX should this be a negative match?
+        if ($data_type =~
+/^(?: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';
+            }
+            elsif (lc($data_type) eq 'time without time zone') {
+                $info->{data_type} = 'time';
+            }
+
+            my ($precision) = $self->schema->storage->dbh
+                ->selectrow_array(<<EOF, {}, $table, $col);
+SELECT datetime_precision
+FROM information_schema.columns
+WHERE table_name = ? and column_name = ?
+EOF
+
+            if ($data_type =~ /^time\b/i) {
+                if ((not $precision) || $precision !~ /^\d/) {
+                    delete $info->{size};
+                }
+                else {
+                    my ($integer_datetimes) = $self->schema->storage->dbh
+                        ->selectrow_array('show integer_datetimes');
+
+                    my $max_precision =
+                        $integer_datetimes =~ /^on\z/i ? 6 : 10;
+
+                    if ($precision == $max_precision) {
+                        delete $info->{size};
+                    }
+                    else {
+                        $info->{size} = $precision;
+                    }
+                }
+            }
+            elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) {
+                delete $info->{size};
+            }
+            else {
+                $info->{size} = $precision;
+            }
+        }
+        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
+FROM information_schema.columns
+WHERE table_name = ? and column_name = ?
+EOF
+
+            $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 = $info->{size})) {
+            $size =~ s/\s*//g;
+
+            my ($scale, $precision) = split /,/, $size;
+
+            $info->{size} = [ $precision, $scale ];
+        }
+        elsif (lc($data_type) eq 'character varying') {
+            $info->{data_type} = 'varchar';
+
+            if (not $info->{size}) {
+                $info->{data_type}           = 'text';
+                $info->{original}{data_type} = 'varchar';
+            }
+        }
+        elsif (lc($data_type) eq 'character') {
+            $info->{data_type} = 'char';
+        }
+        else {
+            my ($typetype) = $self->schema->storage->dbh
+                ->selectrow_array(<<EOF, {}, $data_type);
+SELECT typtype
+FROM pg_catalog.pg_type
+WHERE typname = ?
+EOF
+            if ($typetype eq 'e') {
+                # The following will extract a list of allowed values for the
+                # enum.
+                my $typevalues = $self->schema->storage->dbh
+                    ->selectall_arrayref(<<EOF, {}, $info->{data_type});
+SELECT e.enumlabel
+FROM pg_catalog.pg_enum e
+JOIN pg_catalog.pg_type t ON t.oid = e.enumtypid
+WHERE t.typname = ?
+EOF
+
+                $info->{extra}{list} = [ map { $_->[0] } @$typevalues ];
+
+                # Store its original name in extra for SQLT to pick up.
+                $info->{extra}{custom_type_name} = $info->{data_type};
+
+                $info->{data_type} = 'enum';
+                
+                delete $info->{size};
+            }
+        }
+
+# process SERIAL columns
+        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 ${ $info->{default_value} } }||'') eq 'now()') {
+            # do not use a ref to a constant, that breaks Data::Dump output
+            ${$info->{default_value}} = 'current_timestamp';
+
+            my $now = 'now()';
+            $info->{original}{default_value} = \$now;
+        }
     }
 
-    return \%extra_info;
+    return $result;
 }
 
 =head1 SEE ALSO
@@ -140,7 +280,7 @@ L<DBIx::Class::Schema::Loader::DBI>
 
 =head1 AUTHOR
 
-See L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
 
 =head1 LICENSE