package SQL::Translator::Producer::PostgreSQL;
# -------------------------------------------------------------------
-# $Id: PostgreSQL.pm,v 1.24 2006-07-23 14:03:52 schiffbruechige Exp $
+# $Id: PostgreSQL.pm,v 1.29 2007-06-04 04:01:14 mwz444 Exp $
# -------------------------------------------------------------------
# Copyright (C) 2002-4 SQLFairy Authors
#
use strict;
use warnings;
use vars qw[ $DEBUG $WARN $VERSION ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.24 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.29 $ =~ /(\d+)\.(\d+)/;
$DEBUG = 1 unless defined $DEBUG;
use SQL::Translator::Schema::Constants;
set => 'character varying',
date => 'date',
datetime => 'timestamp',
- time => 'date',
+ time => 'time',
timestamp => 'timestamp',
year => 'date',
my $no_comments = $translator->no_comments;
my $add_drop_table = $translator->add_drop_table;
my $schema = $translator->schema;
+ my $pargs = $translator->producer_args;
+
+ my $postgres_version = $pargs->{postgres_version} || 0;
my $qt = '';
$qt = '"' if ($translator->quote_table_names);
$output .= header_comment unless ($no_comments);
# my %used_index_names;
- my @table_defs;
+ my (@table_defs, @fks);
for my $table ( $schema->get_tables ) {
-
- push @table_defs, create_table($table, { quote_table_names => $qt,
- quote_field_names => $qf,
- no_comments => $no_comments,
- add_drop_table => $add_drop_table,});
-
-# $output .= join( "\n\n",
-# @comments,
-# @sequence_defs,
-# $create_statement,
-# @index_defs,
-# ''
- # );
+
+ my ($table_def, $fks) = create_table($table,
+ { quote_table_names => $qt,
+ quote_field_names => $qf,
+ no_comments => $no_comments,
+ postgres_version => $postgres_version,
+ add_drop_table => $add_drop_table,});
+ push @table_defs, $table_def;
+ push @fks, @$fks;
+
}
$output = join("\n\n", @table_defs);
+ if ( @fks ) {
+ $output .= "--\n-- Foreign Key Definitions\n--\n\n" unless $no_comments;
+ $output .= join( "\n\n", @fks ) . "\n";
+ }
if ( $WARN ) {
if ( %truncated ) {
my $qf = $options->{quote_field_names} || '';
my $no_comments = $options->{no_comments} || 0;
my $add_drop_table = $options->{add_drop_table} || 0;
+ my $postgres_version = $options->{postgres_version} || 0;
my $table_name = $table->name or next;
$table_name = mk_name( $table_name, '', undef, 1 );
- my $table_name_ur = $qt ? unreserve($table_name) : $table_name;
+ my $table_name_ur = $qt ? $table_name : unreserve($table_name);
$table->name($table_name_ur);
# print STDERR "$table_name table_name\n";
- my ( @comments, @field_defs, @sequence_defs, @constraint_defs, @fks );
+ my ( @comments, @field_defs, @sequence_defs, @constraint_defs, @type_defs, @type_drops, @fks );
- push @comments, "--\n-- Table: $table_name_ur\n--" unless $no_comments;
+ push @comments, "--\n-- Table: $table_name_ur\n--\n" unless $no_comments;
if ( $table->comments and !$no_comments ){
my $c = "-- Comments: \n-- ";
$c .= join "\n-- ", $table->comments;
- $c .= "\n--";
+ $c .= "\n--\n";
push @comments, $c;
}
push @field_defs, create_field($field, { quote_table_names => $qt,
quote_field_names => $qf,
table_name => $table_name_ur,
+ postgres_version => $postgres_version,
+ type_defs => \@type_defs,
+ type_drops => \@type_drops,
constraint_defs => \@constraint_defs,});
}
quote_table_names => $qt,
table_name => $table_name,
});
- push @index_defs, $idef;
+ $idef and push @index_defs, $idef;
push @constraint_defs, @$constraints;
}
my $create_statement;
$create_statement = join("\n", @comments);
- $create_statement .= qq[DROP TABLE $qt$table_name_ur$qt;\n]
- if $add_drop_table;
+ if ($add_drop_table) {
+ if ($postgres_version >= 8.2) {
+ $create_statement .= qq[DROP TABLE IF EXISTS $qt$table_name_ur$qt CASCADE;\n];
+ $create_statement .= join ("\n", @type_drops) . "\n"
+ if $postgres_version >= 8.3;
+ } else {
+ $create_statement .= qq[DROP TABLE $qt$table_name_ur$qt CASCADE;\n];
+ }
+ }
+ $create_statement .= join("\n", @type_defs) . "\n"
+ if $postgres_version >= 8.3;
$create_statement .= qq[CREATE TABLE $qt$table_name_ur$qt (\n].
join( ",\n", map { " $_" } @field_defs, @constraint_defs ).
"\n);"
;
- if ( @fks ) {
- $create_statement .= "--\n-- Foreign Key Definitions\n--\n\n" unless $no_comments;
- $create_statement .= join( "\n\n", @fks );
- }
$create_statement .= "\n" . join(";\n", @index_defs) . "\n";
- return $create_statement;
+ return $create_statement, \@fks;
}
{
my $qf = $options->{quote_field_names} || '';
my $table_name = $field->table->name;
my $constraint_defs = $options->{constraint_defs} || [];
+ my $postgres_version = $options->{postgres_version} || 0;
+ my $type_defs = $options->{type_defs} || [];
+ my $type_drops = $options->{type_drops} || [];
$field_name_scope{$table_name} ||= {};
my $field_name = mk_name(
$field->name, '', $field_name_scope{$table_name}, 1
);
- my $field_name_ur = $qf ? unreserve($field_name, $table_name ) : $field_name;
+ my $field_name_ur = $qf ? $field_name : unreserve($field_name, $table_name );
$field->name($field_name_ur);
my $field_comments = $field->comments
? "-- " . $field->comments . "\n "
my $commalist = join( ', ', map { qq['$_'] } @$list );
my $seq_name;
- $field_def .= ' '. convert_datatype($field);
+ if ($postgres_version >= 8.3 && $field->data_type eq 'enum') {
+ my $type_name = $field->table->name . '_' . $field->name . '_type';
+ $field_def .= ' '. $type_name;
+ push @$type_defs, "CREATE TYPE $type_name AS ENUM ($commalist);";
+ push @$type_drops, "DROP TYPE IF EXISTS $type_name;";
+ } else {
+ $field_def .= ' '. convert_datatype($field);
+ }
#
# Default value -- disallow for timestamps
#
- my $default = $data_type =~ /(timestamp|date)/i
- ? undef : $field->default_value;
+# my $default = $data_type =~ /(timestamp|date)/i
+# ? undef : $field->default_value;
+ my $default = $field->default_value;
if ( defined $default ) {
+ my $qd = "'";
+ $qd = '' if ($default eq 'now()' ||
+ $default eq 'CURRENT_TIMESTAMP');
$field_def .= sprintf( ' DEFAULT %s',
( $field->is_auto_increment && $seq_name )
? qq[nextval('"$seq_name"'::text)] :
- ( $default =~ m/null/i ) ? 'NULL' : "'$default'"
+ ( $default =~ m/null/i ) ? 'NULL' : "$qd$default$qd"
);
}
my $qt = $options->{quote_table_names} ||'';
my $qf = $options->{quote_field_names} ||'';
my $table_name = $index->table->name;
- my $table_name_ur = $qt ? unreserve($table_name) : $table_name;
+# my $table_name_ur = $qt ? unreserve($table_name) : $table_name;
my ($index_def, @constraint_defs);
my $type = $index->type || NORMAL;
my @fields =
map { $_ =~ s/\(.+\)//; $_ }
- map { $qt ? unreserve($_, $table_name ) : $_ }
+ map { $qt ? $_ : unreserve($_, $table_name ) }
$index->fields;
next unless @fields;
}
elsif ( $type eq NORMAL ) {
$index_def =
- "CREATE INDEX ${qf}${name}${qf} on ${qt}${table_name_ur}${qt} (".
+ "CREATE INDEX ${qf}${name}${qf} on ${qt}${table_name}${qt} (".
join( ', ', map { qq[$qf$_$qf] } @fields ).
');'
;
my @fields =
map { $_ =~ s/\(.+\)//; $_ }
- map { $qt ? unreserve( $_, $table_name ) : $_}
+ map { $qt ? $_ : unreserve( $_, $table_name )}
$c->fields;
my @rfields =
map { $_ =~ s/\(.+\)//; $_ }
- map { $qt ? unreserve( $_, $table_name ) : $_}
+ map { $qt ? $_ : unreserve( $_, $table_name )}
$c->reference_fields;
next if !@fields && $c->type ne CHECK_C;
$def .= ' ON UPDATE '.join( ' ', $c->on_update );
}
+ if ( $c->deferrable ) {
+ $def .= ' DEFERRABLE';
+ }
+
push @fks, "$def;";
}
$data_type = 'integer';
}
}
+ my @type_without_size = qw/bigint boolean box bytea cidr circle date inet
+ integer smallint text line lseg macaddr money
+ path point polygon real/;
+ foreach (@type_without_size) {
+ if ( $data_type =~ qr/$_/ ) {
+ undef @size; last;
+ }
+ }
- #
- # PG doesn't need a size for integers or text
- #
- undef @size if $data_type =~ m/(integer|smallint|bigint|text)/;
-
if ( defined $size[0] && $size[0] > 0 ) {
$data_type .= '(' . join( ',', @size ) . ')';
}
+ elsif (defined $size[0] && $data_type eq 'timestamp' ) {
+ $data_type .= '(' . join( ',', @size ) . ')';
+ }
return $data_type;
projects / dbsrgits/SQL-Translator.git / blobdiff