Changeset 429

Timestamp:

05/11/08 13:58:49 (4 years ago)

Author:

dom

Message:

Add missing prereq of DBI (caught by the CPAN testers) and don't
use DBI in Makefile.PL

Location:

wiki-toolkit/trunk

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (3 diffs)
• lib/Wiki/Toolkit/TestLib.pm (modified) (5 diffs)

wiki-toolkit/trunk/Changes

@@ -13 +13 @@
         Fix test suite's incorrect passing of DBIxFTSMySQL connection
           parameters
+        Add missing prereq of DBI (caught by the CPAN testers) and don't
+          use DBI in Makefile.PL
 
 0.74    9  June 2007

wiki-toolkit/trunk/Makefile.PL

@@ -1 +1 @@
 use ExtUtils::MakeMaker;
-use DBI;
 use Data::Dumper;
 use strict;
@@ -76 +75 @@
 
     # Finally ask questions; then check the settings work.
-    my %dsn_prefix = ( MySQL => "dbi:mysql:",
-                       Pg    => "dbi:Pg:dbname=" );
     my %driver = ( MySQL => "DBD::mysql",
                    Pg    => "DBD::Pg" );
@@ -106 +103 @@
             undef $dbhost unless ($dbhost and $dbhost ne "undef");
 
-            # Check that these connection parameters actually work.
-            my $dsn = $dsn_prefix{$store_type}.$dbname;
-            $dsn .= ";host=$dbhost" if $dbhost;
-            my $dbh = eval { DBI->connect($dsn,
-                                          $dbuser, $dbpass, {PrintError => 1})
-                                 or die DBI->errstr;
-                           };
-            die "\nCan't connect to $store_type with those parameters:"
-                     . "\n" . $@ . "\n\n"
-                     . "Please re-run 'perl Makefile.PL' and supply correct "
-                     . "parameters.\n\n" if $@;
-            $dbh->disconnect;
-
-            # Save them if they do.
             $config{$store_type}{dbname} = $dbname;
             $config{$store_type}{dbuser} = $dbuser;

wiki-toolkit/trunk/lib/Wiki/Toolkit/TestLib.pm

@@ -5 +5 @@
 use Wiki::Toolkit;
 use Wiki::Toolkit::TestConfig;
+use DBI;
 
 use vars qw( $VERSION @wiki_info );
@@ -43 +44 @@
 
 my %datastore_info;
+
+my %dsn_prefix = ( MySQL  => "dbi:mysql:",
+                   Pg     => "dbi:Pg:dbname=",
+                   SQLite => "dbi:SQLite:dbname=");
+
 foreach my $dbtype (qw( MySQL Pg SQLite )) {
     if ( $configured{$dbtype}{dbname} ) {
@@ -48 +54 @@
         my $store_class = "Wiki::Toolkit::Store::$dbtype";
         my $setup_class = "Wiki::Toolkit::Setup::$dbtype";
+        my $dsn = $dsn_prefix{$dbtype}.$config{dbname};
+        my $err;
+        if ($err = _test_dsn( $dsn, $config{dbuser}, $config{dbpass}, $config{dbhost})) {
+            warn "connecting to test $dbtype database failed: $err\n";
+            warn "will skip $dbtype tests\n";
+            next;
+        }
         $datastore_info{$dbtype} = {
                                      class  => $store_class,
@@ -258 +271 @@
 }
 
+sub _test_dsn {
+    my ( $dsn, $dbuser, $dbpass, $dbhost ) = @_;
+    $dsn .= ";host=$dbhost" if $dbhost;
+    my $dbh = eval {
+        DBI->connect($dsn, $dbuser, $dbpass, {RaiseError => 1});
+    };
+    return $@;
+}
+
+
 =back
 
@@ -271 +294 @@
 
      Copyright (C) 2003-2004 Kake Pugh.  All Rights Reserved.
+     Copyright (C) 2008 the Wiki::Toolkit team. All Rights Reserved.
 
 This module is free software; you can redistribute it and/or modify it