From: Christopher H. Laco Date: Wed, 23 Apr 2008 00:51:29 +0000 (+0000) Subject: Fix test failure under SQL::Translator <= 0.07 X-Git-Tag: v0.02004^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7edcccc1b8f7253f2c2ebce838dcdc20ea8246db;p=dbsrgits%2FDBIx-Class-UUIDColumns.git Fix test failure under SQL::Translator <= 0.07 Removed Build.PL now that Module::Install no longer supports it Removed bogus tests entry in Makefile.PL --- diff --git a/Build.PL b/Build.PL deleted file mode 100644 index e66d269..0000000 --- a/Build.PL +++ /dev/null @@ -1,2 +0,0 @@ -# $Id$ -require 'Makefile.PL'; diff --git a/Changes b/Changes index 23cfd44..a7e34b8 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,11 @@ Revision history for DBIx::Class::UUIDColumns -0.02003 Fri MAr 7 19:52:56 2008 +0.02004 Mon Apr 22 20:41:23 2008 + - Fix test failure under SQL::Translator <= 0.07 + - Removed Build.PL now that Module::Install no longer supports it + - Removed bogus tests entry in Makefile.PL + +0.02003 Fri Mar 7 19:52:56 2008 - Quick fix for CPANTS META/author 0.02002 Mon Sep 24 23:14:45 2007 diff --git a/Makefile.PL b/Makefile.PL index 7005fbb..c353ac5 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -31,7 +31,7 @@ recommends 'UUID'; recommends 'Win32::Guidgen'; recommends 'Win32API::GUID'; -tests "t/*.t t/*/*.t"; +tests 't/*.t'; clean_files "DBIx-Class-UUIDColumns-* t/var"; eval { diff --git a/lib/DBIx/Class/UUIDColumns.pm b/lib/DBIx/Class/UUIDColumns.pm index 2245def..768ab15 100644 --- a/lib/DBIx/Class/UUIDColumns.pm +++ b/lib/DBIx/Class/UUIDColumns.pm @@ -14,7 +14,7 @@ __PACKAGE__->uuid_class(__PACKAGE__->_find_uuid_module); # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -$VERSION = '0.02003'; +$VERSION = '0.02004'; sub uuid_columns { my $self = shift; diff --git a/t/lib/DBIC/Test.pm b/t/lib/DBIC/Test.pm index e34e705..6fa93c9 100644 --- a/t/lib/DBIC/Test.pm +++ b/t/lib/DBIC/Test.pm @@ -60,25 +60,15 @@ sub deploy_schema { my ($self, $schema, %options) = @_; my $eval = $options{'eval_deploy'}; - eval 'use SQL::Translator'; - if (!$@ && !$options{'no_deploy'}) { - eval { - $schema->deploy(); - }; - if ($@ && !$eval) { - die $@; - }; - } else { - open IN, catfile('t', 'sql', 'test.sqlite.sql'); - my $sql; - { local $/ = undef; $sql = ; } - close IN; - eval { - ($schema->storage->dbh->do($_) || print "Error on SQL: $_\n") for split(/;\n/, $sql); - }; - if ($@ && !$eval) { - die $@; - }; + open IN, catfile('t', 'sql', 'test.sqlite.sql'); + my $sql; + { local $/ = undef; $sql = ; } + close IN; + eval { + ($schema->storage->dbh->do($_) || print "Error on SQL: $_\n") for split(/;\n/, $sql); + }; + if ($@ && !$eval) { + die $@; }; };