use strict;
use warnings;
our ( $DEBUG, $WARN );
-our $VERSION = '1.59';
+our $VERSION = '1.62';
$DEBUG = 0 unless defined $DEBUG;
use base qw(SQL::Translator::Producer);
}
}
-sub is_geometry
-{
- my $field = shift;
- return 1 if $field->data_type eq 'geometry';
+sub is_geometry {
+ my $field = shift;
+ return 1 if $field->data_type eq 'geometry';
}
-sub is_geography
-{
+sub is_geography {
my $field = shift;
return 1 if $field->data_type eq 'geography';
}
my $table_name = $table->name or next;
my $table_name_qt = $generator->quote($table_name);
-# print STDERR "$table_name table_name\n";
- my ( @comments, @field_defs, @index_defs, @sequence_defs, @constraint_defs, @fks );
+ my ( @comments, @field_defs, @index_defs, @constraint_defs, @fks );
push @comments, "--\n-- Table: $table_name\n--\n" unless $no_comments;
$create_statement .= ( $create_statement =~ /;$/ ? "\n" : q{} )
. join(";\n", @index_defs);
- #
- # Geometry
- #
- if(grep { is_geometry($_) } $table->get_fields){
- $create_statement .= ";";
- my @geometry_columns;
- foreach my $col ($table->get_fields) { push(@geometry_columns,$col) if is_geometry($col); }
- $create_statement .= "\n".join("\n", map{ drop_geometry_column($_) } @geometry_columns) if $options->{add_drop_table};
- $create_statement .= "\n".join("\n", map{ add_geometry_column($_) } @geometry_columns);
- }
+ #
+ # Geometry
+ #
+ if (my @geometry_columns = grep { is_geometry($_) } $table->get_fields) {
+ $create_statement .= join(";\n", '', map{ drop_geometry_column($_, $options) } @geometry_columns) if $options->{add_drop_table};
+ $create_statement .= join(";\n", '', map{ add_geometry_column($_, $options) } @geometry_columns);
+ }
return $create_statement, \@fks;
}
#
# Datatype
#
- my @size = $field->size;
my $data_type = lc $field->data_type;
my %extra = $field->extra;
my $list = $extra{'list'} || [];
my $commalist = join( ', ', map { __PACKAGE__->_quote_string($_) } @$list );
- if ($postgres_version >= 8.003 && $field->data_type eq 'enum') {
+ if ($postgres_version >= 8.003 && $data_type eq 'enum') {
my $type_name = $extra{'custom_type_name'} || $field->table->name . '_' . $field->name . '_type';
$field_def .= ' '. $type_name;
my $new_type_def = "DROP TYPE IF EXISTS $type_name CASCADE;\n" .
#
$field_def .= ' NOT NULL' unless $field->is_nullable;
- #
- # Geometry constraints
- #
- if(is_geometry($field)){
- foreach ( create_geometry_constraints($field) ) {
- my ($cdefs, $fks) = create_constraint($_, {
- generator => $generator,
- });
- push @$constraint_defs, @$cdefs;
- push @$fks, @$fks;
- }
+ #
+ # Geometry constraints
+ #
+ if (is_geometry($field)) {
+ foreach ( create_geometry_constraints($field, $options) ) {
+ my ($cdefs, $fks) = create_constraint($_, $options);
+ push @$constraint_defs, @$cdefs;
+ push @$fks, @$fks;
+ }
}
return $field_def;
}
}
-sub create_geometry_constraints{
- my $field = shift;
-
- my @constraints;
- push @constraints, SQL::Translator::Schema::Constraint->new(
- name => "enforce_dims_".$field->name,
- expression => "(ST_NDims($field) = ".$field->extra->{dimensions}.")",
- table => $field->table,
- type => CHECK_C,
- );
-
- push @constraints, SQL::Translator::Schema::Constraint->new(
- name => "enforce_srid_".$field->name,
- expression => "(ST_SRID($field) = ".$field->extra->{srid}.")",
- table => $field->table,
- type => CHECK_C,
- );
- push @constraints, SQL::Translator::Schema::Constraint->new(
- name => "enforce_geotype_".$field->name,
- expression => "(GeometryType($field) = '".$field->extra->{geometry_type}."'::text OR $field IS NULL)",
- table => $field->table,
- type => CHECK_C,
- );
-
- return @constraints;
+sub create_geometry_constraints {
+ my ($field, $options) = @_;
+
+ my $fname = _generator($options)->quote($field);
+ my @constraints;
+ push @constraints, SQL::Translator::Schema::Constraint->new(
+ name => "enforce_dims_".$field->name,
+ expression => "(ST_NDims($fname) = ".$field->extra->{dimensions}.")",
+ table => $field->table,
+ type => CHECK_C,
+ );
+
+ push @constraints, SQL::Translator::Schema::Constraint->new(
+ name => "enforce_srid_".$field->name,
+ expression => "(ST_SRID($fname) = ".$field->extra->{srid}.")",
+ table => $field->table,
+ type => CHECK_C,
+ );
+ push @constraints, SQL::Translator::Schema::Constraint->new(
+ name => "enforce_geotype_".$field->name,
+ expression => "(GeometryType($fname) = ". __PACKAGE__->_quote_string($field->extra->{geometry_type}) ."::text OR $fname IS NULL)",
+ table => $field->table,
+ type => CHECK_C,
+ );
+
+ return @constraints;
}
{
$data_type = 'character varying';
}
elsif ( $field->is_auto_increment ) {
- if ( defined $size[0] && $size[0] > 11 ) {
+ if ( (defined $size[0] && $size[0] > 11) or $data_type eq 'bigint' ) {
$data_type = 'bigserial';
}
else {
sub alter_field
{
- my ($from_field, $to_field) = @_;
+ my ($from_field, $to_field, $options) = @_;
die "Can't alter field in another table"
if($from_field->table->name ne $to_field->table->name);
+ my $generator = _generator($options);
my @out;
# drop geometry column and constraints
- push @out, drop_geometry_column($from_field) if is_geometry($from_field);
- push @out, drop_geometry_constraints($from_field) if is_geometry($from_field);
+ push @out,
+ drop_geometry_column($from_field, $options),
+ drop_geometry_constraints($from_field, $options),
+ if is_geometry($from_field);
# it's necessary to start with rename column cause this would affect
# all of the following statements which would be broken if do the
# BUT: drop geometry is done before the rename, cause it work's on the
# $from_field directly
push @out, sprintf('ALTER TABLE %s RENAME COLUMN %s TO %s',
- $to_field->table->name,
- $from_field->name,
- $to_field->name) if($from_field->name ne $to_field->name);
+ map($generator->quote($_),
+ $to_field->table->name,
+ $from_field->name,
+ $to_field->name,
+ ),
+ )
+ if($from_field->name ne $to_field->name);
push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET NOT NULL',
- $to_field->table->name,
- $to_field->name) if(!$to_field->is_nullable and
- $from_field->is_nullable);
+ map($generator->quote($_),
+ $to_field->table->name,
+ $to_field->name
+ ),
+ )
+ if(!$to_field->is_nullable and $from_field->is_nullable);
push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP NOT NULL',
- $to_field->table->name,
- $to_field->name)
- if ( !$from_field->is_nullable and $to_field->is_nullable );
+ map($generator->quote($_),
+ $to_field->table->name,
+ $to_field->name
+ ),
+ )
+ if (!$from_field->is_nullable and $to_field->is_nullable);
my $from_dt = convert_datatype($from_field);
my $to_dt = convert_datatype($to_field);
push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s TYPE %s',
- $to_field->table->name,
- $to_field->name,
- $to_dt) if($to_dt ne $from_dt);
+ map($generator->quote($_),
+ $to_field->table->name,
+ $to_field->name
+ ),
+ $to_dt,
+ )
+ if($to_dt ne $from_dt);
my $old_default = $from_field->default_value;
my $new_default = $to_field->default_value;
# ALTER TABLE users ALTER COLUMN column SET DEFAULT ThisIsUnescaped;
if(ref $default_value eq "SCALAR" ) {
$default_value = $$default_value;
- } elsif( defined $default_value && $to_dt =~ /^(character|text)/xsmi ) {
+ } elsif( defined $default_value && $to_dt =~ /^(character|text|timestamp|date)/xsmi ) {
$default_value = __PACKAGE__->_quote_string($default_value);
}
push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s',
- $to_field->table->name,
- $to_field->name,
- $default_value)
+ map($generator->quote($_),
+ $to_field->table->name,
+ $to_field->name,
+ ),
+ $default_value,
+ )
if ( defined $new_default &&
(!defined $old_default || $old_default ne $new_default) );
# would result in no change
push @out, sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT',
- $to_field->table->name,
- $to_field->name)
+ map($generator->quote($_),
+ $to_field->table->name,
+ $to_field->name,
+ ),
+ )
if ( !defined $new_default && defined $old_default );
# add geometry column and constraints
- push @out, add_geometry_column($to_field) if is_geometry($to_field);
- push @out, add_geometry_constraints($to_field) if is_geometry($to_field);
+ push @out,
+ add_geometry_column($to_field, $options),
+ add_geometry_constraints($to_field, $options),
+ if is_geometry($to_field);
return wantarray ? @out : join(";\n", @out);
}
sub add_field
{
- my ($new_field) = @_;
+ my ($new_field,$options) = @_;
my $out = sprintf('ALTER TABLE %s ADD COLUMN %s',
- $new_field->table->name,
- create_field($new_field));
- $out .= "\n".add_geometry_column($new_field) if is_geometry($new_field);
- $out .= "\n".add_geometry_constraints($new_field) if is_geometry($new_field);
+ _generator($options)->quote($new_field->table->name),
+ create_field($new_field, $options));
+ $out .= ";\n".add_geometry_column($new_field, $options)
+ . ";\n".add_geometry_constraints($new_field, $options)
+ if is_geometry($new_field);
return $out;
}
my $out = sprintf('ALTER TABLE %s DROP COLUMN %s',
$generator->quote($old_field->table->name),
$generator->quote($old_field->name));
- $out .= "\n".drop_geometry_column($old_field) if is_geometry($old_field);
+ $out .= ";\n".drop_geometry_column($old_field, $options)
+ if is_geometry($old_field);
return $out;
}
-sub add_geometry_column{
- my ($field,$options) = @_;
-
- my $out = sprintf("INSERT INTO geometry_columns VALUES ('%s','%s','%s','%s','%s','%s','%s')",
- '',
- $field->table->schema->name,
- $options->{table} ? $options->{table} : $field->table->name,
- $field->name,
- $field->extra->{dimensions},
- $field->extra->{srid},
- $field->extra->{geometry_type});
- return $out;
-}
+sub add_geometry_column {
+ my ($field, $options) = @_;
-sub drop_geometry_column
-{
- my $field = shift;
-
- my $out = sprintf("DELETE FROM geometry_columns WHERE f_table_schema = '%s' AND f_table_name = '%s' AND f_geometry_column = '%s'",
- $field->table->schema->name,
- $field->table->name,
- $field->name);
- return $out;
+ return sprintf(
+ "INSERT INTO geometry_columns VALUES (%s,%s,%s,%s,%s,%s,%s)",
+ map(__PACKAGE__->_quote_string($_),
+ '',
+ $field->table->schema->name,
+ $options->{table} ? $options->{table} : $field->table->name,
+ $field->name,
+ $field->extra->{dimensions},
+ $field->extra->{srid},
+ $field->extra->{geometry_type},
+ ),
+ );
}
-sub add_geometry_constraints{
- my $field = shift;
+sub drop_geometry_column {
+ my ($field) = @_;
- my @constraints = create_geometry_constraints($field);
+ return sprintf(
+ "DELETE FROM geometry_columns WHERE f_table_schema = %s AND f_table_name = %s AND f_geometry_column = %s",
+ map(__PACKAGE__->_quote_string($_),
+ $field->table->schema->name,
+ $field->table->name,
+ $field->name,
+ ),
+ );
+}
- my $out = join("\n", map { alter_create_constraint($_); } @constraints);
+sub add_geometry_constraints {
+ my ($field, $options) = @_;
- return $out;
+ return join(";\n", map { alter_create_constraint($_, $options) }
+ create_geometry_constraints($field, $options));
}
-sub drop_geometry_constraints{
- my $field = shift;
-
- my @constraints = create_geometry_constraints($field);
+sub drop_geometry_constraints {
+ my ($field, $options) = @_;
- my $out = join("\n", map { alter_drop_constraint($_); } @constraints);
+ return join(";\n", map { alter_drop_constraint($_, $options) }
+ create_geometry_constraints($field, $options));
- return $out;
}
sub alter_table {
my $out = sprintf('ALTER TABLE %s %s',
$generator->quote($to_table->name),
$options->{alter_table_action});
- $out .= "\n".$options->{geometry_changes} if $options->{geometry_changes};
+ $out .= ";\n".$options->{geometry_changes} if $options->{geometry_changes};
return $out;
}
my $generator = _generator($options);
$options->{alter_table_action} = "RENAME TO " . $generator->quote($new_table);
- my @geometry_changes;
- push @geometry_changes, map { drop_geometry_column($_); } grep { is_geometry($_) } $old_table->get_fields;
- push @geometry_changes, map { add_geometry_column($_, { table => $new_table }); } grep { is_geometry($_) } $old_table->get_fields;
+ my @geometry_changes = map {
+ drop_geometry_column($_, $options),
+ add_geometry_column($_, { %{$options}, table => $new_table }),
+ } grep { is_geometry($_) } $old_table->get_fields;
- $options->{geometry_changes} = join ("\n",@geometry_changes) if scalar(@geometry_changes);
+ $options->{geometry_changes} = join (";\n",@geometry_changes) if @geometry_changes;
return alter_table($old_table, $options);
}
sub alter_create_index {
my ($index, $options) = @_;
my $generator = _generator($options);
- my ($idef, $constraints) = create_index($index, {
- generator => $generator,
- });
+ my ($idef, $constraints) = create_index($index, $options);
return $index->type eq NORMAL ? $idef
: sprintf('ALTER TABLE %s ADD %s',
$generator->quote($index->table->name),
sub alter_drop_index {
my ($index, $options) = @_;
- my $index_name = $index->name;
- return "DROP INDEX $index_name";
+ return 'DROP INDEX '. _generator($options)->quote($index->name);
}
sub alter_drop_constraint {
# table as prefix and fkey or pkey as suffix, concatenated by an underscore
my $c_name;
if( $c->name ) {
- # Already has a name, just quote it
- $c_name = $generator->quote($c->name);
+ # Already has a name, just use it
+ $c_name = $c->name;
} elsif ( $c->type eq FOREIGN_KEY ) {
# Doesn't have a name, and is foreign key, append '_fkey'
- $c_name = $generator->quote($c->table->name . '_' .
- ($c->fields)[0] . '_fkey');
+ $c_name = $c->table->name . '_' . ($c->fields)[0] . '_fkey';
} elsif ( $c->type eq PRIMARY_KEY ) {
# Doesn't have a name, and is primary key, append '_pkey'
- $c_name = $generator->quote($c->table->name . '_pkey');
+ $c_name = $c->table->name . '_pkey';
}
return sprintf(
'ALTER TABLE %s DROP CONSTRAINT %s',
- $generator->quote($c->table->name), $c_name
+ map { $generator->quote($_) } $c->table->name, $c_name,
);
}
my @geometry_drops = map { drop_geometry_column($_); } grep { is_geometry($_) } $table->get_fields;
- $out .= "\n".join("\n",@geometry_drops) if scalar(@geometry_drops);
+ $out .= join(";\n", '', @geometry_drops) if @geometry_drops;
return $out;
}
projects / dbsrgits/SQL-Translator.git / blobdiff