use File::Find 'find';
use Class::Unload ();
use Data::Dumper::Concise;
+use List::MoreUtils 'apply';
my $DUMP_DIR = './t/_common_dump';
rmtree $DUMP_DIR;
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;
+ }
+
+ my $extra_count = $self->{extra}{count} || 0;
- plan tests => @connect_info * (174 + ($self->{extra}{count} || 0) + ($self->{data_type_tests}{test_count} || 0));
+ plan tests => @connect_info * (176 + $extra_count + ($self->{data_type_tests}{test_count} || 0));
foreach my $info_idx (0..$#connect_info) {
my $info = $connect_info[$info_idx];
$self->create();
- my $schema_class = $self->setup_schema(@$info);
+ my $schema_class = $self->setup_schema($info);
$self->test_schema($schema_class);
rmtree $DUMP_DIR
}
}
+sub run_only_extra_tests {
+ my ($self, $connect_info) = @_;
+
+ plan tests => @$connect_info * (4 + ($self->{extra}{count} || 0) + ($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->drop_extra_tables_only;
+
+ my $dbh = $self->dbconnect(1);
+ $dbh->do($_) for @{ $self->{extra}{create} || [] };
+ $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests}{ddl};
+ $self->{_created} = 1;
+
+ my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] };
+ $file_count++; # schema
+ $file_count++ if $self->{data_type_tests}{ddl};
+
+ 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} || [] };
+
+ if (my $data_type_table = $self->{data_type_tests}{table_name}) {
+ $dbh->do("DROP TABLE $data_type_table");
+ }
+}
+
# defined in sub create
my (@statements, @statements_reltests, @statements_advanced,
@statements_advanced_sqlite, @statements_inline_rels,
@statements_implicit_rels);
sub setup_schema {
- my $self = shift;
- my @connect_info = @_;
+ my ($self, $connect_info, $expected_count) = @_;
my $schema_class = 'DBIXCSL_Test::Schema';
Class::Unload->unload($schema_class);
my $file_count;
- my $expected_count = 36 + ($self->{data_type_tests}{test_count} ? 1 : 0);
{
my @loader_warnings;
local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
use base qw/DBIx::Class::Schema::Loader/;
__PACKAGE__->loader_options(\%loader_opts);
- __PACKAGE__->connection(\@connect_info);
+ __PACKAGE__->connection(\@\$connect_info);
};
ok(!$@, "Loader initialization") or diag $@;
find sub { return if -d; $file_count++ }, $DUMP_DIR;
-
- $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};
+
+ my $standard_sources = not defined $expected_count;
+
+ if ($standard_sources) {
+ $expected_count = 36 + ($self->{data_type_tests}{test_count} ? 1 : 0);
+
+ $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';
$warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings;
- if($self->{skip_rels}) {
- SKIP: {
- is(scalar(@loader_warnings), $warn_count, "No 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;
+ }
}
}
($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( \@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;
'Foreign key detected');
}
- # test data types
+ $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};
my $columns = $data_type_tests->{columns};
"test column $col_name has definition: $text_col_def expecting: $text_expected_info";
}
}
+}
- # run extra tests
- $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run};
+sub monikers_and_classes {
+ my ($self, $schema_class) = @_;
+ my ($monikers, $classes);
- $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP};
+ foreach my $source_name ($schema_class->sources) {
+ my $table_name = $schema_class->source($source_name)->from;
- $conn->storage->disconnect;
+ $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 {
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}
my @tables = qw/
loader_test1s
loader_test2
- LOADER_TEST23
+ LOADER_test23
LoAdEr_test24
loader_test35
loader_test36
my %seen_col_names;
while (my ($col_def, $expected_info) = each %$types) {
- my $have_size = $col_def =~ /\(/ ? 1 : 0;
+ (my $type_alias = lc($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\z/i) {
+ my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
+
+ $type_alias = substr $col_def, 0, 15;
+
+ $type_alias .= '_with_dflt' if $default;
+ }
- (my $type_alias = lc($col_def)) =~ s/\([^()]+\)//g;
$type_alias =~ s/\s/_/g;
$type_alias =~ s/\W//g;
- my @size = grep defined($_), $col_def =~ /\( \s* (\d+) \s* ,? \s* (\d+)?/x;
+ my $col_name = 'col_' . $type_alias;
+
+ if (@size) {
+ my $size_name = join '_', apply { s/\W//g } @size;
- my $col_name = $type_alias . ($have_size ? "_with_size_".(join '_', @size) : '');
+ $col_name .= "_sz_$size_name";
+ }
$col_name .= "_$seen_col_names{$col_name}" if $seen_col_names{$col_name}++;
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff