[Bast-commits] r4285 - in trunk/DBIx-Class-Validation: . lib/DBIx/Class t/lib/DBIC

[claco at dev.catalyst.perl.org]

Author: claco
Date: 2008-04-23 02:15:37 +0100 (Wed, 23 Apr 2008)
New Revision: 4285

Removed:
   trunk/DBIx-Class-Validation/Build.PL
Modified:
   trunk/DBIx-Class-Validation/
   trunk/DBIx-Class-Validation/Changes
   trunk/DBIx-Class-Validation/Makefile.PL
   trunk/DBIx-Class-Validation/lib/DBIx/Class/Validation.pm
   trunk/DBIx-Class-Validation/t/lib/DBIC/Test.pm
Log:
 r1538 at mbp:  claco | 2008-04-22 21:15:16 -0400
 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



Property changes on: trunk/DBIx-Class-Validation
___________________________________________________________________
Name: svk:merge
   - 58586828-bfeb-4a8b-ac3c-3302daf284f8:/local/DBIx-Class-Validation:1315
d21250e9-0eb8-4cf9-8d68-8684fda3ee2b:/local/DBIx-Class-Validation:1748
   + 58586828-bfeb-4a8b-ac3c-3302daf284f8:/local/DBIx-Class-Validation:1538
d21250e9-0eb8-4cf9-8d68-8684fda3ee2b:/local/DBIx-Class-Validation:1748

Deleted: trunk/DBIx-Class-Validation/Build.PL
===================================================================
--- trunk/DBIx-Class-Validation/Build.PL	2008-04-23 00:53:08 UTC (rev 4284)
+++ trunk/DBIx-Class-Validation/Build.PL	2008-04-23 01:15:37 UTC (rev 4285)
@@ -1,2 +0,0 @@
-# $Id$
-require 'Makefile.PL';

Modified: trunk/DBIx-Class-Validation/Changes
===================================================================
--- trunk/DBIx-Class-Validation/Changes	2008-04-23 00:53:08 UTC (rev 4284)
+++ trunk/DBIx-Class-Validation/Changes	2008-04-23 01:15:37 UTC (rev 4285)
@@ -1,5 +1,10 @@
 Revision history for DBIx::Class::Validation
 
+0.02003 Mon Apr 22 21: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.02002 Fri Mar 7 19:38:12 2008
     - Quick fix for CPANTS META/author
 

Modified: trunk/DBIx-Class-Validation/Makefile.PL
===================================================================
--- trunk/DBIx-Class-Validation/Makefile.PL	2008-04-23 00:53:08 UTC (rev 4284)
+++ trunk/DBIx-Class-Validation/Makefile.PL	2008-04-23 01:15:37 UTC (rev 4285)
@@ -18,7 +18,7 @@
     recommends
         'Data::FormValidator';
 
-tests "t/*.t t/*/*.t";
+tests 't/*.t';
 clean_files "DBIx-Class-Validation-* t/var";
 
 eval {

Modified: trunk/DBIx-Class-Validation/lib/DBIx/Class/Validation.pm
===================================================================
--- trunk/DBIx-Class-Validation/lib/DBIx/Class/Validation.pm	2008-04-23 00:53:08 UTC (rev 4284)
+++ trunk/DBIx-Class-Validation/lib/DBIx/Class/Validation.pm	2008-04-23 01:15:37 UTC (rev 4285)
@@ -2,7 +2,7 @@
 package DBIx::Class::Validation;
 use strict;
 use warnings;
-our $VERSION = '0.02002';
+our $VERSION = '0.02003';
 
 BEGIN {
     use base qw/DBIx::Class Class::Accessor::Grouped/;

Modified: trunk/DBIx-Class-Validation/t/lib/DBIC/Test.pm
===================================================================
--- trunk/DBIx-Class-Validation/t/lib/DBIC/Test.pm	2008-04-23 00:53:08 UTC (rev 4284)
+++ trunk/DBIx-Class-Validation/t/lib/DBIC/Test.pm	2008-04-23 01:15:37 UTC (rev 4285)
@@ -60,26 +60,16 @@
     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 = <IN>; }
-        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 = <IN>; }
+    close IN;
+    eval {
+        ($schema->storage->dbh->do($_) || print "Error on SQL: $_\n") for split(/;\n/, $sql);
     };
+    if ($@ && !$eval) {
+        die $@;
+    };
 };
 
 sub clear_schema {