package SQL::Translator::Parser::PostgreSQL;
# -------------------------------------------------------------------
-# $Id: PostgreSQL.pm,v 1.25 2003-08-15 16:09:45 kycl4rk Exp $
-# -------------------------------------------------------------------
-# Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
-# Allen Day <allenday@users.sourceforge.net>,
-# darren chamberlain <darren@cpan.org>,
-# Chris Mungall <cjm@fruitfly.org>
+# Copyright (C) 2002-2009 SQLFairy Authors
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
use strict;
use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.25 $ =~ /(\d+)\.(\d+)/;
+$VERSION = '1.99';
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
$GRAMMAR = q!
-{ our ( %tables, $table_order ) }
+{ my ( %tables, $table_order, $field_order, @table_comments) }
#
# The "eofile" rule makes the parser fail if any "statement" rule
startrule : statement(s) eofile { \%tables }
eofile : /^\Z/
+
statement : create
+ | comment_on_table
+ | comment_on_column
+ | comment_on_other
| comment
| alter
| grant
| connect
| update
| set
+ | select
+ | copy
+ | readin_symbol
| <error>
connect : /^\s*\\\connect.*\n/
revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_quotes(s /,/) ';'
{
- my $table_name = $item{'table_name'};
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
push @{ $tables{ $table_name }{'permissions'} }, {
type => 'revoke',
actions => $item[2],
}
}
+revoke : /revoke/i WORD(s /,/) /on/i SCHEMA(?) schema_name /from/i name_with_opt_quotes(s /,/) ';'
+ { 1 }
+
grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_name /to/i name_with_opt_quotes(s /,/) ';'
{
- my $table_name = $item{'table_name'};
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
push @{ $tables{ $table_name }{'permissions'} }, {
type => 'grant',
actions => $item[2],
}
}
+grant : /grant/i WORD(s /,/) /on/i SCHEMA(?) schema_name /to/i name_with_opt_quotes(s /,/) ';'
+ { 1 }
+
drop : /drop/i /[^;]*/ ';'
-insert : /insert/i /[^;]*/ ';'
+string :
+ /'(\\.|''|[^\\\'])*'/
+
+nonstring : /[^;\'"]+/
+
+statement_body : (string | nonstring)(s?)
-update : /update/i /[^;]*/ ';'
+insert : /insert/i statement_body ';'
+
+update : /update/i statement_body ';'
#
# Create table.
#
-create : create_table table_name '(' create_definition(s /,/) ')' table_option(s?) ';'
+create : CREATE temporary_table(?) TABLE table_name '(' create_definition(s? /,/) ')' table_option(s?) ';'
{
- my $table_name = $item{'table_name'};
- $tables{ $table_name }{'order'} = ++$table_order;
- $tables{ $table_name }{'table_name'} = $table_name;
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
+ $tables{ $table_name }{'order'} = ++$table_order;
+ $tables{ $table_name }{'schema_name'} = $schema_name;
+ $tables{ $table_name }{'table_name'} = $table_name;
+
+ $tables{ $table_name }{'temporary'} = $item[2][0];
+
+ if ( @table_comments ) {
+ $tables{ $table_name }{'comments'} = [ @table_comments ];
+ @table_comments = ();
+ }
- my $i = 1;
my @constraints;
- for my $definition ( @{ $item[4] } ) {
- if ( $definition->{'type'} eq 'field' ) {
+ for my $definition ( @{ $item[6] } ) {
+ if ( $definition->{'supertype'} eq 'field' ) {
my $field_name = $definition->{'name'};
$tables{ $table_name }{'fields'}{ $field_name } =
- { %$definition, order => $i };
- $i++;
+ { %$definition, order => $field_order++ };
for my $constraint ( @{ $definition->{'constraints'} || [] } ) {
$constraint->{'fields'} = [ $field_name ];
$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;
}
}
- for my $option ( @{ $item[6] } ) {
+ for my $option ( @{ $item[8] } ) {
$tables{ $table_name }{'table_options(s?)'}{ $option->{'type'} } =
$option;
}
1;
}
-#
-# Create index.
-#
-create : /create/i unique(?) /(index|key)/i index_name /on/i table_name using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';'
+create : CREATE unique(?) /(index|key)/i index_name /on/i table_name using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';'
{
- push @{ $tables{ $item{'table_name'} }{'indices'} },
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
+ push @{ $tables{ $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],
}
;
+
}
#
-# Create anything else (e.g., domain, function, etc.)
+# Create anything else (e.g., domain, etc.)
#
-create : /create/i WORD /[^;]+/ ';'
+create : CREATE WORD /[^;]+/ ';'
+ { @table_comments = (); }
using_method : /using/i WORD { $item[2] }
| table_constraint
| <error>
-comment : /^\s*(?:#|-{2}).*\n/
+comment : /^\s*(?:#|-{2})(.*)\n/
+ {
+ my $comment = $item[1];
+ $comment =~ s/^\s*(#|-*)\s*//;
+ $comment =~ s/\s*$//;
+ $return = $comment;
+ push @table_comments, $comment;
+ }
+
+comment_on_table : /comment/i /on/i /table/i table_name /is/i comment_phrase ';'
+ {
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
+ push @{ $tables{ $table_name }{'comments'} }, $item{'comment_phrase'};
+ }
+
+comment_on_column : /comment/i /on/i /column/i column_name /is/i comment_phrase ';'
+ {
+ my $table_name = $item[4]->{'table'};
+ my $field_name = $item[4]->{'field'};
+ if ($tables{ $table_name }{'fields'}{ $field_name } ) {
+ push @{ $tables{ $table_name }{'fields'}{ $field_name }{'comments'} },
+ $item{'comment_phrase'};
+ }
+ else {
+ die "No such column as $table_name.$field_name";
+ }
+ }
+
+comment_on_other : /comment/i /on/i /\w+/ /\w+/ /is/i comment_phrase ';'
+ {
+ push(@table_comments, $item{'comment_phrase'});
+ }
+
+# [added by cjm 20041019]
+# [TODO: other comment-on types]
+# for now we just have a general mechanism for handling other
+# kinds of comments than table/column; I'm not sure of the best
+# way to incorporate these into the datamodel
+#
+# this is the exhaustive list of types of comment:
+#COMMENT ON DATABASE my_database IS 'Development Database';
+#COMMENT ON INDEX my_index IS 'Enforces uniqueness on employee id';
+#COMMENT ON RULE my_rule IS 'Logs UPDATES of employee records';
+#COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys';
+#COMMENT ON TABLE my_table IS 'Employee Information';
+#COMMENT ON TYPE my_type IS 'Complex Number support';
+#COMMENT ON VIEW my_view IS 'View of departmental costs';
+#COMMENT ON COLUMN my_table.my_field IS 'Employee ID number';
+#COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for R.I.';
+#
+# this is tested by test 08
+
+column_name : NAME '.' NAME
+ { $return = { table => $item[1], field => $item[3] } }
-field : comment(s?) field_name data_type field_meta(s?) comment(s?)
+comment_phrase : /null/i
+ { $return = 'NULL' }
+
+comment_phrase : /'/ comment_phrase_unquoted(s) /'/
+ { my $phrase = join(' ', @{ $item[2] });
+ $return = $phrase}
+
+# [cjm TODO: double-single quotes in a comment_phrase]
+comment_phrase_unquoted : /[^\']*/
+ { $return = $item[1] }
+
+
+xxxcomment_phrase : /'.*?'|NULL/
+ {
+ my $val = $item[1] || '';
+ $val =~ s/^'|'$//g;
+ $return = $val;
+ }
+
+field : field_comment(s?) field_name data_type field_meta(s?) field_comment(s?)
{
my ( $default, @constraints, $is_pk );
- my $null = 1;
+ my $is_nullable = 1;
for my $meta ( @{ $item[4] } ) {
if ( $meta->{'type'} eq 'default' ) {
$default = $meta;
next;
}
elsif ( $meta->{'type'} eq 'not_null' ) {
- $null = 0;
-# next;
+ $is_nullable = 0;
}
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'},
+ is_nullable => $is_nullable,
+ default => $default->{'value'},
+ constraints => [ @constraints ],
+ comments => [ @comments ],
+ is_primary_key => $is_pk || 0,
+ is_auto_increment => $item{'data_type'}{'is_auto_increment'},
}
}
| <error>
+field_comment : /^\s*(?:#|-{2})(.*)\n/
+ {
+ my $comment = $item[1];
+ $comment =~ s/^\s*(#|-*)\s*//;
+ $comment =~ s/\s*$//;
+ $return = $comment;
+ }
+
field_meta : default_val
| column_constraint
reference_table => $desc->{'reference_table'},
reference_fields => $desc->{'reference_fields'},
match_type => $desc->{'match_type'},
- on_delete_do => $desc->{'on_delete_do'},
- on_update_do => $desc->{'on_update_do'},
+ on_delete => $desc->{'on_delete'} || $desc->{'on_delete_do'},
+ on_update => $desc->{'on_update'} || $desc->{'on_update_do'},
}
}
{ $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?)
{
+ my $table_info = $item{'table_name'};
+ my $schema_name = $table_info->{'schema_name'};
+ my $table_name = $table_info->{'table_name'};
my ( $on_delete, $on_update );
for my $action ( @{ $item[5] || [] } ) {
$on_delete = $action->{'action'} if $action->{'type'} eq 'delete';
$return = {
type => 'foreign_key',
- reference_table => $item[2],
+ reference_table => $table_name,
reference_fields => $item[3][0],
match_type => $item[4][0],
- on_delete_do => $on_delete,
- on_update_do => $on_update,
+ on_delete => $on_delete,
+ on_update => $on_update,
}
}
-table_name : name_with_opt_quotes
+table_name : schema_qualification(?) name_with_opt_quotes {
+ $return = { schema_name => $item[1], table_name => $item[2] }
+}
+
+ schema_qualification : name_with_opt_quotes '.'
+
+schema_name : name_with_opt_quotes
field_name : name_with_opt_quotes
#
# We can deduce some sizes from the data type's name.
#
- $data_type->{'size'} ||= $item[2][0];
+ if ( my $size = $item[2][0] ) {
+ $data_type->{'size'} = $size;
+ }
$return = $data_type;
}
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
+ /interval/i
+ {
+ $return = { type => 'interval' };
+ }
+ |
+ /(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)(?:\(\d\))?( with(out)? time zone)?/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|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|timetz|time|varchar)/i
{
$return = { type => $item[1] };
}
parens_value_list : '(' VALUE(s /,/) ')'
{ $item[2] }
-parens_word_list : '(' WORD(s /,/) ')'
+
+parens_word_list : '(' name_with_opt_quotes(s /,/) ')'
{ $item[2] }
field_size : '(' num_range ')' { $item{'num_range'} }
$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 : '',
deferrable => $item{'deferrable'},
reference_table => $desc->{'reference_table'},
reference_fields => $desc->{'reference_fields'},
match_type => $desc->{'match_type'}[0],
- on_delete_do => $desc->{'on_delete_do'},
- on_update_do => $desc->{'on_update_do'},
+ on_delete => $desc->{'on_delete'} || $desc->{'on_delete_do'},
+ on_update => $desc->{'on_update'} || $desc->{'on_update_do'},
comments => [ @comments ],
}
}
}
}
|
- /check/i '(' /(.+)/ ')'
+ /check/i '(' /[^)]+/ ')'
{
$return = {
type => 'check',
}
$return = {
+ supertype => 'constraint',
type => 'foreign_key',
fields => $item[3],
- reference_table => $item[6],
+ reference_table => $item[6]->{'table_name'},
reference_fields => $item[7][0],
match_type => $item[8][0],
- on_delete_do => $on_delete || '',
- on_update_do => $on_update || '',
+ on_delete => $on_delete || '',
+ on_update => $on_update || '',
}
}
-deferrable : /not/i /deferrable/i
+deferrable : not(?) /deferrable/i
{
$return = ( $item[1] =~ /not/i ) ? 0 : 1;
}
key_delete : /on delete/i key_mutation
{
- $return => {
+ $return = {
type => 'delete',
action => $item[2],
};
key_update : /on update/i key_mutation
{
- $return => {
+ $return = {
type => 'update',
action => $item[2],
};
|
/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_column field ';'
+ {
+ my $field_def = $item[4];
+ $tables{ $item[2]->{'table_name'} }{'fields'}{ $field_def->{'name'} } = {
+ %$field_def, order => $field_order++
+ };
+ 1;
+ }
-alter : alter_table table_name /add/i table_constraint ';'
+alter : alter_table table_name ADD table_constraint ';'
{
- my $table_name = $item[2];
+ my $table_name = $item[2]->{'table_name'};
my $constraint = $item[4];
- $constraint->{'type'} = $constraint->{'constraint_type'};
push @{ $tables{ $table_name }{'constraints'} }, $constraint;
+ 1;
+ }
+
+alter : alter_table table_name drop_column NAME restrict_or_cascade(?) ';'
+ {
+ $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'drop'} = 1;
+ 1;
+ }
+
+alter : alter_table table_name alter_column NAME alter_default_val ';'
+ {
+ $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'default'} =
+ $item[5]->{'value'};
+ 1;
}
-alter_table : /alter/i /table/i only(?)
+#
+# These will just parse for now but won't affect the structure. - ky
+#
+alter : alter_table table_name /rename/i /to/i NAME ';'
+ { 1 }
+
+alter : alter_table table_name alter_column NAME SET /statistics/i INTEGER ';'
+ { 1 }
+
+alter : alter_table table_name alter_column NAME SET /storage/i storage_type ';'
+ { 1 }
+
+alter : alter_table table_name rename_column NAME /to/i NAME ';'
+ { 1 }
+
+alter : alter_table table_name DROP /constraint/i NAME restrict_or_cascade ';'
+ { 1 }
+
+alter : alter_table table_name /owner/i /to/i NAME ';'
+ { 1 }
+
+alter : alter_sequence NAME /owned/i /by/i column_name ';'
+ { 1 }
+
+storage_type : /(plain|external|extended|main)/i
-only : /only/i
+temporary: /temp(orary)?\\b/i
-create_table : /create/i TABLE
+temporary_table: temporary
+ {
+ 1;
+ }
-create_index : /create/i /index/i
+alter_default_val : SET default_val
+ {
+ $return = { value => $item[2]->{'value'} }
+ }
+ | DROP DEFAULT
+ {
+ $return = { value => undef }
+ }
-default_val : /default/i /(\d+|'[^']*'|\w+\(.*?\))/
+#
+# This is a little tricky to get right, at least WRT to making the
+# tests pass. The problem is that the constraints are stored just as
+# a list (no name access), and the tests expect the constraints in a
+# particular order. I'm going to leave the rule but disable the code
+# for now. - ky
+#
+alter : alter_table table_name alter_column NAME alter_nullable ';'
+ {
+# my $table_name = $item[2]->{'table_name'};
+# my $field_name = $item[4];
+# my $is_nullable = $item[5]->{'is_nullable'};
+#
+# $tables{ $table_name }{'fields'}{ $field_name }{'is_nullable'} =
+# $is_nullable;
+#
+# if ( $is_nullable ) {
+# 1;
+# push @{ $tables{ $table_name }{'constraints'} }, {
+# type => 'not_null',
+# fields => [ $field_name ],
+# };
+# }
+# else {
+# for my $i (
+# 0 .. $#{ $tables{ $table_name }{'constraints'} || [] }
+# ) {
+# my $c = $tables{ $table_name }{'constraints'}[ $i ] or next;
+# my $fields = join( '', @{ $c->{'fields'} || [] } ) or next;
+# if ( $c->{'type'} eq 'not_null' && $fields eq $field_name ) {
+# delete $tables{ $table_name }{'constraints'}[ $i ];
+# last;
+# }
+# }
+# }
+
+ 1;
+ }
+
+alter_nullable : SET not_null
+ {
+ $return = { is_nullable => 0 }
+ }
+ | DROP not_null
+ {
+ $return = { is_nullable => 1 }
+ }
+
+not_null : /not/i /null/i
+
+not : /not/i
+
+add_column : ADD COLUMN(?)
+
+alter_table : ALTER TABLE ONLY(?)
+
+alter_sequence : ALTER SEQUENCE
+
+drop_column : DROP COLUMN(?)
+
+alter_column : ALTER COLUMN(?)
+
+rename_column : /rename/i COLUMN(?)
+
+restrict_or_cascade : /restrict/i |
+ /cascade/i
+
+# Handle functions that can be called
+select : SELECT select_function ';'
+ { 1 }
+
+# Read the setval function but don't do anything with it because this parser
+# isn't handling sequences
+select_function : schema_qualification(?) /setval/i '(' VALUE /,/ VALUE /,/ /(true|false)/i ')'
+ { 1 }
+
+# Skipping all COPY commands
+copy : COPY WORD /[^;]+/ ';' { 1 }
+ { 1 }
+
+# The "\." allows reading in from STDIN but this isn't needed for schema
+# creation, so it is skipped.
+readin_symbol : '\.'
+ {1}
+
+#
+# End basically useless stuff. - ky
+#
+
+create_table : CREATE TABLE
+
+create_index : CREATE /index/i
+
+default_val : DEFAULT /(\d+|'[^']*'|\w+\(.*\))|\w+/
{
my $val = defined $item[2] ? $item[2] : '';
$val =~ s/^'|'$//g;
$return = { type => $item[1] =~ /out/i ? 'without_oids' : 'with_oids' }
}
+ADD : /add/i
+
+ALTER : /alter/i
+
+CREATE : /create/i
+
+ONLY : /only/i
+
+DEFAULT : /default/i
+
+DROP : /drop/i
+
+COLUMN : /column/i
+
TABLE : /table/i
+SCHEMA : /schema/i
+
SEMICOLON : /\s*;\n?/
+SEQUENCE : /sequence/i
+
+SELECT : /select/i
+
+COPY : /copy/i
+
+INTEGER : /\d+/
+
WORD : /\w+/
DIGITS : /\d+/
COMMA : ','
+SET : /set/i
+
NAME : "`" /\w+/ "`"
{ $item[2] }
| /\w+/
my $schema = $translator->schema;
my @tables = sort {
- $result->{ $a }->{'order'} <=> $result->{ $b }->{'order'}
+ ( $result->{ $a }{'order'} || 0 ) <=> ( $result->{ $b }{'order'} || 0 )
} keys %{ $result };
for my $table_name ( @tables ) {
my $tdata = $result->{ $table_name };
my $table = $schema->add_table(
- name => $tdata->{'table_name'},
- ) or die $schema->error;
+ #schema => $tdata->{'schema_name'},
+ name => $tdata->{'table_name'},
+ ) or die "Couldn't create table '$table_name': " . $schema->error;
+
+ $table->extra(temporary => 1) if $tdata->{'temporary'};
+
+ $table->comments( $tdata->{'comments'} );
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 ) {
my $fdata = $tdata->{'fields'}{ $fname };
+ next if $fdata->{'drop'};
my $field = $table->add_field(
name => $fdata->{'name'},
data_type => $fdata->{'data_type'},
size => $fdata->{'size'},
default_value => $fdata->{'default'},
- is_auto_increment => $fdata->{'is_auto_inc'},
- is_nullable => $fdata->{'null'},
+ is_auto_increment => $fdata->{'is_auto_increment'},
+ is_nullable => $fdata->{'is_nullable'},
+ comments => $fdata->{'comments'},
) or die $table->error;
$table->primary_key( $field->name ) if $fdata->{'is_primary_key'};
name => $idata->{'name'},
type => uc $idata->{'type'},
fields => $idata->{'fields'},
- ) or die $table->error;
+ ) or die $table->error . ' ' . $table->name;
}
for my $cdata ( @{ $tdata->{'constraints'} || [] } ) {
reference_table => $cdata->{'reference_table'},
reference_fields => $cdata->{'reference_fields'},
match_type => $cdata->{'match_type'} || '',
- on_delete => $cdata->{'on_delete_do'},
- on_update => $cdata->{'on_update_do'},
- ) or die $table->error;
+ on_delete => $cdata->{'on_delete'} || $cdata->{'on_delete_do'},
+ on_update => $cdata->{'on_update'} || $cdata->{'on_update_do'},
+ 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