package SQL::Translator::Parser::PostgreSQL;
# -------------------------------------------------------------------
-# $Id: PostgreSQL.pm,v 1.23 2003-08-07 18:15:51 kycl4rk Exp $
+# $Id: PostgreSQL.pm,v 1.31 2003-08-21 18:08:04 kycl4rk Exp $
# -------------------------------------------------------------------
# Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
# Allen Day <allenday@users.sourceforge.net>,
use strict;
use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.23 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.31 $ =~ /(\d+)\.(\d+)/;
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
$GRAMMAR = q!
-{ our ( %tables, $table_order ) }
+{ my ( %tables, $table_order ) }
#
# The "eofile" rule makes the parser fail if any "statement" rule
connect : /^\s*\\\connect.*\n/
-set : /SET/ /[^;]*/ ';'
+set : /set/i /[^;]*/ ';'
revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_quotes(s /,/) ';'
{
my $i = 1;
my @constraints;
for my $definition ( @{ $item[4] } ) {
- if ( $definition->{'type'} eq 'field' ) {
+ if ( $definition->{'supertype'} eq 'field' ) {
my $field_name = $definition->{'name'};
$tables{ $table_name }{'fields'}{ $field_name } =
{ %$definition, order => $i };
$constraint;
}
}
- elsif ( $definition->{'type'} eq 'constraint' ) {
- $definition->{'type'} = $definition->{'constraint_type'};
- # group FKs at the field level
-# if ( $definition->{'type'} eq 'foreign_key' ) {
-# for my $fld ( @{ $definition->{'fields'} || [] } ) {
-# push @{
-# $tables{$table_name}{'fields'}{$fld}{'constraints'}
-# }, $definition;
-# }
-# }
-# else {
- push @{ $tables{ $table_name }{'constraints'} },
- $definition;
-# }
+ elsif ( $definition->{'supertype'} eq 'constraint' ) {
+ push @{ $tables{ $table_name }{'constraints'} }, $definition;
}
- else {
+ elsif ( $definition->{'supertype'} eq 'index' ) {
push @{ $tables{ $table_name }{'indices'} }, $definition;
}
}
1;
}
-#
-# Create index.
-#
create : /create/i unique(?) /(index|key)/i index_name /on/i table_name using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';'
{
push @{ $tables{ $item{'table_name'} }{'indices'} },
{
- name => $item{'index_name'},
- type => $item{'unique'}[0] ? 'unique' : 'normal',
- fields => $item[9],
- method => $item{'using_method'}[0],
+ name => $item{'index_name'},
+ supertype => $item{'unique'}[0] ? 'constraint' : 'index',
+ type => $item{'unique'}[0] ? 'unique' : 'normal',
+ fields => $item[9],
+ method => $item{'using_method'}[0],
}
;
}
}
elsif ( $meta->{'type'} eq 'not_null' ) {
$null = 0;
- next;
+# next;
}
elsif ( $meta->{'type'} eq 'primary_key' ) {
$is_pk = 1;
my @comments = ( @{ $item[1] }, @{ $item[5] } );
$return = {
- type => 'field',
- name => $item{'field_name'},
- data_type => $item{'data_type'}{'type'},
- size => $item{'data_type'}{'size'},
- null => $null,
- default => $default->{'value'},
- constraints => [ @constraints ],
- comments => [ @comments ],
- is_primary_key => $is_pk || 0,
+ supertype => 'field',
+ name => $item{'field_name'},
+ data_type => $item{'data_type'}{'type'},
+ size => $item{'data_type'}{'size'},
+ null => $null,
+ default => $default->{'value'},
+ constraints => [ @constraints ],
+ comments => [ @comments ],
+ is_primary_key => $is_pk || 0,
+ is_auto_increment => $item{'data_type'}{'is_auto_increment'},
}
}
| <error>
name => $item{'constraint_name'}[0] || '',
type => $type,
expression => $type eq 'check' ? $expression : '',
- deferreable => $item{'deferrable'},
+ deferrable => $item{'deferrable'},
deferred => $item{'deferred'},
reference_table => $desc->{'reference_table'},
reference_fields => $desc->{'reference_fields'},
column_constraint_type : /not null/i { $return = { type => 'not_null' } }
|
- /null/
+ /null/i
{ $return = { type => 'null' } }
|
- /unique/
+ /unique/i
{ $return = { type => 'unique' } }
|
/primary key/i
{ $return = { type => 'primary_key' } }
|
/check/i '(' /[^)]+/ ')'
- { $return = { type => 'check', expression => $item[2] } }
+ { $return = { type => 'check', expression => $item[3] } }
|
/references/i table_name parens_word_list(?) match_type(?) key_action(s?)
{
}
pg_data_type :
- /(bigint|int8|bigserial|serial8)/i
+ /(bigint|int8)/i
{
$return = {
- type => 'integer',
- size => [8],
- auto_increment => 1,
+ type => 'integer',
+ size => 20,
};
}
|
{
$return = {
type => 'integer',
- size => [2],
+ size => 5,
};
}
|
- /int(eger)?|int4/i
+ /(integer|int4?)/i # interval must come before this
{
$return = {
type => 'integer',
- size => [4],
+ size => 10,
};
}
- |
- /(double precision|float8?)/i
+ |
+ /(real|float4)/i
{
$return = {
- type => 'float',
- size => [8],
- };
+ type => 'real',
+ size => 10,
+ };
}
|
- /(real|float4)/i
+ /(double precision|float8?)/i
{
$return = {
- type => 'real',
- size => [4],
- };
+ type => 'float',
+ size => 20,
+ };
}
|
- /serial4?/i
+ /(bigserial|serial8)/i
{
$return = {
- type => 'integer',
- size => [4],
- auto_increment => 1,
+ type => 'integer',
+ size => 20,
+ is_auto_increment => 1,
};
}
|
- /bigserial/i
+ /serial4?/i
{
$return = {
- type => 'integer',
- size => [8],
- auto_increment => 1,
+ type => 'integer',
+ size => 11,
+ is_auto_increment => 1,
};
}
|
$return = { type => 'bytea' };
}
|
- /timestampz?/i
+ /(timestamptz|timestamp)/i
{
$return = { type => 'timestamp' };
}
|
- /(bit|box|cidr|circle|date|inet|interval|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|text|time|varchar)/i
+ /text/i
+ {
+ $return = {
+ type => 'text',
+ size => 64_000,
+ };
+ }
+ |
+ /(bit|box|cidr|circle|date|inet|interval|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|timetz|time|varchar)/i
{
$return = { type => $item[1] };
}
$return = {
name => $item{'constraint_name'}[0] || '',
- type => 'constraint',
- constraint_type => $type,
+ supertype => 'constraint',
+ type => $type,
fields => $type ne 'check' ? $fields : [],
expression => $type eq 'check' ? $expression : '',
- deferreable => $item{'deferrable'},
+ deferrable => $item{'deferrable'},
deferred => $item{'deferred'},
reference_table => $desc->{'reference_table'},
reference_fields => $desc->{'reference_fields'},
}
}
|
- /check/ '(' /(.+)/ ')'
+ /check/i '(' /[^)]+/ ')'
{
$return = {
type => 'check',
}
$return = {
+ supertype => 'constraint',
type => 'foreign_key',
fields => $item[3],
reference_table => $item[6],
|
/cascade/i { $return = 'cascade' }
|
- /set null/i { $return = 'set_null' }
+ /set null/i { $return = 'set null' }
|
- /set default/i { $return = 'set_default' }
+ /set default/i { $return = 'set default' }
alter : alter_table table_name /add/i table_constraint ';'
{
my $table_name = $item[2];
my $constraint = $item[4];
- $constraint->{'type'} = $constraint->{'constraint_type'};
push @{ $tables{ $table_name }{'constraints'} }, $constraint;
}
create_index : /create/i /index/i
-default_val : /default/i /(?:')?[\w\d().-]*(?:')?/
+default_val : /default/i /(\d+|'[^']*'|\w+\(.*?\))|\w+/
{
- my $val = $item[2] || '';
- $val =~ s/'//g;
+ my $val = defined $item[2] ? $item[2] : '';
+ $val =~ s/^'|'$//g;
$return = {
supertype => 'constraint',
type => 'default',
{ $item[1] }
| /'.*?'/ # XXX doesn't handle embedded quotes
{ $item[1] }
- | /NULL/
+ | /null/i
{ 'NULL' }
!;
my $tdata = $result->{ $table_name };
my $table = $schema->add_table(
name => $tdata->{'table_name'},
- ) or die $schema->error;
+ ) or die "Couldn't create table '$table_name': " . $schema->error;
my @fields = sort {
- $tdata->{'fields'}->{$a}->{'order'}
+ $tdata->{'fields'}->{ $a }->{'order'}
<=>
- $tdata->{'fields'}->{$b}->{'order'}
+ $tdata->{'fields'}->{ $b }->{'order'}
} keys %{ $tdata->{'fields'} };
for my $fname ( @fields ) {
data_type => $fdata->{'data_type'},
size => $fdata->{'size'},
default_value => $fdata->{'default'},
- is_auto_increment => $fdata->{'is_auto_inc'},
+ is_auto_increment => $fdata->{'is_auto_increment'},
is_nullable => $fdata->{'null'},
) or die $table->error;
match_type => $cdata->{'match_type'} || '',
on_delete => $cdata->{'on_delete_do'},
on_update => $cdata->{'on_update_do'},
- ) or die $table->error;
+ expression => $cdata->{'expression'},
+ ) or die "Can't add constraint of type '" .
+ $cdata->{'type'} . "' to table '" . $table->name .
+ "': " . $table->error;
}
}
=head1 AUTHORS
Ken Y. Clark E<lt>kclark@cpan.orgE<gt>,
-Allen Day <allenday@ucla.edu>.
+Allen Day E<lt>allenday@ucla.eduE<gt>.
=head1 SEE ALSO