fix inadvertantly acquiring empty string defaults for non-numeric colums

[DBIx-DBSchema.git] / DBSchema / DBD / Pg.pm

diff --git a/DBSchema/DBD/Pg.pm b/DBSchema/DBD/Pg.pm
index f593f88..430c100 100644 (file)
--- 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.11';
+$VERSION = '0.14';
 @ISA = qw(DBIx::DBSchema::DBD);
 
 die "DBD::Pg version 1.32 or 1.41 (or later) required--".
@@ -13,8 +13,9 @@ die "DBD::Pg version 1.32 or 1.41 (or later) required--".
   if $DBD::Pg::VERSION != 1.32 && $DBD::Pg::VERSION < 1.41;
 
 %typemap = (
-  'BLOB' => 'BYTEA',
+  'BLOB'           => 'BYTEA',
   'LONG VARBINARY' => 'BYTEA',
+  'TIMESTAMP'      => 'TIMESTAMP WITH TIME ZONE',
 );
 
 =head1 NAME
@@ -154,6 +155,171 @@ END
   $row->{'indisunique'};
 }
 
+sub add_column_callback {
+  my( $proto, $dbh, $table, $column_obj ) = @_;
+  my $name = $column_obj->name;
+
+  my $pg_server_version = $dbh->{'pg_server_version'};
+  my $warning = '';
+  unless ( $pg_server_version =~ /\d/ ) {
+    $warning = "WARNING: no pg_server_version!  Assuming >= 7.3\n";
+    $pg_server_version = 70300;
+  }
+
+  my $hashref = { 'sql_after' => [], };
+
+  if ( $column_obj->type =~ /^(\w*)SERIAL$/i ) {
+
+    $hashref->{'effective_type'} = uc($1).'INT';
+
+    #needs more work for old Pg?
+      
+    my $nextval;
+    warn $warning if $warning;
+    if ( $pg_server_version >= 70300 ) {
+      my $db_schema  = default_db_schema();
+      $nextval = "nextval('$db_schema.${table}_${name}_seq'::text)";
+    } else {
+      $nextval = "nextval('${table}_${name}_seq'::text)";
+    }
+
+    push @{ $hashref->{'sql_after'} }, 
+      "ALTER TABLE $table ALTER COLUMN $name SET DEFAULT $nextval",
+      "CREATE SEQUENCE ${table}_${name}_seq",
+      "UPDATE $table SET $name = $nextval WHERE $name IS NULL",
+    ;
+
+  }
+
+  if ( ! $column_obj->null ) {
+    $hashref->{'effective_null'} = 'NULL';
+
+    warn $warning if $warning;
+    if ( $pg_server_version >= 70300 ) {
+
+      push @{ $hashref->{'sql_after'} },
+        "ALTER TABLE $table ALTER $name SET NOT NULL";
+
+    } else {
+
+      push @{ $hashref->{'sql_after'} },
+        "UPDATE pg_attribute SET attnotnull = TRUE ".
+        " WHERE attname = '$name' ".
+        " AND attrelid = ( SELECT oid FROM pg_class WHERE relname = '$table' )";
+
+    }
+
+  }
+
+  $hashref;
+
+}
+
+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/ ) {
+    $warning = "WARNING: no pg_server_version!  Assuming >= 7.3\n";
+    $pg_server_version = 70300;
+  }
+
+  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 ) {
+
+    warn $warning if $warning;
+    if ( $pg_server_version < 70300 ) {
+      $hashref->{'sql_alter_null'} =
+        "UPDATE pg_attribute SET attnotnull = FALSE
+          WHERE attname = '$name'
+            AND attrelid = ( SELECT oid FROM pg_class
+                               WHERE relname = '$table'
+                           )";
+    }
+
+  }
+
+  # change nullability from NULL to NOT NULL...
+  # this one could be more complicated, need to set a DEFAULT value and update
+  # the table first...
+  if ( $old_column->null && ! $new_column->null ) {
+
+    warn $warning if $warning;
+    if ( $pg_server_version < 70300 ) {
+      $hashref->{'sql_alter_null'} =
+        "UPDATE pg_attribute SET attnotnull = TRUE
+           WHERE attname = '$name'
+             AND attrelid = ( SELECT oid FROM pg_class
+                                WHERE relname = '$table'
+                            )";
+    }
+
+  }
+
+  $hashref;
+
+}
+
+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
+                 )$}ix;
+}
+
+
 =head1 AUTHOR
 
 Ivan Kohler <ivan-dbix-dbschema@420.am>
@@ -162,6 +328,7 @@ Ivan Kohler <ivan-dbix-dbschema@420.am>
 
 Copyright (c) 2000 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
+Copyright (c) 2009 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.