package SQL::Translator::Parser::PostgreSQL;
# -------------------------------------------------------------------
-# $Id: PostgreSQL.pm,v 1.22 2003-08-04 15:16:13 kycl4rk Exp $
+# $Id: PostgreSQL.pm,v 1.27 2003-08-17 00:46:23 rossta 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.22 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.27 $ =~ /(\d+)\.(\d+)/;
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
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 /,/) ';'
{
push @{ $tables{ $table_name }{'permissions'} }, {
type => 'revoke',
actions => $item[2],
- users => $item[6],
+ users => $item[7],
}
}
push @{ $tables{ $table_name }{'permissions'} }, {
type => 'grant',
actions => $item[2],
- users => $item[6],
+ users => $item[7],
}
}
}
elsif ( $meta->{'type'} eq 'not_null' ) {
$null = 0;
- next;
+# next;
}
elsif ( $meta->{'type'} eq 'primary_key' ) {
$is_pk = 1;
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
}
pg_data_type :
- /(bigint|int8|bigserial|serial8)/i
+ /(bigint|int8)/i
{
$return = {
- type => 'integer',
- size => [8],
- auto_increment => 1,
+ type => 'integer',
+ size => [8],
};
}
|
};
}
|
- /int(eger)?|int4/i
+ /(integer|int4?)/i # interval must come before this
{
$return = {
type => 'integer',
size => [4],
};
}
+ |
+ /(real|float4)/i
+ {
+ $return = {
+ type => 'real',
+ size => [4],
+ };
+ }
|
/(double precision|float8?)/i
{
};
}
|
- /(real|float4)/i
+ /(bigserial|serial8)/i
{
- $return = {
- type => 'real',
- size => [4],
+ $return = {
+ type => 'integer',
+ size => [8],
+ auto_increment => 1,
};
}
|
};
}
|
- /bigserial/i
- {
- $return = {
- type => 'integer',
- size => [8],
- auto_increment => 1,
- };
- }
- |
/(bit varying|varbit)/i
{
$return = { type => 'varbit' };
$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
+ /(bit|box|cidr|circle|date|inet|interval|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|text|timetz|time|varchar)/i
{
$return = { type => $item[1] };
}
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',
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'}