use DBIx::Class::Schema::Loader::Optional::Dependencies ();
use namespace::clean;
-my $DUMP_DIR = './t/_common_dump';
+use dbixcsl_test_dir qw/$tdir/;
+
+my $DUMP_DIR = "$tdir/common_dump";
rmtree $DUMP_DIR;
+use constant RESCAN_WARNINGS => qr/(?i:loader_test)\d+ has no primary key|^Dumping manual schema|^Schema dump completed|collides with an inherited method|invalidates \d+ active statement|^Bad table or view/;
+
sub new {
my $class = shift;
my $extra_count = $self->{extra}{count} || 0;
- plan tests => @connect_info * (182 + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ plan tests => @connect_info * (181 + $extra_count + ($self->{data_type_tests}{test_count} || 0));
foreach my $info_idx (0..$#connect_info) {
my $info = $connect_info[$info_idx];
$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} || []};
- }
+ $dbh->do($_) for @{ $self->{pre_create} || [] };
+ $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} || [] };
my $conn = $schema_class->clone;
$self->test_data_types($conn);
- $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run};
+ $self->{extra}{run}->($conn, $monikers, $classes, $self) if $self->{extra}{run};
if (not ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} && $info_idx == $#$connect_info)) {
$self->drop_extra_tables_only;
my $dbh = $self->dbconnect(0);
- {
- local $SIG{__WARN__} = sub {}; # postgres notices
- $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
- }
-
+ $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
$dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) {
additional_base_classes => 'TestAdditionalBase',
left_base_classes => [ qw/TestLeftBase/ ],
components => [ qw/TestComponent/ ],
- resultset_components => [ qw/TestRSComponent/ ],
inflect_plural => { loader_test4 => 'loader_test4zes' },
inflect_singular => { fkid => 'fkid_singular' },
moniker_map => \&_monikerize,
datetime_timezone => 'Europe/Berlin',
datetime_locale => 'de_DE',
use_moose => $ENV{SCHEMA_LOADER_TESTS_USE_MOOSE},
+ col_collision_map => { '^(can)\z' => 'caught_collision_%s' },
%{ $self->{loader_options} || {} },
);
my $file_count;
{
my @loader_warnings;
- local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
+ local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
eval qq{
package $schema_class;
use base qw/DBIx::Class::Schema::Loader/;
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 /\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;
+
$warn_count++ for grep { my $w = $_; grep $w =~ $_, @{ $self->{warnings} || [] } } @loader_warnings;
if ($standard_sources) {
isa_ok( $rsobj35, "DBIx::Class::ResultSet" );
my @columns_lt2 = $class2->columns;
- is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent meta/ ], "Column Ordering" );
+ is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key can dbix_class_testcomponent meta/ ], "Column Ordering" );
+
+ is $class2->column_info('can')->{accessor}, 'caught_collision_can',
+ 'accessor for column name that conflicts with a UNIVERSAL method renamed based on col_collision_map';
is $class2->column_info('set_primary_key')->{accessor}, undef,
'accessor for column name that conflicts with a result base class method removed';
}
SKIP: {
- can_ok($rsobj1, 'dbix_class_testrscomponent')
- or skip "Pre-requisite test failed", 1;
- is( $rsobj1->dbix_class_testrscomponent,
- 'dbix_class_testrscomponent works',
- 'ResultSet component' );
- }
-
- SKIP: {
can_ok( $class1, 'loader_test1_classmeth' )
or skip "Pre-requisite test failed", 1;
is( $class1->loader_test1_classmeth, 'all is well', 'Class method' );
}
- SKIP: {
- can_ok( $rsobj1, 'loader_test1_rsmeth' )
- or skip "Pre-requisite test failed";
- is( $rsobj1->loader_test1_rsmeth, 'all is still well', 'Result set method' );
- }
-
ok( $class1->column_info('id')->{is_auto_increment}, 'is_auto_increment detection' );
my $obj = $rsobj1->find(1);
}
SKIP: {
- skip 'This vendor cannot do inline relationship definitions', 9
+ skip 'This vendor cannot do inline relationship definitions', 11
if $self->{no_inline_rels};
my $moniker12 = $monikers->{loader_test12};
my $obj12 = $rsobj12->find(1);
isa_ok( $obj12->loader_test13, $class13 );
+
+ # relname is preserved when another fk is added
+
+ skip 'Sybase cannot add FKs via ALTER TABLE', 2
+ if $self->{vendor} eq 'sybase';
+
+ {
+ local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /invalidates \d+ active statement/ };
+ $conn->storage->disconnect; # for mssql
+ }
+
+ isa_ok $rsobj3->find(1)->loader_test4zes, 'DBIx::Class::ResultSet';
+
+ $conn->storage->dbh->do('ALTER TABLE loader_test4 ADD fkid2 INTEGER REFERENCES loader_test3 (id)');
+
+ $conn->storage->disconnect; # for firebird
+
+ $self->rescan_without_warnings($conn);
+
+ isa_ok eval { $rsobj3->find(1)->loader_test4zes }, 'DBIx::Class::ResultSet',
+ 'relationship name preserved when another foreign key is added in remote table';
}
SKIP: {
find $find_cb, $DUMP_DIR;
# system "rm -f /tmp/before_rescan/* /tmp/after_rescan/*";
-# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/before_rescan";
+# system "cp $tdir/common_dump/DBIXCSL_Test/Schema/*.pm /tmp/before_rescan";
my $before_digest = $digest->b64digest;
$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;
- warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
- };
-
- $dbh->do($_) for @statements_rescan;
- }
-
+ $dbh->do($_) for @statements_rescan;
$dbh->disconnect;
sleep 1;
- my @new = do {
- # kill the 'Dumping manual schema' warnings
- local $SIG{__WARN__} = sub {};
- $conn->rescan;
- };
+ my @new = $self->rescan_without_warnings($conn);
+
is_deeply(\@new, [ qw/LoaderTest30/ ], "Rescan");
# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/after_rescan";
$conn->storage->disconnect; # for Firebird
$conn->storage->dbh->do("DROP TABLE loader_test30");
- @new = do {
- local $SIG{__WARN__} = sub {};
- $conn->rescan;
- };
+ @new = $self->rescan_without_warnings($conn);
+
is_deeply(\@new, [], 'no new tables on rescan');
throws_ok { $conn->resultset('LoaderTest30') }
$self->test_data_types($conn);
# run extra tests
- $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run};
+ $self->{extra}{run}->($conn, $monikers, $classes, $self) if $self->{extra}{run};
$self->test_preserve_case($conn);
my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); # open quote, close quote
- my $dbh = $conn->storage->dbh;
-
- {
- # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..."
- local $SIG{__WARN__} = sub {
- my $msg = shift;
- warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
- };
+ my $dbh = $self->dbconnect;
- $dbh->do($_) for (
+ $dbh->do($_) for (
qq|
CREATE TABLE ${oqt}LoaderTest40${cqt} (
${oqt}Id${cqt} INTEGER NOT NULL PRIMARY KEY,
|,
qq| INSERT INTO ${oqt}LoaderTest40${cqt} VALUES (1, 'foo') |,
qq| INSERT INTO ${oqt}LoaderTest41${cqt} VALUES (1, 1) |,
- );
- }
+ );
$conn->storage->disconnect;
local $conn->_loader->{preserve_case} = 1;
$conn->_loader->_setup;
- {
- local $SIG{__WARN__} = sub {};
- $conn->rescan;
- }
+
+ $self->rescan_without_warnings($conn);
if (not $self->{skip_rels}) {
is $conn->resultset('LoaderTest41')->find(1)->loader_test40->foo3_bar, 'foo',
dat VARCHAR(32) NOT NULL,
dat2 VARCHAR(32) NOT NULL,
set_primary_key INTEGER $self->{null},
+ can INTEGER $self->{null},
dbix_class_testcomponent INTEGER $self->{null},
meta INTEGER $self->{null},
UNIQUE (dat2, dat)
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->{pre_create} || [] };
$dbh->do($_) foreach (@statements);
for (1,2) {
my $dbh = $self->dbconnect(0);
- {
- local $SIG{__WARN__} = sub {}; # postgres notices
- $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
- }
+ $dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
$dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
my @size = split /,/, $size;
# some DBs don't like very long column names
- if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle)\z/i) {
+ if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle|db2)\z/i) {
my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
$type_alias = substr $col_def, 0, 15;
return $test_count;
}
+sub rescan_without_warnings {
+ my ($self, $conn) = @_;
+
+ local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ RESCAN_WARNINGS };
+ return $conn->rescan;
+}
+
sub DESTROY {
my $self = shift;
unless ($ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) {
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff