Skip to content
Snippets Groups Projects
Commit f70787c0 authored by Andy Yates's avatar Andy Yates
Browse files

Making attribute adaptor skip anything that was a false attribute

parent c2d9dfd9
No related branches found
No related tags found
No related merge requests found
...@@ -165,7 +165,7 @@ sub store_on_ { ...@@ -165,7 +165,7 @@ sub store_on_ {
"argument expected."); "argument expected.");
} }
next if ($attrib->value eq '0'); next if ! $attrib->value;
my $atid = $self->_store_type( $attrib ); my $atid = $self->_store_type( $attrib );
if ((defined $attrib->code) and ($attrib->code eq 'circular_seq')) { if ((defined $attrib->code) and ($attrib->code eq 'circular_seq')) {
......
...@@ -2,10 +2,7 @@ use strict; ...@@ -2,10 +2,7 @@ use strict;
use Bio::EnsEMBL::Test::TestUtils; use Bio::EnsEMBL::Test::TestUtils;
BEGIN { $| = 1; use Test::More;
use Test;
plan tests => 26;
}
use Bio::EnsEMBL::Test::MultiTestDB; use Bio::EnsEMBL::Test::MultiTestDB;
use Bio::EnsEMBL::Attribute; use Bio::EnsEMBL::Attribute;
...@@ -213,7 +210,7 @@ $count = $db->dbc->db_handle->selectall_arrayref ...@@ -213,7 +210,7 @@ $count = $db->dbc->db_handle->selectall_arrayref
ok($count == 1); ok($count == 1);
@attribs = @{$aa->fetch_all_by_Slice($slice)}; @attribs = @{$aa->fetch_all_by_Slice($slice)};
print "attribs: " . scalar(@attribs) . "\n"; note "attribs: " . scalar(@attribs);
ok(@attribs == 1); ok(@attribs == 1);
...@@ -227,5 +224,20 @@ $count = $db->dbc->db_handle->selectall_arrayref ...@@ -227,5 +224,20 @@ $count = $db->dbc->db_handle->selectall_arrayref
ok($count == 0); ok($count == 0);
#
# test the skipping of empty attrib values
#
{
my %args = (-NAME => 'test_name2', -CODE => 'test_code2', -DESCRIPTION => 'test_desc2');
my $current_rows = count_rows($db, 'seq_region_attrib');
my $atrib = Bio::EnsEMBL::Attribute->new(%args,);
$aa->store_on_Slice($slice, [Bio::EnsEMBL::Attribute->new(%args, -VALUE => q{})]);
$aa->store_on_Slice($slice, [Bio::EnsEMBL::Attribute->new(%args, -VALUE => 0)]);
# $aa->store_on_Slice($slice, [Bio::EnsEMBL::Attribute->new(%args, -VALUE => undef)]);
my $new_rows = count_rows($db, 'seq_region_attrib');
is($new_rows, $current_rows, 'Asserting the storage of undefined attributes will result in no values stored');
}
$multi->restore('core', 'misc_attrib', 'seq_region_attrib', 'attrib_type'); $multi->restore('core', 'misc_attrib', 'seq_region_attrib', 'attrib_type');
done_testing();
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment