X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=DBSchema%2FDBD%2FPg.pm;h=26adde4d360a80931a5a7c8acea1395e7ad7c176;hb=5cbdef56c923a0f25901585eb28d9d9f552f71f6;hp=da4900983a2acfbf50c1b9227f506927b3ca1d50;hpb=67bdf8ab29e1fe0b2a057d9955a30bb363cda1f6;p=DBIx-DBSchema.git diff --git a/DBSchema/DBD/Pg.pm b/DBSchema/DBD/Pg.pm index da49009..26adde4 100644 --- a/DBSchema/DBD/Pg.pm +++ b/DBSchema/DBD/Pg.pm @@ -5,7 +5,7 @@ use vars qw($VERSION @ISA %typemap); use DBD::Pg 1.32; use DBIx::DBSchema::DBD; -$VERSION = '0.13'; +$VERSION = '0.16'; @ISA = qw(DBIx::DBSchema::DBD); die "DBD::Pg version 1.32 or 1.41 (or later) required--". @@ -52,6 +52,18 @@ END map { + my $type = $_->{'typname'}; + $type = 'char' if $type eq 'bpchar'; + + my $len = ''; + if ( $_->{attlen} == -1 && $_->{atttypmod} != -1 + && $_->{typname} ne 'text' ) { + $len = $_->{atttypmod} - 4; + if ( $_->{typname} eq 'numeric' ) { + $len = ($len >> 16). ','. ($len & 0xffff); + } + } + my $default = ''; if ( $_->{atthasdef} ) { my $attnum = $_->{attnum}; @@ -62,19 +74,21 @@ END $d_sth->execute or die $d_sth->errstr; $default = $d_sth->fetchrow_arrayref->[0]; - }; - my $len = ''; - if ( $_->{attlen} == -1 && $_->{atttypmod} != -1 - && $_->{typname} ne 'text' ) { - $len = $_->{atttypmod} - 4; - if ( $_->{typname} eq 'numeric' ) { - $len = ($len >> 16). ','. ($len & 0xffff); + if ( _type_needs_quoting($type) ) { + $default =~ s/::([\w ]+)$//; #save typecast info? + if ( $default =~ /^'(.*)'$/ ) { + $default = $1; + $default = \"''" if $default eq ''; + } else { + my $value = $default; + $default = \$value; + } + } elsif ( $default =~ /^[a-z]/i ) { #sloppy, but it'll do + $default = \$default; } - } - my $type = $_->{'typname'}; - $type = 'char' if $type eq 'bpchar'; + } [ $_->{'attname'}, @@ -219,6 +233,21 @@ sub alter_column_callback { my( $proto, $dbh, $table, $old_column, $new_column ) = @_; my $name = $old_column->name; + my %canonical = ( + 'SMALLINT' => 'INT2', + 'INT' => 'INT4', + 'BIGINT' => 'INT8', + 'SERIAL' => 'INT4', + 'BIGSERIAL' => 'INT8', + 'DECIMAL' => 'NUMERIC', + 'REAL' => 'FLOAT4', + 'BLOB' => 'BYTEA', + 'TIMESTAMP' => 'TIMESTAMPTZ', + ); + foreach ($old_column, $new_column) { + $_->type($canonical{uc($_->type)}) if $canonical{uc($_->type)}; + } + my $pg_server_version = $dbh->{'pg_server_version'}; my $warning = ''; unless ( $pg_server_version =~ /\d/ ) { @@ -228,6 +257,30 @@ sub alter_column_callback { my $hashref = {}; + #change type + if ( ( $canonical{uc($old_column->type)} || uc($old_column->type) ) + ne ( $canonical{uc($new_column->type)} || uc($new_column->type) ) + || $old_column->length ne $new_column->length + ) + { + + warn $warning if $warning; + if ( $pg_server_version >= 80000 ) { + + $hashref->{'sql_alter_type'} = + "ALTER TABLE $table ALTER COLUMN ". $new_column->name. + " TYPE ". $new_column->type. + ( ( defined($new_column->length) && $new_column->length ) + ? '('.$new_column->length.')' + : '' + ) + + } else { + warn "WARNING: can't yet change column types for Pg < version 8\n"; + } + + } + # change nullability from NOT NULL to NULL if ( ! $old_column->null && $new_column->null ) { @@ -264,20 +317,25 @@ sub alter_column_callback { } -sub _column_value_needs_quoting { +sub column_value_needs_quoting { my($proto, $col) = @_; - $col->type !~ m{^( - int(?:2|4|8)? - | smallint - | integer - | bigint - | (?:numeric|decimal)(?:\(\d+(?:\s*\,\s*\d+\))?)? - | real - | double\s+precision - | float(?:\(\d+\))? - | serial(?:4|8)? - | bigserial - )$}x; + _type_needs_quoting($col->type); +} + +sub _type_needs_quoting { + my $type = shift; + $type !~ m{^( + int(?:2|4|8)? + | smallint + | integer + | bigint + | (?:numeric|decimal)(?:\(\d+(?:\s*\,\s*\d+\))?)? + | real + | double\s+precision + | float(?:\(\d+\))? + | serial(?:4|8)? + | bigserial + )$}ix; } @@ -289,7 +347,7 @@ Ivan Kohler Copyright (c) 2000 Ivan Kohler Copyright (c) 2000 Mail Abuse Prevention System LLC -Copyright (c) 2009 Freeside Internet Services, Inc. +Copyright (c) 2009-2010 Freeside Internet Services, Inc. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.