From: Peter Rabbitson Date: Tue, 7 Oct 2008 14:02:04 +0000 (+0000) Subject: Merge 'warnfree' into 'trunk' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f6ace68909db2a277f2eebece48a149b4e3da293;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'warnfree' into 'trunk' Another round of warning-squashing: Fix source registration/unregistration in several places Accomodate postgres being really load on CREATE Move the taint tests to a non-mainstream schema - hopefully this one will not be disturbed for a while Fix warning due to File::Copy being sloppy Test for TxnScopeGuard warnings Test for multiple register_class warnings Blindly silence a weird warning within a TODO in t/47bind_attribute.t. Hopefully when the TODO is resolved, it will be obvious what was causing it --- f6ace68909db2a277f2eebece48a149b4e3da293 diff --cc lib/DBIx/Class/InflateColumn/File.pm index d462bcc,9687f94..78e316b --- a/lib/DBIx/Class/InflateColumn/File.pm +++ b/lib/DBIx/Class/InflateColumn/File.pm @@@ -95,8 -95,8 +95,10 @@@ sub _save_file_column my $fs_file = $self->_file_column_file($column, $value->{filename}); mkpath [$fs_file->dir]; -- - File::Copy::copy($value->{handle}, $fs_file); - File::Copy::copy($value->{handle}, $fs_file->stringify); # File::Copy doesn't like Path::Class (or any for that matter) objects ++ ++ # File::Copy doesn't like Path::Class (or any for that matter) objects, ++ # thus ->stringify (http://rt.perl.org/rt3/Public/Bug/Display.html?id=59650) ++ File::Copy::copy($value->{handle}, $fs_file->stringify); $self->_file_column_callback($value, $self, $column); diff --cc t/93storage_replication.t index 07e696a,0293804..ab2ffe4 --- a/t/93storage_replication.t +++ b/t/93storage_replication.t @@@ -59,10 -59,9 +59,13 @@@ TESTSCHEMACLASSES: ## Get the Schema and set the replication storage type sub init_schema { ++ # current SQLT SQLite producer does not handle DROP TABLE IF EXISTS, trap warnings here ++ local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /no such table.+DROP TABLE/ }; ++ my $class = shift @_; -- ++ my $schema = DBICTest->init_schema( + sqlite_use_file => 1, storage_type=>{ '::DBI::Replicated' => { balancer_type=>'::Random',