X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=4bb5d235f3381fe44fc56ce0e2dc4c7ca3648ff6;hb=e4be49c99edfa51b5dee57848ab589fa9bff38a2;hp=36ae47d0dc008d56ee597e9198ca7c92be2d726d;hpb=2a8e93e98aace9a187a57a66a8d71fabc6a48a8c;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 36ae47d..4bb5d23 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -6,28 +6,19 @@ 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';
+use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.06000';
+our $VERSION = '0.07010';
 
 =head1 NAME
 
 DBIx::Class::Schema::Loader::DBI::Pg - DBIx::Class::Schema::Loader::DBI
 PostgreSQL Implementation.
 
-=head1 SYNOPSIS
-
-  package My::Schema;
-  use base qw/DBIx::Class::Schema::Loader/;
-
-  __PACKAGE__->loader_options( debug => 1 );
-
-  1;
-
 =head1 DESCRIPTION
 
-See L<DBIx::Class::Schema::Loader::Base>.
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
 =cut
 
@@ -35,9 +26,49 @@ sub _setup {
     my $self = shift;
 
     $self->next::method(@_);
-    $self->{db_schema} ||= 'public';
+
+    $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 _tables_list {
+    my ($self, $opts) = @_;
+
+    my $dbh = $self->schema->storage->dbh;
+
+    my @tables;
+
+    foreach my $schema (@{ $self->db_schema }) {
+        my @raw_tables = $dbh->tables(undef, $schema, '%', '%');
+
+        foreach my $table_name (@raw_tables) {
+            my $schema_quoted = $table_name =~ /^"/;
+
+            if ($schema_quoted) {
+                $table_name =~ s/^"([^"]+)"\.//;
+            }
+            else {
+                $table_name =~ s/^([^.]+)\.//;
+            }
+            my $table = DBIx::Class::Schema::Loader::Table->new(schema => $1);
+
+            $table_name =~ s/^"([^"]+)"\z/$1/;
+
+            $table->name($table_name);
+
+            push @tables, $table;
+        }
+    }
+
+    return $self->_filter_tables(\@tables, $opts);
+}
 
 sub _table_uniq_info {
     my ($self, $table) = @_;
@@ -75,7 +106,7 @@ sub _table_uniq_info {
           c.relname     = ?}
     );
 
-    $uniq_sth->execute($self->db_schema, $table);
+    $uniq_sth->execute($table->schema, $table);
     while(my $row = $uniq_sth->fetchrow_arrayref) {
         my ($tableid, $indexname, $col_nums) = @$row;
         $col_nums =~ s/^\s+//;
@@ -106,7 +137,7 @@ sub _table_comment {
             FROM pg_class 
             WHERE relname=? AND relnamespace=(
                 SELECT oid FROM pg_namespace WHERE nspname=?)
-        }, undef, $table, $self->db_schema
+        }, undef, $table, $table->schema
         );   
     return $table_comment
 }
@@ -119,7 +150,7 @@ sub _column_comment {
             FROM pg_class 
             WHERE relname=? AND relnamespace=(
                 SELECT oid FROM pg_namespace WHERE nspname=?)
-        }, undef, $table, $self->db_schema
+        }, undef, $table, $table->schema
         );   
     return $self->schema->storage->dbh->selectrow_array('SELECT col_description(?,?)', undef, $table_oid,
     $column_number );
@@ -133,16 +164,24 @@ 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
+        # XXX should this be a negative match?
         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';
+            }
+            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
@@ -152,7 +191,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
@@ -162,21 +201,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
@@ -184,21 +225,72 @@ 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';
+
+            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 && $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($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\('([^:]+)'/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;
         }
     }