X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=c80c52c6d770586a682e0996862436ad16cc7c09;hb=refs%2Ftags%2F0.07036_01;hp=74bef9db927ac4aa250fe86e69b11f3b63611895;hpb=e8c7b904425c1f61a1d48ff2a294b9faf7d12b8f;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index 74bef9d..c80c52c 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -55,7 +55,7 @@ sub new { # DB2 and Firebird don't support 'field type NULL' $self->{null} = 'NULL' unless defined $self->{null}; - + $self->{verbose} = $ENV{TEST_VERBOSE} || 0; # Optional extra tables and tests @@ -105,7 +105,7 @@ sub run_tests { push @connect_info, [ @{$info}{qw/dsn user password connect_info_opts/ } ]; } } - + if ($ENV{SCHEMA_LOADER_TESTS_EXTRA_ONLY}) { $self->run_only_extra_tests(\@connect_info); return; @@ -113,13 +113,13 @@ sub run_tests { my $extra_count = $self->{extra}{count} || 0; - my $col_accessor_map_tests = 5; + my $col_accessor_map_tests = 6; my $num_rescans = 6; $num_rescans++ if $self->{vendor} eq 'mssql'; $num_rescans++ if $self->{vendor} eq 'Firebird'; plan tests => @connect_info * - (221 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0)); + (223 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0)); foreach my $info_idx (0..$#connect_info) { my $info = $connect_info[$info_idx]; @@ -169,7 +169,7 @@ sub run_only_extra_tests { my $file_count = grep $_ =~ SOURCE_DDL, @{ $self->{extra}{create} || [] }; $file_count++; # schema - + if (not ($self->{vendor} eq 'mssql' && $dbh->{Driver}{Name} eq 'Sybase')) { $file_count++ for @{ $self->{data_type_tests}{table_names} || [] }; } @@ -212,7 +212,7 @@ my (@statements, @statements_reltests, @statements_advanced, sub CONSTRAINT { my $self = shift; -return qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i; +return qr/^(?:(?:$self->{vendor}|extra)[_-]?)?loader[_-]?test[0-9]+(?!.*_)/i; } sub setup_schema { @@ -254,6 +254,7 @@ sub setup_schema { ) : (), col_collision_map => { '^(can)\z' => 'caught_collision_%s' }, rel_collision_map => { '^(set_primary_key)\z' => 'caught_rel_collision_%s' }, + relationship_attrs => { many_to_many => { order_by => 'me.id' } }, col_accessor_map => \&test_col_accessor_map, result_components_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' }, uniq_to_primary => 1, @@ -271,11 +272,11 @@ sub setup_schema { eval qq{ package @{[SCHEMA_CLASS]}; use base qw/DBIx::Class::Schema::Loader/; - + __PACKAGE__->loader_options(\%loader_opts); __PACKAGE__->connection(\@\$connect_info); }; - + ok(!$@, "Loader initialization") or diag $@; find sub { return if -d; $file_count++ }, DUMP_DIR; @@ -291,25 +292,25 @@ sub setup_schema { $expected_count += grep $_ =~ SOURCE_DDL, @{ $self->{extra}{create} || [] }; - - $expected_count -= grep /CREATE TABLE/, @statements_inline_rels + + $expected_count -= grep /CREATE TABLE/i, @statements_inline_rels if $self->{skip_rels} || $self->{no_inline_rels}; - - $expected_count -= grep /CREATE TABLE/, @statements_implicit_rels + + $expected_count -= grep /CREATE TABLE/i, @statements_implicit_rels if $self->{skip_rels} || $self->{no_implicit_rels}; - - $expected_count -= grep /CREATE TABLE/, ($self->{vendor} =~ /sqlite/ ? @statements_advanced_sqlite : @statements_advanced), @statements_reltests + + $expected_count -= grep /CREATE TABLE/i, ($self->{vendor} =~ /sqlite/ ? @statements_advanced_sqlite : @statements_advanced), @statements_reltests if $self->{skip_rels}; } - + is $file_count, $expected_count, 'correct number of files generated'; - + my $warn_count = 2; - + $warn_count++ for grep /^Bad table or view/, @loader_warnings; - + $warn_count++ for grep /renaming \S+ relation/, @loader_warnings; - + $warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings; $warn_count++ for grep /^Column '\w+' in table '\w+' collides with an inherited method\./, @loader_warnings; @@ -570,11 +571,11 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent ok(!$@, "Inserting new record using a PK::Auto key didn't die") or diag $@; ok($saved_id, "Got PK::Auto-generated id"); - my $new_obj1 = $rsobj1->search({ dat => 'newthing' })->first; + my $new_obj1 = $rsobj1->search({ dat => 'newthing' })->single; ok($new_obj1, "Found newly inserted PK::Auto record"); is($new_obj1->id, $saved_id, "Correct PK::Auto-generated id"); - my ($obj2) = $rsobj2->search({ dat => 'bbb' })->first; + my ($obj2) = $rsobj2->search({ dat => 'bbb' })->single; is( $obj2->id, 2 ); SKIP: { @@ -721,7 +722,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent my $moniker36 = $monikers->{loader_test36}; my $class36 = $classes->{loader_test36}; my $rsobj36 = $conn->resultset($moniker36); - + isa_ok( $rsobj3, "DBIx::Class::ResultSet" ); isa_ok( $rsobj4, "DBIx::Class::ResultSet" ); isa_ok( $rsobj5, "DBIx::Class::ResultSet" ); @@ -748,7 +749,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent isa_ok( $rsobj36, "DBIx::Class::ResultSet" ); # basic rel test - my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->first; + my $obj4 = try { $rsobj4->find(123) } || $rsobj4->search({ id => 123 })->single; isa_ok( try { $obj4->fkid_singular }, $class3); # test renaming rel that conflicts with a class method @@ -762,9 +763,9 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent ok($class4->column_info('fkid')->{is_foreign_key}, 'Foreign key detected'); - my $obj3 = try { $rsobj3->find(1) } || $rsobj3->search({ id => 1 })->first; + my $obj3 = try { $rsobj3->find(1) } || $rsobj3->search({ id => 1 })->single; my $rs_rel4 = try { $obj3->search_related('loader_test4zes') }; - isa_ok( try { $rs_rel4->first }, $class4); + isa_ok( try { $rs_rel4->single }, $class4); # check rel naming with prepositions ok ($rsobj4->result_source->has_relationship('loader_test5s_to'), @@ -789,14 +790,28 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent ok ((not try { exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{is_deferrable} }), 'has_many does not have is_deferrable'); - is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} }, 'CASCADE', - "on_delete => 'CASCADE' on belongs_to by default"; + my $default_on_clause = $self->{default_on_clause} || 'CASCADE'; + + my $default_on_delete_clause = $self->{default_on_delete_clause} || $default_on_clause; - is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} }, 'CASCADE', - "on_update => 'CASCADE' on belongs_to by default"; + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete} }, + $default_on_delete_clause, + "on_delete is $default_on_delete_clause on belongs_to by default"; - is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} }, 1, - "is_deferrable => 1 on belongs_to by default"; + my $default_on_update_clause = $self->{default_on_update_clause} || $default_on_clause; + + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update} }, + $default_on_update_clause, + "on_update is $default_on_update_clause on belongs_to by default"; + + my $default_is_deferrable = $self->{default_is_deferrable}; + + $default_is_deferrable = 1 + if not defined $default_is_deferrable; + + is try { $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable} }, + $default_is_deferrable, + "is_deferrable => $default_is_deferrable on belongs_to by default"; ok ((not try { exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete} }), 'belongs_to does not have cascade_delete'); @@ -830,7 +845,7 @@ qr/\n__PACKAGE__->load_components\("TestSchemaComponent", "\+TestSchemaComponent } # mulit-col fk def - my $obj6 = try { $rsobj6->find(1) } || $rsobj6->search({ id => 1 })->first; + my $obj6 = try { $rsobj6->find(1) } || $rsobj6->search({ id => 1 })->single; isa_ok( try { $obj6->loader_test2 }, $class2); isa_ok( try { $obj6->loader_test5 }, $class5); @@ -875,13 +890,13 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( 'ambiguous relationship named correctly'); # fk that references a non-pk key (UNIQUE) - my $obj8 = try { $rsobj8->find(1) } || $rsobj8->search({ id => 1 })->first; + my $obj8 = try { $rsobj8->find(1) } || $rsobj8->search({ id => 1 })->single; isa_ok( try { $obj8->loader_test7 }, $class7); ok($class8->column_info('loader_test7')->{is_foreign_key}, 'Foreign key detected'); # test double-fk 17 ->-> 16 - my $obj17 = try { $rsobj17->find(33) } || $rsobj17->search({ id => 33 })->first; + my $obj17 = try { $rsobj17->find(33) } || $rsobj17->search({ id => 33 })->single; my $rs_rel16_one = try { $obj17->loader16_one }; isa_ok($rs_rel16_one, $class16); @@ -895,15 +910,15 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( ok($class17->column_info('loader16_two')->{is_foreign_key}, 'Foreign key detected'); - my $obj16 = try { $rsobj16->find(2) } || $rsobj16->search({ id => 2 })->first; + my $obj16 = try { $rsobj16->find(2) } || $rsobj16->search({ id => 2 })->single; my $rs_rel17 = try { $obj16->search_related('loader_test17_loader16_ones') }; - isa_ok(try { $rs_rel17->first }, $class17); - is(try { $rs_rel17->first->id }, 3, "search_related with multiple FKs from same table"); - + isa_ok(try { $rs_rel17->single }, $class17); + is(try { $rs_rel17->single->id }, 3, "search_related with multiple FKs from same table"); + # XXX test m:m 18 <- 20 -> 19 ok($class20->column_info('parent')->{is_foreign_key}, 'Foreign key detected'); ok($class20->column_info('child')->{is_foreign_key}, 'Foreign key detected'); - + # XXX test double-fk m:m 21 <- 22 -> 21 ok($class22->column_info('parent')->{is_foreign_key}, 'Foreign key detected'); ok($class22->column_info('child')->{is_foreign_key}, 'Foreign key detected'); @@ -913,16 +928,18 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( ok($m2m = (try { $class18->_m2m_metadata->{children} }), 'many_to_many created'); - is $m2m->{relation}, 'loader_test20s', 'm2m near rel'; + is $m2m->{relation}, 'loader_test20s', 'm2m near has_many rel'; is $m2m->{foreign_relation}, 'child', 'm2m far rel'; + is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs'; ok($m2m = (try { $class19->_m2m_metadata->{parents} }), 'many_to_many created'); - is $m2m->{relation}, 'loader_test20s', 'm2m near rel'; + is $m2m->{relation}, 'loader_test20', 'm2m near might_have rel'; is $m2m->{foreign_relation}, 'parent', 'm2m far rel'; + is $m2m->{attrs}->{order_by}, 'me.id', 'm2m bridge attrs'; # test double multi-col fk 26 -> 25 - my $obj26 = try { $rsobj26->find(33) } || $rsobj26->search({ id => 33 })->first; + my $obj26 = try { $rsobj26->find(33) } || $rsobj26->search({ id => 33 })->single; my $rs_rel25_one = try { $obj26->loader_test25_id_rel1 }; isa_ok($rs_rel25_one, $class25); @@ -936,13 +953,13 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( isa_ok($rs_rel25_two, $class25); is(try { $rs_rel25_two->dat }, 'y25', "Multiple multi-col FKs to same table"); - my $obj25 = try { $rsobj25->find(3,42) } || $rsobj25->search({ id1 => 3, id2 => 42 })->first; + my $obj25 = try { $rsobj25->find(3,42) } || $rsobj25->search({ id1 => 3, id2 => 42 })->single; my $rs_rel26 = try { $obj25->search_related('loader_test26_id_rel1s') }; - isa_ok(try { $rs_rel26->first }, $class26); - is(try { $rs_rel26->first->id }, 3, "search_related with multiple multi-col FKs from same table"); + isa_ok(try { $rs_rel26->single }, $class26); + is(try { $rs_rel26->single->id }, 3, "search_related with multiple multi-col FKs from same table"); # test one-to-one rels - my $obj27 = try { $rsobj27->find(1) } || $rsobj27->search({ id => 1 })->first; + my $obj27 = try { $rsobj27->find(1) } || $rsobj27->search({ id => 1 })->single; my $obj28 = try { $obj27->loader_test28 }; isa_ok($obj28, $class28); is(try { $obj28->get_column('id') }, 1, "One-to-one relationship with PRIMARY FK"); @@ -955,7 +972,7 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( ok($class29->column_info('fk')->{is_foreign_key}, 'Foreign key detected'); - $obj27 = try { $rsobj27->find(2) } || $rsobj27->search({ id => 2 })->first; + $obj27 = try { $rsobj27->find(2) } || $rsobj27->search({ id => 2 })->single; is(try { $obj27->loader_test28 }, undef, "Undef for missing one-to-one row"); is(try { $obj27->loader_test29 }, undef, "Undef for missing one-to-one row"); @@ -965,14 +982,14 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( ok($class32->column_info('rel1')->{is_foreign_key}, 'Foreign key detected'); ok($class32->column_info('rel2')->{is_foreign_key}, 'Foreign key detected'); - + my $obj32 = try { $rsobj32->find(1, { prefetch => [qw/rel1 rel2/] }) } - || try { $rsobj32->search({ id => 1 }, { prefetch => [qw/rel1 rel2/] })->first } - || $rsobj32->search({ id => 1 })->first; + || try { $rsobj32->search({ id => 1 }, { prefetch => [qw/rel1 rel2/] })->single } + || $rsobj32->search({ id => 1 })->single; my $obj34 = eval { $rsobj34->find(1, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] }) } - || eval { $rsobj34->search({ id => 1 }, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] })->first } - || $rsobj34->search({ id => 1 })->first; + || eval { $rsobj34->search({ id => 1 }, { prefetch => [qw/loader_test33_id_rel1 loader_test33_id_rel2/] })->single } + || $rsobj34->search({ id => 1 })->single; diag $@ if $@; isa_ok($obj32,$class32); @@ -1026,11 +1043,11 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( SKIP: { skip 'Previous eval block failed', 3 if $@; - + my $results = $rsobj10->search({ subject => 'xyzzy' }); is( $results->count(), 1, 'No duplicate row created' ); - my $obj10_3 = $results->first(); + my $obj10_3 = $results->single(); isa_ok( $obj10_3, $class10 ); is( $obj10_3->loader_test11()->id(), $obj11->id(), 'Circular rel leads back to same row' ); @@ -1048,19 +1065,19 @@ qr/\n__PACKAGE__->(?:belongs_to|has_many|might_have|has_one|many_to_many)\( my $class13 = $classes->{loader_test13}; my $rsobj13 = $conn->resultset($moniker13); - isa_ok( $rsobj12, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj12, "DBIx::Class::ResultSet" ); isa_ok( $rsobj13, "DBIx::Class::ResultSet" ); ok($class13->column_info('id')->{is_foreign_key}, 'Foreign key detected'); ok($class13->column_info('loader_test12')->{is_foreign_key}, 'Foreign key detected'); ok($class13->column_info('dat')->{is_foreign_key}, 'Foreign key detected'); - my $obj13 = try { $rsobj13->find(1) } || $rsobj13->search({ id => 1 })->first; + my $obj13 = try { $rsobj13->find(1) } || $rsobj13->search({ id => 1 })->single; isa_ok( $obj13->id, $class12 ); isa_ok( $obj13->loader_test12, $class12); isa_ok( $obj13->dat, $class12); - my $obj12 = try { $rsobj12->find(1) } || $rsobj12->search({ id => 1 })->first; + my $obj12 = try { $rsobj12->find(1) } || $rsobj12->search({ id => 1 })->single; isa_ok( try { $obj12->loader_test13 }, $class13 ); } @@ -1104,12 +1121,12 @@ EOF my $class15 = $classes->{loader_test15}; my $rsobj15 = $conn->resultset($moniker15); - isa_ok( $rsobj14, "DBIx::Class::ResultSet" ); + isa_ok( $rsobj14, "DBIx::Class::ResultSet" ); isa_ok( $rsobj15, "DBIx::Class::ResultSet" ); ok($class15->column_info('loader_test14')->{is_foreign_key}, 'Foreign key detected'); - my $obj15 = try { $rsobj15->find(1) } || $rsobj15->search({ id => 1 })->first; + my $obj15 = try { $rsobj15->find(1) } || $rsobj15->search({ id => 1 })->single; isa_ok( $obj15->loader_test14, $class14 ); } } @@ -1194,7 +1211,7 @@ EOF SKIP: { skip 'no rels', 2 if $self->{skip_rels}; - my $obj30 = try { $rsobj30->find(123) } || $rsobj30->search({ id => 123 })->first; + my $obj30 = try { $rsobj30->find(123) } || $rsobj30->search({ id => 123 })->single; isa_ok( $obj30->loader_test2, $class2); ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key}, @@ -1447,12 +1464,12 @@ sub create { $make_auto_inc->(qw/loader_test1s id/), q{ INSERT INTO loader_test1s (dat) VALUES('foo') }, - q{ INSERT INTO loader_test1s (dat) VALUES('bar') }, - q{ INSERT INTO loader_test1s (dat) VALUES('baz') }, + q{ INSERT INTO loader_test1s (dat) VALUES('bar') }, + q{ INSERT INTO loader_test1s (dat) VALUES('baz') }, # also test method collision # crumb_crisp_coating is for col_accessor_map tests - qq{ + qq{ CREATE TABLE loader_test2 ( id $self->{auto_inc_pk}, dat VARCHAR(32) NOT NULL, @@ -1471,10 +1488,10 @@ sub create { }, $make_auto_inc->(qw/loader_test2 id/), - q{ INSERT INTO loader_test2 (dat, dat2) VALUES('aaa', 'zzz') }, - q{ INSERT INTO loader_test2 (dat, dat2) VALUES('bbb', 'yyy') }, - q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ccc', 'xxx') }, - q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') }, + q{ INSERT INTO loader_test2 (dat, dat2) VALUES('aaa', 'zzz') }, + q{ INSERT INTO loader_test2 (dat, dat2) VALUES('bbb', 'yyy') }, + q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ccc', 'xxx') }, + q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') }, qq{ CREATE TABLE LOADER_test23 ( @@ -1549,10 +1566,10 @@ sub create { ) $self->{innodb} }, - q{ INSERT INTO loader_test3 (id,dat) VALUES(1,'aaa') }, - q{ INSERT INTO loader_test3 (id,dat) VALUES(2,'bbb') }, - q{ INSERT INTO loader_test3 (id,dat) VALUES(3,'ccc') }, - q{ INSERT INTO loader_test3 (id,dat) VALUES(4,'ddd') }, + q{ INSERT INTO loader_test3 (id,dat) VALUES(1,'aaa') }, + q{ INSERT INTO loader_test3 (id,dat) VALUES(2,'bbb') }, + q{ INSERT INTO loader_test3 (id,dat) VALUES(3,'ccc') }, + q{ INSERT INTO loader_test3 (id,dat) VALUES(4,'ddd') }, qq{ CREATE TABLE loader_test4 ( @@ -1568,7 +1585,7 @@ sub create { }, q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(123,1,'aaa',1,1) }, - q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(124,2,'bbb',2,2) }, + q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(124,2,'bbb',2,2) }, q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(125,3,'ccc',3,3) }, q{ INSERT INTO loader_test4 (id,fkid,dat,belongs_to,set_primary_key) VALUES(126,4,'ddd',4,4) }, @@ -1709,7 +1726,7 @@ sub create { qq{ CREATE TABLE loader_test20 ( parent INTEGER NOT NULL, - child INTEGER NOT NULL, + child INTEGER NOT NULL UNIQUE, PRIMARY KEY (parent, child), FOREIGN KEY (parent) REFERENCES loader_test18 (id), FOREIGN KEY (child) REFERENCES loader_test19 (id) @@ -1926,7 +1943,7 @@ sub create { dat VARCHAR(8) ) $self->{innodb} }, - + q{ INSERT INTO loader_test14 (id,dat) VALUES (123,'aaa') }, qq{ @@ -2003,7 +2020,7 @@ sub drop_tables { loader_test36 loader_test50 /; - + my @tables_auto_inc = ( [ qw/loader_test1s id/ ], [ qw/loader_test2 id/ ], @@ -2039,7 +2056,7 @@ sub drop_tables { loader_test11 loader_test10 /; - + my @tables_advanced_auto_inc = ( [ qw/loader_test10 id10/ ], [ qw/loader_test11 id11/ ], @@ -2095,11 +2112,11 @@ sub drop_tables { foreach my $table (keys %drop_constraints) { # for MSSQL - $dbh->do("ALTER TABLE $table DROP $drop_constraints{$table}"); + $dbh->do("ALTER TABLE $table DROP $drop_constraints{$table}"); # for Sybase and Access - $dbh->do("ALTER TABLE $table DROP CONSTRAINT $drop_constraints{$table}"); + $dbh->do("ALTER TABLE $table DROP CONSTRAINT $drop_constraints{$table}"); # for MySQL - $dbh->do("ALTER TABLE $table DROP FOREIGN KEY $drop_constraints{$table}"); + $dbh->do("ALTER TABLE $table DROP FOREIGN KEY $drop_constraints{$table}"); } $self->drop_table($dbh, $_) for (@tables_reltests); @@ -2152,17 +2169,17 @@ sub _custom_column_info { $table_name = lc ( $table_name ); $column_name = lc ( $column_name ); - if ( $table_name eq 'loader_test35' - and $column_name eq 'an_int' + if ( $table_name eq 'loader_test35' + and $column_name eq 'an_int' ){ return { is_numeric => 1 } } - # Set inflate_datetime or inflate_date to check + # Set inflate_datetime or inflate_date to check # datetime_timezone and datetime_locale if ( $table_name eq 'loader_test36' ){ - return { inflate_datetime => 1 } if + return { inflate_datetime => 1 } if ( $column_name eq 'b_char_as_data' ); - return { inflate_date => 1 } if + return { inflate_date => 1 } if ( $column_name eq 'c_char_as_data' ); } @@ -2235,7 +2252,7 @@ sub setup_data_type_tests { $type_alias =~ s/\W//g; my $col_name = 'col_' . $type_alias; - + if (@size) { my $size_name = join '_', apply { s/\W//g } @size; @@ -2277,7 +2294,7 @@ sub test_col_accessor_map { is( $default_name, 'crumb_crisp_coating', 'col_accessor_map was passed the default name' ); ok( $context->{$_}, "col_accessor_map func was passed the $_" ) - for qw( table_name table_class table_moniker schema_class ); + for qw( table table_name table_class table_moniker schema_class ); return 'trivet'; } else {