use warnings;
use Test::More;
+use Test::Exception;
use DBIx::Class::Schema::Loader;
use Class::Unload;
use File::Path;
my $extra_count = $self->{extra}{count} || 0;
- plan tests => @connect_info * (176 + $extra_count + ($self->{data_type_tests}{test_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->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};
+ {
+ # 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($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} || [] };
my @columns_lt2 = $class2->columns;
is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent/ ], "Column Ordering" );
- is $class2->column_info('set_primary_key')->{accessor}, 'Set_primary_key',
- 'accessor for column name that conflicts with a result base class method renamed';
+ 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}, 'Dbix_class_testcomponent',
- 'accessor for column name that conflicts with a component class method renamed';
+ 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;
}
# 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($rsobj30->result_source->column_info('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->test_data_types($conn);
id $self->{auto_inc_pk},
dat VARCHAR(32) NOT NULL,
dat2 VARCHAR(32) NOT NULL,
- set_primary_key INTEGER,
- dbix_class_testcomponent INTEGER,
+ set_primary_key INTEGER $self->{null},
+ dbix_class_testcomponent INTEGER $self->{null},
UNIQUE (dat2, dat)
) $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 = (
# 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);
my %seen_col_names;
while (my ($col_def, $expected_info) = each %$types) {
- (my $type_alias = lc($col_def)) =~ s/\( ([^)]+) \)//xg;
+ (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg;
my $size = $1;
$size = '' unless defined $size;
$col_name .= "_sz_$size_name";
}
- $col_name .= "_$seen_col_names{$col_name}" if $seen_col_names{$col_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";