use warnings;
use Test::More;
+use Test::Exception;
use DBIx::Class::Schema::Loader;
use Class::Unload;
use File::Path;
use DBI;
use Digest::MD5;
use File::Find 'find';
+use Class::Unload ();
+use Data::Dumper::Concise;
+use List::MoreUtils 'apply';
my $DUMP_DIR = './t/_common_dump';
rmtree $DUMP_DIR;
# Only MySQL uses this
$self->{innodb} ||= '';
- # DB2 doesn't support this
+ # DB2 and Firebird don't support 'field type NULL'
$self->{null} = 'NULL' unless defined $self->{null};
$self->{verbose} = $ENV{TEST_VERBOSE} || 0;
$self->{date_datatype} ||= 'DATE';
# Not all DBS do SQL-standard CURRENT_TIMESTAMP
- $self->{default_function} ||= "CURRENT_TIMESTAMP";
- $self->{default_function_def} ||= "TIMESTAMP DEFAULT $self->{default_function}";
+ $self->{default_function} ||= "current_timestamp";
+ $self->{default_function_def} ||= "timestamp default $self->{default_function}";
- return bless $self => $class;
+ $self = bless $self, $class;
+
+ $self->setup_data_type_tests;
+
+ return $self;
}
sub skip_tests {
return undef;
}
-sub _custom_column_info {
- my ( $table_name, $column_name, $column_info ) = @_;
+sub run_tests {
+ my $self = shift;
- $table_name = lc ( $table_name );
- $column_name = lc ( $column_name );
+ my @connect_info;
- if ( $table_name eq 'loader_test35'
- and $column_name eq 'an_int'
- ){
- return { is_numeric => 1 }
+ if ($self->{dsn}) {
+ push @connect_info, [ @{$self}{qw/dsn user password connect_info_opts/ } ];
}
- # Set inflate_datetime or inflate_date to check
- # datetime_timezone and datetime_locale
- if ( $table_name eq 'loader_test36' ){
- return { inflate_datetime => 1 } if
- ( $column_name eq 'b_char_as_data' );
- return { inflate_date => 1 } if
- ( $column_name eq 'c_char_as_data' );
+ else {
+ foreach my $info (@{ $self->{connect_info} || [] }) {
+ 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;
}
- return;
+ my $extra_count = $self->{extra}{count} || 0;
+
+ plan tests => @connect_info * (178 + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+
+ foreach my $info_idx (0..$#connect_info) {
+ my $info = $connect_info[$info_idx];
+
+ @{$self}{qw/dsn user password connect_info_opts/} = @$info;
+
+ $self->create();
+
+ my $schema_class = $self->setup_schema($info);
+ $self->test_schema($schema_class);
+
+ rmtree $DUMP_DIR
+ unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#connect_info;
+ }
}
-sub run_tests {
- my $self = shift;
+sub run_only_extra_tests {
+ my ($self, $connect_info) = @_;
- plan tests => 157 + ($self->{extra}->{count} || 0);
+ plan tests => @$connect_info * (4 + ($self->{extra}{count} || 0) + ($self->{data_type_tests}{test_count} || 0));
- $self->create();
+ rmtree $DUMP_DIR;
- my @connect_info = (
- $self->{dsn},
- $self->{user},
- $self->{password},
- $self->{connect_info_opts},
- );
+ foreach my $info_idx (0..$#$connect_info) {
+ my $info = $connect_info->[$info_idx];
+
+ @{$self}{qw/dsn user password connect_info_opts/} = @$info;
+
+ $self->drop_extra_tables_only;
+
+ my $dbh = $self->dbconnect(1);
+ {
+ # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..."
+ local $SIG{__WARN__} = sub {
+ my $msg = shift;
+ warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+ };
+
+
+ $dbh->do($_) for @{ $self->{extra}{create} || [] };
+ $dbh->do($_) for @{ $self->{data_type_tests}{ddl} || []};
+ }
+ $self->{_created} = 1;
+
+ my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] };
+ $file_count++; # schema
+ $file_count++ for @{ $self->{data_type_tests}{table_names} || [] };
+
+ my $schema_class = $self->setup_schema($info, $file_count);
+ my ($monikers, $classes) = $self->monikers_and_classes($schema_class);
+ my $conn = $schema_class->clone;
+
+ $self->test_data_types($conn);
+ $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run};
+
+ if (not ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#$connect_info)) {
+ $self->drop_extra_tables_only;
+ rmtree $DUMP_DIR;
+ }
+ }
+}
+
+sub drop_extra_tables_only {
+ my $self = shift;
+
+ my $dbh = $self->dbconnect(0);
+ $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
+ $dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
- # First, with in-memory classes
- my $schema_class = $self->setup_schema(@connect_info);
- $self->test_schema($schema_class);
+ foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) {
+ $dbh->do("DROP TABLE $data_type_table");
+ }
}
# defined in sub create
@statements_implicit_rels);
sub setup_schema {
- my $self = shift;
- my @connect_info = @_;
+ my ($self, $connect_info, $expected_count) = @_;
my $schema_class = 'DBIXCSL_Test::Schema';
use_namespaces => 0,
dump_directory => $DUMP_DIR,
datetime_timezone => 'Europe/Berlin',
- datetime_locale => 'de_DE'
+ datetime_locale => 'de_DE',
+ %{ $self->{loader_options} || {} },
);
$loader_opts{db_schema} = $self->{db_schema} if $self->{db_schema};
- {
- my @loader_warnings;
- local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
- 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 $@;
-
- my $file_count;
- find sub { return if -d; $file_count++ }, $DUMP_DIR;
-
- my $expected_count = 36;
-
- $expected_count += grep /CREATE (?:TABLE|VIEW)/i,
- @{ $self->{extra}{create} || [] };
-
- $expected_count -= grep /CREATE TABLE/, @statements_inline_rels
- if $self->{skip_rels} || $self->{no_inline_rels};
-
- $expected_count -= grep /CREATE TABLE/, @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
- if $self->{skip_rels};
-
- is $file_count, $expected_count, 'correct number of files generated';
+ Class::Unload->unload($schema_class);
- exit if $file_count != $expected_count;
-
- my $warn_count = 2;
- $warn_count++ if grep /ResultSetManager/, @loader_warnings;
-
- $warn_count++ for grep /^Bad table or view/, @loader_warnings;
-
- $warn_count++ for grep /stripping trailing _id/, @loader_warnings;
-
- my $vendor = $self->{vendor};
- $warn_count++ for grep /${vendor}_\S+ has no primary key/,
- @loader_warnings;
-
- if($self->{skip_rels}) {
- SKIP: {
- is(scalar(@loader_warnings), $warn_count, "No loader warnings")
+ my $file_count;
+ {
+ my @loader_warnings;
+ local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
+ 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;
+
+ my $standard_sources = not defined $expected_count;
+
+ if ($standard_sources) {
+ $expected_count = 36;
+ $expected_count++ for @{ $self->{data_type_tests}{table_names} || [] };
+
+ $expected_count += grep /CREATE (?:TABLE|VIEW)/i,
+ @{ $self->{extra}{create} || [] };
+
+ $expected_count -= grep /CREATE TABLE/, @statements_inline_rels
+ if $self->{skip_rels} || $self->{no_inline_rels};
+
+ $expected_count -= grep /CREATE TABLE/, @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
+ if $self->{skip_rels};
+ }
+
+ is $file_count, $expected_count, 'correct number of files generated';
+
+ my $warn_count = 2;
+ $warn_count++ if grep /ResultSetManager/, @loader_warnings;
+
+ $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;
+
+ if ($standard_sources) {
+ if($self->{skip_rels}) {
+ SKIP: {
+ is(scalar(@loader_warnings), $warn_count, "No loader warnings")
+ or diag @loader_warnings;
+ skip "No missing PK warnings without rels", 1;
+ }
+ }
+ else {
+ $warn_count++;
+ is(scalar(@loader_warnings), $warn_count, "Expected loader warning")
or diag @loader_warnings;
- skip "No missing PK warnings without rels", 1;
+ is(grep(/loader_test9 has no primary key/i, @loader_warnings), 1,
+ "Missing PK warning");
}
}
else {
- $warn_count++;
- is(scalar(@loader_warnings), $warn_count, "Expected loader warning")
- or diag @loader_warnings;
- is(grep(/loader_test9 has no primary key/i, @loader_warnings), 1,
- "Missing PK warning");
+ SKIP: {
+ is scalar(@loader_warnings), $warn_count, 'Correct number of warnings'
+ or diag @loader_warnings;
+ skip "not testing standard sources", 1;
+ }
}
}
-
+
+ exit if $file_count != $expected_count;
+
return $schema_class;
}
($self->{before_tests_run} || sub {})->($conn);
- my $monikers = {};
- my $classes = {};
- foreach my $source_name ($schema_class->sources) {
- my $table_name = $schema_class->source($source_name)->from;
-
- $table_name = $$table_name if ref $table_name;
-
- $monikers->{$table_name} = $source_name;
- $classes->{$table_name} = $schema_class . q{::} . $source_name;
-
- # some DBs (Firebird) uppercase everything
- $monikers->{lc $table_name} = $source_name;
- $classes->{lc $table_name} = $schema_class . q{::} . $source_name;
- }
+ my ($monikers, $classes) = $self->monikers_and_classes($schema_class);
my $moniker1 = $monikers->{loader_test1s};
my $class1 = $classes->{loader_test1s};
my $rsobj2 = $conn->resultset($moniker2);
check_no_duplicate_unique_constraints($class2);
- my $moniker23 = $monikers->{LOADER_TEST23} || $monikers->{loader_test23};
- my $class23 = $classes->{LOADER_TEST23} || $classes->{loader_test23};
+ my $moniker23 = $monikers->{LOADER_test23} || $monikers->{loader_test23};
+ my $class23 = $classes->{LOADER_test23} || $classes->{loader_test23};
my $rsobj23 = $conn->resultset($moniker1);
my $moniker24 = $monikers->{LoAdEr_test24} || $monikers->{loader_test24};
isa_ok( $rsobj35, "DBIx::Class::ResultSet" );
my @columns_lt2 = $class2->columns;
- is_deeply( [ map lc, @columns_lt2 ], [ qw/id dat dat2/ ], "Column Ordering" );
+ is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent/ ], "Column Ordering" );
+
+ is $class2->column_info('set_primary_key')->{accessor}, undef,
+ 'accessor for column name that conflicts with a result base class method removed';
+
+ is $class2->column_info('dbix_class_testcomponent')->{accessor}, undef,
+ 'accessor for column name that conflicts with a component class method removed';
my %uniq1 = $class1->unique_constraints;
my $uniq1_test = 0;
foreach my $ucname (keys %uniq1) {
my $cols_arrayref = $uniq1{$ucname};
- if(@$cols_arrayref == 1 && lc($cols_arrayref->[0]) eq 'dat') {
+ if(@$cols_arrayref == 1 && $cols_arrayref->[0] eq 'dat') {
$uniq1_test = 1;
last;
}
foreach my $ucname (keys %uniq2) {
my $cols_arrayref = $uniq2{$ucname};
if(@$cols_arrayref == 2
- && lc($cols_arrayref->[0]) eq 'dat2'
- && lc($cols_arrayref->[1]) eq 'dat') {
+ && $cols_arrayref->[0] eq 'dat2'
+ && $cols_arrayref->[1] eq 'dat') {
$uniq2_test = 2;
last;
}
or skip "Pre-requisite test failed";
is( $rsobj1->loader_test1_rsmeth, 'all is still well', 'Result set method' );
}
-
- ok( $self->_dbic_column_info($class1, 'id')->{is_auto_increment}, 'is_auto_increment detection' );
+
+ ok( $class1->column_info('id')->{is_auto_increment}, 'is_auto_increment detection' );
my $obj = $rsobj1->find(1);
is( $obj->id, 1, "Find got the right row" );
is( $rsobj2->count, 4, "Count" );
my $saved_id;
eval {
- my $new_obj1 = $self->_dbic_create($rsobj1, { dat => 'newthing' });
+ my $new_obj1 = $rsobj1->create({ dat => 'newthing' });
$saved_id = $new_obj1->id;
};
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 = $self->_dbic_search($rsobj1, { dat => 'newthing' })->first;
+ my $new_obj1 = $rsobj1->search({ dat => 'newthing' })->first;
ok($new_obj1, "Found newly inserted PK::Auto record");
is($new_obj1->id, $saved_id, "Correct PK::Auto-generated id");
- my ($obj2) = $self->_dbic_search($rsobj2, { dat => 'bbb' })->first;
+ my ($obj2) = $rsobj2->search({ dat => 'bbb' })->first;
is( $obj2->id, 2 );
is(
- $self->_dbic_column_info($class35, 'a_varchar')->{default_value}, 'foo',
+ $class35->column_info('a_varchar')->{default_value}, 'foo',
'constant character default',
);
is(
- $self->_dbic_column_info($class35, 'an_int')->{default_value}, 42,
+ $class35->column_info('an_int')->{default_value}, 42,
'constant integer default',
);
- is(
- $self->_dbic_column_info($class35, 'a_double')->{default_value}, 10.555,
+ cmp_ok(
+ $class35->column_info('a_double')->{default_value}, '==', 10.555,
'constant numeric default',
);
- my $function_default = $self->_dbic_column_info($class35, 'a_function')->{default_value};
+ my $function_default = $class35->column_info('a_function')->{default_value};
isa_ok( $function_default, 'SCALAR', 'default_value for function default' );
is_deeply(
);
SKIP: {
- skip $self->{skip_rels}, 99 if $self->{skip_rels};
+ skip $self->{skip_rels}, 116 if $self->{skip_rels};
my $moniker3 = $monikers->{loader_test3};
my $class3 = $classes->{loader_test3};
my $obj4 = $rsobj4->find(123);
isa_ok( $obj4->fkid_singular, $class3);
- ok($self->_dbic_column_info($class4, 'fkid')->{is_foreign_key}, 'Foreign key detected');
+ ok($class4->column_info('fkid')->{is_foreign_key}, 'Foreign key detected');
my $obj3 = $rsobj3->find(1);
my $rs_rel4 = $obj3->search_related('loader_test4zes');
isa_ok( $rs_rel4->first, $class4);
+ # check rel naming with prepositions
+ ok ($rsobj4->result_source->has_relationship('loader_test5s_to'),
+ "rel with preposition 'to' pluralized correctly");
+
+ ok ($rsobj4->result_source->has_relationship('loader_test5s_from'),
+ "rel with preposition 'from' pluralized correctly");
+
+ # check default relationship attributes
+ is $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_delete}, 0,
+ 'cascade_delete => 0 on has_many by default';
+
+ is $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{cascade_copy}, 0,
+ 'cascade_copy => 0 on has_many by default';
+
+ ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_delete}),
+ 'has_many does not have on_delete');
+
+ ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{on_update}),
+ 'has_many does not have on_update');
+
+ ok ((not exists $rsobj3->result_source->relationship_info('loader_test4zes')->{attrs}{is_deferrable}),
+ 'has_many does not have is_deferrable');
+
+ is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_delete}, 'CASCADE',
+ "on_delete => 'CASCADE' on belongs_to by default";
+
+ is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update}, 'CASCADE',
+ "on_update => 'CASCADE' on belongs_to by default";
+
+ ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}),
+ "is_deferrable => 1 not on belongs_to by default");
+
+ ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete}),
+ 'belongs_to does not have cascade_delete');
+
+ ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_copy}),
+ 'belongs_to does not have cascade_copy');
+
+ is $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_delete}, 0,
+ 'cascade_delete => 0 on might_have by default';
+
+ is $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{cascade_copy}, 0,
+ 'cascade_copy => 0 on might_have by default';
+
+ ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_delete}),
+ 'might_have does not have on_delete');
+
+ ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{on_update}),
+ 'might_have does not have on_update');
+
+ ok ((not exists $rsobj27->result_source->relationship_info('loader_test28')->{attrs}{is_deferrable}),
+ 'might_have does not have is_deferrable');
+
# find on multi-col pk
my $obj5 =
- eval { $self->_dbic_find($rsobj5, {id1 => 1, iD2 => 1}) } ||
- eval { $self->_dbic_find($rsobj5, {id1 => 1, id2 => 1}) };
+ eval { $rsobj5->find({id1 => 1, iD2 => 1}) } ||
+ eval { $rsobj5->find({id1 => 1, id2 => 1}) };
die $@ if $@;
- is( $obj5->id2, 1, "Find on multi-col PK" );
+ is( (eval { $obj5->id2 } || eval { $obj5->i_d2 }), 1, "Find on multi-col PK" );
# mulit-col fk def
my $obj6 = $rsobj6->find(1);
isa_ok( $obj6->loader_test2, $class2);
isa_ok( $obj6->loader_test5, $class5);
- ok($self->_dbic_column_info($class6, 'loader_test2_id')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class6, 'id')->{is_foreign_key}, 'Foreign key detected');
+ ok($class6->column_info('loader_test2_id')->{is_foreign_key}, 'Foreign key detected');
+ ok($class6->column_info('id')->{is_foreign_key}, 'Foreign key detected');
- my $id2_info = eval { $self->_dbic_column_info($class6, 'id2') } ||
- $self->_dbic_column_info($class6, 'Id2');
+ my $id2_info = eval { $class6->column_info('id2') } ||
+ $class6->column_info('Id2');
ok($id2_info->{is_foreign_key}, 'Foreign key detected');
# fk that references a non-pk key (UNIQUE)
my $obj8 = $rsobj8->find(1);
isa_ok( $obj8->loader_test7, $class7);
- ok($self->_dbic_column_info($class8, 'loader_test7')->{is_foreign_key}, 'Foreign key detected');
+ ok($class8->column_info('loader_test7')->{is_foreign_key}, 'Foreign key detected');
# test double-fk 17 ->-> 16
my $obj17 = $rsobj17->find(33);
isa_ok($rs_rel16_one, $class16);
is($rs_rel16_one->dat, 'y16', "Multiple FKs to same table");
- ok($self->_dbic_column_info($class17, 'loader16_one')->{is_foreign_key}, 'Foreign key detected');
+ ok($class17->column_info('loader16_one')->{is_foreign_key}, 'Foreign key detected');
my $rs_rel16_two = $obj17->loader16_two;
isa_ok($rs_rel16_two, $class16);
is($rs_rel16_two->dat, 'z16', "Multiple FKs to same table");
- ok($self->_dbic_column_info($class17, 'loader16_two')->{is_foreign_key}, 'Foreign key detected');
+ ok($class17->column_info('loader16_two')->{is_foreign_key}, 'Foreign key detected');
my $obj16 = $rsobj16->find(2);
my $rs_rel17 = $obj16->search_related('loader_test17_loader16_ones');
is($rs_rel17->first->id, 3, "search_related with multiple FKs from same table");
# XXX test m:m 18 <- 20 -> 19
- ok($self->_dbic_column_info($class20, 'parent')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class20, 'child')->{is_foreign_key}, 'Foreign key detected');
+ 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($self->_dbic_column_info($class22, 'parent')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class22, 'child')->{is_foreign_key}, 'Foreign key detected');
+ ok($class22->column_info('parent')->{is_foreign_key}, 'Foreign key detected');
+ ok($class22->column_info('child')->{is_foreign_key}, 'Foreign key detected');
# test double multi-col fk 26 -> 25
my $obj26 = $rsobj26->find(33);
isa_ok($rs_rel25_one, $class25);
is($rs_rel25_one->dat, 'x25', "Multiple multi-col FKs to same table");
- ok($self->_dbic_column_info($class26, 'id')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class26, 'rel1')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class26, 'rel2')->{is_foreign_key}, 'Foreign key detected');
+ ok($class26->column_info('id')->{is_foreign_key}, 'Foreign key detected');
+ ok($class26->column_info('rel1')->{is_foreign_key}, 'Foreign key detected');
+ ok($class26->column_info('rel2')->{is_foreign_key}, 'Foreign key detected');
my $rs_rel25_two = $obj26->loader_test25_id_rel2;
isa_ok($rs_rel25_two, $class25);
my $obj27 = $rsobj27->find(1);
my $obj28 = $obj27->loader_test28;
isa_ok($obj28, $class28);
- is($self->_dbic_get_column($obj28, 'id'), 1, "One-to-one relationship with PRIMARY FK");
+ is($obj28->get_column('id'), 1, "One-to-one relationship with PRIMARY FK");
- ok($self->_dbic_column_info($class28, 'id')->{is_foreign_key}, 'Foreign key detected');
+ ok($class28->column_info('id')->{is_foreign_key}, 'Foreign key detected');
my $obj29 = $obj27->loader_test29;
isa_ok($obj29, $class29);
is($obj29->id, 1, "One-to-one relationship with UNIQUE FK");
- ok($self->_dbic_column_info($class29, 'fk')->{is_foreign_key}, 'Foreign key detected');
+ ok($class29->column_info('fk')->{is_foreign_key}, 'Foreign key detected');
$obj27 = $rsobj27->find(2);
is($obj27->loader_test28, undef, "Undef for missing one-to-one row");
is($obj27->loader_test29, undef, "Undef for missing one-to-one row");
# test outer join for nullable referring columns:
- is $self->_dbic_column_info($class32, 'rel2')->{is_nullable}, 1,
+ is $class32->column_info('rel2')->{is_nullable}, 1,
'is_nullable detection';
- ok($self->_dbic_column_info($class32, 'rel1')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class32, 'rel2')->{is_foreign_key}, 'Foreign key detected');
+ ok($class32->column_info('rel1')->{is_foreign_key}, 'Foreign key detected');
+ ok($class32->column_info('rel2')->{is_foreign_key}, 'Foreign key detected');
my $obj32 = $rsobj32->find(1,{prefetch=>[qw/rel1 rel2/]});
my $obj34 = $rsobj34->find(
isa_ok($obj32,$class32);
isa_ok($obj34,$class34);
- ok($self->_dbic_column_info($class34, 'id')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class34, 'rel1')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class34, 'rel2')->{is_foreign_key}, 'Foreign key detected');
+ ok($class34->column_info('id')->{is_foreign_key}, 'Foreign key detected');
+ ok($class34->column_info('rel1')->{is_foreign_key}, 'Foreign key detected');
+ ok($class34->column_info('rel2')->{is_foreign_key}, 'Foreign key detected');
my $rs_rel31_one = $obj32->rel1;
my $rs_rel31_two = $obj32->rel2;
isa_ok( $rsobj10, "DBIx::Class::ResultSet" );
isa_ok( $rsobj11, "DBIx::Class::ResultSet" );
- ok($self->_dbic_column_info($class10, 'loader_test11')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class11, 'loader_test10')->{is_foreign_key}, 'Foreign key detected');
+ ok($class10->column_info('loader_test11')->{is_foreign_key}, 'Foreign key detected');
+ ok($class11->column_info('loader_test10')->{is_foreign_key}, 'Foreign key detected');
- my $obj10 = $self->_dbic_create($rsobj10, { subject => 'xyzzy' });
+ my $obj10 = $rsobj10->create({ subject => 'xyzzy' });
$obj10->update();
ok( defined $obj10, 'Create row' );
- my $obj11 = $self->_dbic_create($rsobj11, { loader_test10 => $obj10->id() });
+ my $obj11 = $rsobj11->create({ loader_test10 => $obj10->id() });
$obj11->update();
ok( defined $obj11, 'Create related row' );
eval {
my $obj10_2 = $obj11->loader_test10;
- $self->_dbic_update($obj10_2, { loader_test11 => $obj11->id11 });
+ $obj10_2->update({ loader_test11 => $obj11->id11 });
};
diag $@ if $@;
ok(!$@, "Setting up circular relationship");
SKIP: {
skip 'Previous eval block failed', 3 if $@;
- my $results = $self->_dbic_search($rsobj10, { subject => 'xyzzy' });
+ my $results = $rsobj10->search({ subject => 'xyzzy' });
is( $results->count(), 1, 'No duplicate row created' );
my $obj10_3 = $results->first();
isa_ok( $rsobj12, "DBIx::Class::ResultSet" );
isa_ok( $rsobj13, "DBIx::Class::ResultSet" );
- ok($self->_dbic_column_info($class13, 'id')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class13, 'loader_test12')->{is_foreign_key}, 'Foreign key detected');
- ok($self->_dbic_column_info($class13, 'dat')->{is_foreign_key}, 'Foreign key detected');
+ 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 = $rsobj13->find(1);
isa_ok( $obj13->id, $class12 );
isa_ok( $rsobj14, "DBIx::Class::ResultSet" );
isa_ok( $rsobj15, "DBIx::Class::ResultSet" );
- ok($self->_dbic_column_info($class15, 'loader_test14')->{is_foreign_key}, 'Foreign key detected');
+ ok($class15->column_info('loader_test14')->{is_foreign_key}, 'Foreign key detected');
my $obj15 = $rsobj15->find(1);
isa_ok( $obj15->loader_test14, $class14 );
my $class35 = $classes->{loader_test35};
my $class36 = $classes->{loader_test36};
- ok($self->_dbic_column_info($class35, 'an_int')->{is_numeric}, 'custom_column_info');
+ ok($class35->column_info('an_int')->{is_numeric}, 'custom_column_info');
- is($self->_dbic_column_info($class36, 'a_date')->{locale},'de_DE','datetime_locale');
- is($self->_dbic_column_info($class36, 'a_date')->{timezone},'Europe/Berlin','datetime_timezone');
+ is($class36->column_info('a_date')->{locale},'de_DE','datetime_locale');
+ is($class36->column_info('a_date')->{timezone},'Europe/Berlin','datetime_timezone');
- ok($self->_dbic_column_info($class36, 'b_char_as_data')->{inflate_datetime},'custom_column_info');
- is($self->_dbic_column_info($class36, 'b_char_as_data')->{locale},'de_DE','datetime_locale');
- is($self->_dbic_column_info($class36, 'b_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
+ ok($class36->column_info('b_char_as_data')->{inflate_datetime},'custom_column_info');
+ is($class36->column_info('b_char_as_data')->{locale},'de_DE','datetime_locale');
+ is($class36->column_info('b_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
- ok($self->_dbic_column_info($class36, 'c_char_as_data')->{inflate_date},'custom_column_info');
- is($self->_dbic_column_info($class36, 'c_char_as_data')->{locale},'de_DE','datetime_locale');
- is($self->_dbic_column_info($class36, 'c_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
+ ok($class36->column_info('c_char_as_data')->{inflate_date},'custom_column_info');
+ is($class36->column_info('c_char_as_data')->{locale},'de_DE','datetime_locale');
+ is($class36->column_info('c_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
}
# rescan and norewrite test
- SKIP: {
+ {
my @statements_rescan = (
qq{
CREATE TABLE loader_test30 (
my $before_digest = $digest->digest;
+ $conn->storage->disconnect; # needed for Firebird and Informix
my $dbh = $self->dbconnect(1);
{
# Silence annoying but harmless postgres "NOTICE: CREATE TABLE..."
local $SIG{__WARN__} = sub {
my $msg = shift;
- print STDERR $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+ warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
};
$dbh->do($_) for @statements_rescan;
}
$dbh->disconnect;
- $conn->storage->disconnect; # needed for Firebird
sleep 1;
my $rsobj30 = $conn->resultset('LoaderTest30');
isa_ok($rsobj30, 'DBIx::Class::ResultSet');
- skip 'no rels', 2 if $self->{skip_rels};
+ SKIP: {
+ skip 'no rels', 2 if $self->{skip_rels};
- my $obj30 = $rsobj30->find(123);
- isa_ok( $obj30->loader_test2, $class2);
+ my $obj30 = $rsobj30->find(123);
+ isa_ok( $obj30->loader_test2, $class2);
- ok($self->_dbic_column_info($rsobj30->result_source, 'loader_test2')->{is_foreign_key},
- 'Foreign key detected');
+ ok($rsobj30->result_source->column_info('loader_test2')->{is_foreign_key},
+ 'Foreign key detected');
+ }
+
+ $conn->storage->disconnect; # for Firebird
+ $conn->storage->dbh->do("DROP TABLE loader_test30");
+
+ @new = do {
+ local $SIG{__WARN__} = sub {};
+ $conn->rescan;
+ };
+ is_deeply(\@new, [], 'no new tables on rescan');
+
+ throws_ok { $conn->resultset('LoaderTest30') }
+ qr/Can't find source/,
+ 'source unregistered for dropped table after rescan';
}
- $self->{extra}->{run}->($conn, $monikers, $classes) if $self->{extra}->{run};
+ $self->test_data_types($conn);
+
+ # run extra tests
+ $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run};
+
+ $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
$conn->storage->disconnect;
}
+sub test_data_types {
+ my ($self, $conn) = @_;
+
+ if ($self->{data_type_tests}{test_count}) {
+ my $data_type_tests = $self->{data_type_tests};
+
+ foreach my $moniker (@{ $data_type_tests->{table_monikers} }) {
+ my $columns = $data_type_tests->{columns}{$moniker};
+
+ my $rsrc = $conn->resultset($moniker)->result_source;
+
+ while (my ($col_name, $expected_info) = each %$columns) {
+ my %info = %{ $rsrc->column_info($col_name) };
+ delete @info{qw/is_nullable timezone locale sequence/};
+
+ my $text_col_def = do {
+ my $dd = Dumper;
+ $dd->Indent(0);
+ $dd->Values([\%info]);
+ $dd->Dump;
+ };
+
+ my $text_expected_info = do {
+ my $dd = Dumper;
+ $dd->Indent(0);
+ $dd->Values([$expected_info]);
+ $dd->Dump;
+ };
+
+ is_deeply \%info, $expected_info,
+ "test column $col_name has definition: $text_col_def expecting: $text_expected_info";
+ }
+ }
+ }
+}
+
+sub monikers_and_classes {
+ my ($self, $schema_class) = @_;
+ my ($monikers, $classes);
+
+ foreach my $source_name ($schema_class->sources) {
+ my $table_name = $schema_class->source($source_name)->from;
+
+ $table_name = $$table_name if ref $table_name;
+
+ $monikers->{$table_name} = $source_name;
+ $classes->{$table_name} = $schema_class . q{::} . $source_name;
+
+ # some DBs (Firebird) uppercase everything
+ $monikers->{lc $table_name} = $source_name;
+ $classes->{lc $table_name} = $schema_class . q{::} . $source_name;
+ }
+
+ return ($monikers, $classes);
+}
+
sub check_no_duplicate_unique_constraints {
my ($class) = @_;
RaiseError => $complain,
ShowErrorStatement => $complain,
PrintError => 0,
+ %{ $self->{connect_info_opts} || {} },
},
]);
q{ INSERT INTO loader_test1s (dat) VALUES('bar') },
q{ INSERT INTO loader_test1s (dat) VALUES('baz') },
+ # also test method collision
qq{
CREATE TABLE loader_test2 (
id $self->{auto_inc_pk},
dat VARCHAR(32) NOT NULL,
dat2 VARCHAR(32) NOT NULL,
+ set_primary_key INTEGER $self->{null},
+ dbix_class_testcomponent INTEGER $self->{null},
UNIQUE (dat2, dat)
) $self->{innodb}
},
q{ INSERT INTO loader_test2 (dat, dat2) VALUES('ddd', 'www') },
qq{
- CREATE TABLE LOADER_TEST23 (
+ CREATE TABLE LOADER_test23 (
ID INTEGER NOT NULL PRIMARY KEY,
DAT VARCHAR(32) NOT NULL UNIQUE
) $self->{innodb}
id1 INTEGER NOT NULL,
iD2 INTEGER NOT NULL,
dat VARCHAR(8),
- PRIMARY KEY (id1,iD2)
+ from_id INTEGER $self->{null},
+ to_id INTEGER $self->{null},
+ PRIMARY KEY (id1,iD2),
+ FOREIGN KEY (from_id) REFERENCES loader_test4 (id),
+ FOREIGN KEY (to_id) REFERENCES loader_test4 (id)
) $self->{innodb}
},
},
$make_auto_inc->(qw/loader_test11 id11/),
- (q{ ALTER TABLE loader_test10 ADD CONSTRAINT } .
- q{ loader_test11_fk FOREIGN KEY (loader_test11) } .
- q{ REFERENCES loader_test11 (id11) }),
+ (lc($self->{vendor}) ne 'informix' ?
+ (q{ ALTER TABLE loader_test10 ADD CONSTRAINT loader_test11_fk } .
+ q{ FOREIGN KEY (loader_test11) } .
+ q{ REFERENCES loader_test11 (id11) })
+ :
+ (q{ ALTER TABLE loader_test10 ADD CONSTRAINT } .
+ q{ FOREIGN KEY (loader_test11) } .
+ q{ REFERENCES loader_test11 (id11) } .
+ q{ CONSTRAINT loader_test11_fk })
+ ),
);
@statements_advanced_sqlite = (
);
$self->drop_tables;
+ $self->drop_tables; # twice for good measure
my $dbh = $self->dbconnect(1);
# Silence annoying but harmless postgres "NOTICE: CREATE TABLE..."
local $SIG{__WARN__} = sub {
my $msg = shift;
- print STDERR $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+ warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
};
- $dbh->do($_) for (@statements);
+ $dbh->do($_) foreach (@statements);
+
+ $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || {} });
+
unless($self->{skip_rels}) {
# hack for now, since DB2 doesn't like inline comments, and we need
# to test one for mysql, which works on everyone else...
my @tables = qw/
loader_test1s
loader_test2
- LOADER_TEST23
+ LOADER_test23
LoAdEr_test24
loader_test35
loader_test36
else {
$dbh->do($drop_fk);
}
- $dbh->do("DROP TABLE $_") for (@tables_advanced);
$dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_advanced_auto_inc;
+ $dbh->do("DROP TABLE $_") for (@tables_advanced);
unless($self->{no_inline_rels}) {
$dbh->do("DROP TABLE $_") for (@tables_inline_rels);
$dbh->do("DROP TABLE $_") for (@tables_implicit_rels);
}
}
- $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan);
$dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc;
+ $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan);
+
+ foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || {} }) {
+ $dbh->do("DROP TABLE $data_type_table");
+ }
+
+ $dbh->disconnect;
+
+# fixup for Firebird
+ $dbh = $self->dbconnect(0);
+ $dbh->do('DROP TABLE loader_test2');
$dbh->disconnect;
}
-sub _dbic_column_info {
- my ($self, $class, $colname) = @_;
+sub _custom_column_info {
+ my ( $table_name, $column_name, $column_info ) = @_;
- return $self->{uppercase_identifiers} ? $class->column_info(uc $colname) : $class->column_info($colname);
-}
+ $table_name = lc ( $table_name );
+ $column_name = lc ( $column_name );
-sub _dbic_get_column {
- my ($self, $obj, $colname) = @_;
+ if ( $table_name eq 'loader_test35'
+ and $column_name eq 'an_int'
+ ){
+ return { is_numeric => 1 }
+ }
+ # Set inflate_datetime or inflate_date to check
+ # datetime_timezone and datetime_locale
+ if ( $table_name eq 'loader_test36' ){
+ return { inflate_datetime => 1 } if
+ ( $column_name eq 'b_char_as_data' );
+ return { inflate_date => 1 } if
+ ( $column_name eq 'c_char_as_data' );
+ }
- return $self->{uppercase_identifiers} ? $obj->get_column(uc $colname) : $obj->get_column($colname);
+ return;
}
-sub _dbic_update {
- my ($self, $obj, $data) = @_;
+my %DATA_TYPE_MULTI_TABLE_OVERRIDES = (
+ oracle => qr/\blong\b/,
+ mssql => qr/\b(?:timestamp|rowversion)\b/,
+);
- return $self->_wrap_dbic_method_with_hash($obj, 'update', $data);
-}
+sub setup_data_type_tests {
+ my $self = shift;
-sub _dbic_create {
- my ($self, $rs, $data) = @_;
+ return unless my $types = $self->{data_types};
- return $self->_wrap_dbic_method_with_hash($rs, 'create', $data);
-}
+ my $tests = $self->{data_type_tests} = {};
-sub _dbic_search {
- my ($self, $rs, $cond) = @_;
+ # split types into tables based on overrides
+ my (@types, @split_off_types, @first_table_types);
+ {
+ no warnings 'uninitialized';
- return $self->_wrap_dbic_method_with_hash($rs, 'search', $cond);
-}
+ @types = keys %$types;
+ @split_off_types = grep /$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types;
+ @first_table_types = grep !/$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types;
+ }
-sub _dbic_find {
- my ($self, $rs, $cond) = @_;
+ @types = +{ map +($_, $types->{$_}), @first_table_types },
+ map +{ $_, $types->{$_} }, @split_off_types;
- return $self->_wrap_dbic_method_with_hash($rs, 'find', $cond);
-}
+ my $test_count = 0;
+ my $table_num = 10000;
+
+ foreach my $types (@types) {
+ my $table_name = "loader_test$table_num";
+ push @{ $tests->{table_names} }, $table_name;
+
+ my $table_moniker = "LoaderTest$table_num";
+ push @{ $tests->{table_monikers} }, $table_moniker;
+
+ $table_num++;
+
+ my $cols = $tests->{columns}{$table_moniker} = {};
+
+ my $ddl = "CREATE TABLE $table_name (\n id INTEGER NOT NULL PRIMARY KEY,\n";
+
+ my %seen_col_names;
+
+ while (my ($col_def, $expected_info) = each %$types) {
+ (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg;
+
+ my $size = $1;
+ $size = '' unless defined $size;
+ $size =~ s/\s+//g;
+ my @size = split /,/, $size;
+
+ # some DBs don't like very long column names
+ if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle)\z/i) {
+ my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
+
+ $type_alias = substr $col_def, 0, 15;
-sub _wrap_dbic_method_with_hash {
- my ($self, $obj, $method, $hash) = @_;
+ $type_alias .= '_with_dflt' if $default;
+ }
+
+ $type_alias =~ s/\s/_/g;
+ $type_alias =~ s/\W//g;
+
+ my $col_name = 'col_' . $type_alias;
+
+ if (@size) {
+ my $size_name = join '_', apply { s/\W//g } @size;
+
+ $col_name .= "_sz_$size_name";
+ }
+
+ # XXX would be better to check _loader->preserve_case
+ $col_name = lc $col_name;
+
+ $col_name .= '_' . $seen_col_names{$col_name} if $seen_col_names{$col_name}++;
+
+ $ddl .= " $col_name $col_def,\n";
+
+ $cols->{$col_name} = $expected_info;
+
+ $test_count++;
+ }
+
+ $ddl =~ s/,\n\z/\n)/;
+
+ push @{ $tests->{ddl} }, $ddl;
+ }
- return $obj->$method($hash) unless $self->{uppercase_identifiers};
+ $tests->{test_count} = $test_count;
- my %hash;
- @hash{map uc, keys %$hash} = values %$hash;
- $obj->$method(\%hash)
+ return $test_count;
}
sub DESTROY {
}
1;
+# vim:et sts=4 sw=4 tw=0:
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff