added preserve_case option

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / DBI / Pg.pm

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index 952596a..d8a8b9e 100644 (file)
--- 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;
 
-our $VERSION = '0.04999_14';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
@@ -32,9 +35,13 @@ sub _setup {
     my $self = shift;
 
     $self->next::method(@_);
+
     $self->{db_schema} ||= 'public';
-}
 
+    if (not defined $self->preserve_case) {
+        $self->preserve_case(0);
+    }
+}
 
 sub _table_uniq_info {
     my ($self, $table) = @_;
@@ -183,28 +190,29 @@ EOF
 
             $result->{$col}{size} = $precision;
         }
-        elsif ($data_type =~ /^(?:numeric|decimal)\z/i) {
-            my $size = $result->{$col}{size};
+        elsif ($data_type =~ /^(?:numeric|decimal)\z/i && (my $size = $result->{$col}{size})) {
             $size =~ s/\s*//g;
 
             my ($scale, $precision) = split /,/, $size;
 
             $result->{$col}{size} = [ $precision, $scale ];
         }
-    }
 
-    return $result;
-}
-
-sub _extra_column_info {
-    my ($self, $info) = @_;
-    my %extra_info;
+# 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 ($info->{COLUMN_DEF} && $info->{COLUMN_DEF} =~ /\bnextval\(/i) {
-        $extra_info{is_auto_increment} = 1;
+# alias now() to CURRENT_TIMESTAMP for deploying to other DBs
+        if (eval { lc ${ $result->{$col}{default_value} }||'' eq 'now()' }) {
+            # do not use a ref to a constant, that breaks Data::Dump output
+            ${$result->{$col}{default_value}} = 'CURRENT_TIMESTAMP';
+        }
     }
 
-    return \%extra_info;
+    return $result;
 }
 
 =head1 SEE ALSO