use strict;
use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = '1.60';
+$VERSION = '1.59';
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
/foreign key/i
{ $return = '' }
-primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')'
+primary_key_def : primary_key index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
{
$return = {
supertype => 'constraint',
- name => $item{'index_name(?)'}[0],
+ name => $item[2][0],
type => 'primary_key',
- fields => $item[4],
+ fields => $item[5],
+ options => $item[3][0] || $item[7][0],
};
}
-unique_key_def : UNIQUE KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')'
+unique_key_def : UNIQUE KEY(?) index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
{
$return = {
supertype => 'constraint',
- name => $item{'index_name(?)'}[0],
+ name => $item[3][0],
type => 'unique',
- fields => $item[5],
+ fields => $item[6],
+ options => $item[4][0] || $item[8][0],
}
}
-normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')'
+normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
{
$return = {
supertype => 'index',
type => 'normal',
name => $item[2][0],
fields => $item[5],
- options => $item[3][0],
- }
+ options => $item[3][0] || $item[7][0],
+ }
}
index_name_not_using : QUOTED_NAME
- | /(\b(?!using)\w+\b)/ { $return = $1 }
+ | /(\b(?!using)\w+\b)/ { $return = ($1 =~ /^using/i) ? undef : $1 }
index_type : /using (btree|hash|rtree)/i { $return = uc $1 }
sql => $result->{procedures}->{$proc_name}->{sql},
);
}
-
my @views = sort {
$result->{views}->{ $a }->{'order'}
<=>
$result->{views}->{ $b }->{'order'}
} keys %{ $result->{views} };
- for my $view_name ( keys %{ $result->{'views'} } ) {
+ for my $view_name ( @views ) {
$schema->add_view(
name => $view_name,
sql => $result->{'views'}->{$view_name}->{sql},