[Bast-commits] r4283 - in trunk/DBIx-Class-UUIDColumns: . lib/DBIx/Class t/lib/DBIC

[claco at dev.catalyst.perl.org]

Author: claco
Date: 2008-04-23 01:51:29 +0100 (Wed, 23 Apr 2008)
New Revision: 4283

Removed:
   trunk/DBIx-Class-UUIDColumns/Build.PL
Modified:
   trunk/DBIx-Class-UUIDColumns/
   trunk/DBIx-Class-UUIDColumns/Changes
   trunk/DBIx-Class-UUIDColumns/Makefile.PL
   trunk/DBIx-Class-UUIDColumns/lib/DBIx/Class/UUIDColumns.pm
   trunk/DBIx-Class-UUIDColumns/t/lib/DBIC/Test.pm
Log:
 r1536 at mbp:  claco | 2008-04-22 20:51:01 -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-UUIDColumns
___________________________________________________________________
Name: svk:merge
   - 58586828-bfeb-4a8b-ac3c-3302daf284f8:/local/DBIx-Class-UUIDColumns:1345
d21250e9-0eb8-4cf9-8d68-8684fda3ee2b:/local/DBIx-Class-UUIDColumns:1638
e19faa6c-ac33-4258-b272-ecd763fae5b6:/local/DBIx-Class-UUIDColumns:30
   + 58586828-bfeb-4a8b-ac3c-3302daf284f8:/local/DBIx-Class-UUIDColumns:1536
d21250e9-0eb8-4cf9-8d68-8684fda3ee2b:/local/DBIx-Class-UUIDColumns:1638
e19faa6c-ac33-4258-b272-ecd763fae5b6:/local/DBIx-Class-UUIDColumns:30

Deleted: trunk/DBIx-Class-UUIDColumns/Build.PL
===================================================================
--- trunk/DBIx-Class-UUIDColumns/Build.PL	2008-04-22 19:18:08 UTC (rev 4282)
+++ trunk/DBIx-Class-UUIDColumns/Build.PL	2008-04-23 00:51:29 UTC (rev 4283)
@@ -1,2 +0,0 @@
-# $Id$
-require 'Makefile.PL';

Modified: trunk/DBIx-Class-UUIDColumns/Changes
===================================================================
--- trunk/DBIx-Class-UUIDColumns/Changes	2008-04-22 19:18:08 UTC (rev 4282)
+++ trunk/DBIx-Class-UUIDColumns/Changes	2008-04-23 00:51:29 UTC (rev 4283)
@@ -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

Modified: trunk/DBIx-Class-UUIDColumns/Makefile.PL
===================================================================
--- trunk/DBIx-Class-UUIDColumns/Makefile.PL	2008-04-22 19:18:08 UTC (rev 4282)
+++ trunk/DBIx-Class-UUIDColumns/Makefile.PL	2008-04-23 00:51:29 UTC (rev 4283)
@@ -31,7 +31,7 @@
 recommends 'Win32::Guidgen';
 recommends 'Win32API::GUID';
 
-tests "t/*.t t/*/*.t";
+tests 't/*.t';
 clean_files "DBIx-Class-UUIDColumns-* t/var";
 
 eval {

Modified: trunk/DBIx-Class-UUIDColumns/lib/DBIx/Class/UUIDColumns.pm
===================================================================
--- trunk/DBIx-Class-UUIDColumns/lib/DBIx/Class/UUIDColumns.pm	2008-04-22 19:18:08 UTC (rev 4282)
+++ trunk/DBIx-Class-UUIDColumns/lib/DBIx/Class/UUIDColumns.pm	2008-04-23 00:51:29 UTC (rev 4283)
@@ -14,7 +14,7 @@
 # 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;

Modified: trunk/DBIx-Class-UUIDColumns/t/lib/DBIC/Test.pm
===================================================================
--- trunk/DBIx-Class-UUIDColumns/t/lib/DBIC/Test.pm	2008-04-22 19:18:08 UTC (rev 4282)
+++ trunk/DBIx-Class-UUIDColumns/t/lib/DBIC/Test.pm	2008-04-23 00:51:29 UTC (rev 4283)
@@ -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 {