From: Peter Rabbitson Date: Tue, 19 Jan 2010 12:03:51 +0000 (+0000) Subject: Minor style change and white space trim X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c49ff5072c30f7667c267ae232b7d4ec57fa8933;p=dbsrgits%2FDBIx-Class-Historic.git Minor style change and white space trim --- diff --git a/lib/SQL/Translator/Parser/DBIx/Class.pm b/lib/SQL/Translator/Parser/DBIx/Class.pm index 0f8f6aa..2efc5b1 100644 --- a/lib/SQL/Translator/Parser/DBIx/Class.pm +++ b/lib/SQL/Translator/Parser/DBIx/Class.pm @@ -209,11 +209,11 @@ sub parse { if($rel_table) { # Constraints are added only if applicable next unless $fk_constraint; - + # Make sure we dont create the same foreign key constraint twice my $key_test = join("\x00", sort @keys); next if $created_FK_rels{$rel_table}->{$key_test}; - + if (scalar(@keys)) { $created_FK_rels{$rel_table}->{$key_test} = 1; @@ -238,16 +238,14 @@ sub parse { # global parser_args add_fk_index param can be overridden on the rel def my $add_fk_index_rel = (exists $rel_info->{attrs}{add_fk_index}) ? $rel_info->{attrs}{add_fk_index} : $add_fk_index; - # Make sure we don't create another index with the same - # order of columns twice - # WARNING: don't sort the key columns because the order of + # Check that we do not create an index identical to the PK index + # (some RDBMS croak on this, and it generally doesn't make much sense) + # NOTE: we do not sort the key columns because the order of # columns is important for indexes and two indexes with the # same cols but different order are allowed and sometimes # needed - my $key_idx_test = join("\x00", @keys); - my $pk_idx_test = join("\x00", @primary); - next if $key_idx_test eq $pk_idx_test; + next if join("\x00", @keys) eq join("\x00", @primary); if ($add_fk_index_rel) { my $index = $table->add_index( diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t index 5ce9fe4..628f3cf 100644 --- a/t/99dbic_sqlt_parser.t +++ b/t/99dbic_sqlt_parser.t @@ -42,7 +42,7 @@ my $idx_exceptions = { 'TwoKeys' => -1, # TwoKeys has the index turned off on the rel def }; -{ +{ my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { } } }); foreach my $source_name (@sources) { @@ -54,7 +54,7 @@ my $idx_exceptions = { my $index_count = scalar(@indices); is($index_count, $fk_count, "correct number of indices for $source_name with no args"); - + for my $index (@indices) { my $source = $schema->source($source_name); my $pk_test = join("\x00", $source->primary_columns); @@ -64,7 +64,7 @@ my $idx_exceptions = { } } -{ +{ my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { add_fk_index => 1 } } }); foreach my $source_name (@sources) { @@ -78,7 +78,7 @@ my $idx_exceptions = { } } -{ +{ my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { add_fk_index => 0 } } }); foreach my $source (@sources) { @@ -90,7 +90,7 @@ my $idx_exceptions = { } } -{ +{ { package # hide from PAUSE DBICTest::Schema::NoViewDefinition;