X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=b8708b64e666d68941a76e51faa723476e119d27;hb=a5280453bd7fc86157fb4a84a451bddc2c408bf7;hp=e4988e83bc07f07ad9932cd2ba55f56a5a157675;hpb=b9d84a2d54694f5ff1a84b8707f2d6e6d1288c0a;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index e4988e8..b8708b6 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -38,7 +38,7 @@ my $datetime_basic = {
 };
 
 my $id_shortener = {
-  'Math::BigInt'                  => '1.89',
+  'Math::BigInt'                  => '1.80',
   'Math::Base36'                  => '0.07',
 };
 
@@ -76,6 +76,24 @@ my $rdbms_ase = {
 my $rdbms_db2 = {
   'DBD::DB2'                      => '0',
 };
+my $rdbms_db2_400 = {
+  'DBD::ODBC'                     => '0',
+};
+my $rdbms_informix = {
+  'DBD::Informix'                 => '0',
+};
+my $rdbms_sqlanywhere = {
+  'DBD::SQLAnywhere'              => '0',
+};
+my $rdbms_sqlanywhere_odbc = {
+  'DBD::ODBC'                     => '0',
+};
+my $rdbms_firebird = {
+  'DBD::Firebird'                 => '0',
+};
+my $rdbms_firebird_interbase = {
+  'DBD::InterBase'                => '0',
+};
 my $rdbms_firebird_odbc = {
   'DBD::ODBC'                     => '0',
 };
@@ -165,7 +183,7 @@ my $reqs = {
 
   test_eol => {
     req => {
-      'Test::EOL'                 => '0.6',
+      'Test::EOL'                 => '1.0',
     },
   },
 
@@ -213,11 +231,10 @@ my $reqs = {
 
   test_cdbicompat => {
     req => {
-      'DBIx::ContextualFetch'     => '0',
+      'Class::DBI' => 0,
       'Class::DBI::Plugin::DeepAbstractSearch' => '0',
-      'Class::Trigger'            => '0',
+      %$datetime_basic,
       'Time::Piece::MySQL'        => '0',
-      'Clone'                     => '0',
       'Date::Simple'              => '3.03',
     },
   },
@@ -236,6 +253,7 @@ my $reqs = {
 
   rdbms_pg => {
     req => {
+      # when changing this list make sure to adjust xt/optional_deps.t
       %$rdbms_pg,
     },
     pod => {
@@ -334,12 +352,83 @@ my $reqs = {
     },
   },
 
+  rdbms_db2_400 => {
+    req => {
+      %$rdbms_db2_400,
+    },
+    pod => {
+      title => 'DB2 on AS/400 support',
+      desc => 'Modules required to connect to DB2 on AS/400',
+    },
+  },
+
+  rdbms_informix => {
+    req => {
+      %$rdbms_informix,
+    },
+    pod => {
+      title => 'Informix support',
+      desc => 'Modules required to connect to Informix',
+    },
+  },
+
+  rdbms_sqlanywhere => {
+    req => {
+      %$rdbms_sqlanywhere,
+    },
+    pod => {
+      title => 'SQLAnywhere support',
+      desc => 'Modules required to connect to SQLAnywhere',
+    },
+  },
+
+  rdbms_sqlanywhere_odbc => {
+    req => {
+      %$rdbms_sqlanywhere_odbc,
+    },
+    pod => {
+      title => 'SQLAnywhere support via DBD::ODBC',
+      desc => 'Modules required to connect to SQLAnywhere via DBD::ODBC',
+    },
+  },
+
+  rdbms_firebird => {
+    req => {
+      %$rdbms_firebird,
+    },
+    pod => {
+      title => 'Firebird support',
+      desc => 'Modules required to connect to Firebird',
+    },
+  },
+
+  rdbms_firebird_interbase => {
+    req => {
+      %$rdbms_firebird_interbase,
+    },
+    pod => {
+      title => 'Firebird support via DBD::InterBase',
+      desc => 'Modules required to connect to Firebird via DBD::InterBase',
+    },
+  },
+
+  rdbms_firebird_odbc => {
+    req => {
+      %$rdbms_firebird_odbc,
+    },
+    pod => {
+      title => 'Firebird support via DBD::ODBC',
+      desc => 'Modules required to connect to Firebird via DBD::ODBC',
+    },
+  },
+
 # the order does matter because the rdbms support group might require
 # a different version that the test group
   test_rdbms_pg => {
     req => {
       $ENV{DBICTEST_PG_DSN}
         ? (
+          # when changing this list make sure to adjust xt/optional_deps.t
           %$rdbms_pg,
           ($^O ne 'MSWin32' ? ('Sys::SigAction' => '0') : ()),
           'DBD::Pg'               => '2.009002',
@@ -434,6 +523,60 @@ my $reqs = {
     },
   },
 
+  test_rdbms_db2_400 => {
+    req => {
+      $ENV{DBICTEST_DB2_400_DSN}
+        ? (
+          %$rdbms_db2_400,
+        ) : ()
+    },
+  },
+
+  test_rdbms_informix => {
+    req => {
+      $ENV{DBICTEST_INFORMIX_DSN}
+        ? (
+          %$rdbms_informix,
+        ) : ()
+    },
+  },
+
+  test_rdbms_sqlanywhere => {
+    req => {
+      $ENV{DBICTEST_SQLANYWHERE_DSN}
+        ? (
+          %$rdbms_sqlanywhere,
+        ) : ()
+    },
+  },
+
+  test_rdbms_sqlanywhere_odbc => {
+    req => {
+      $ENV{DBICTEST_SQLANYWHERE_ODBC_DSN}
+        ? (
+          %$rdbms_sqlanywhere_odbc,
+        ) : ()
+    },
+  },
+
+  test_rdbms_firebird => {
+    req => {
+      $ENV{DBICTEST_FIREBIRD_DSN}
+        ? (
+          %$rdbms_firebird,
+        ) : ()
+    },
+  },
+
+  test_rdbms_firebird_interbase => {
+    req => {
+      $ENV{DBICTEST_FIREBIRD_INTERBASE_DSN}
+        ? (
+          %$rdbms_firebird_interbase,
+        ) : ()
+    },
+  },
+
   test_rdbms_firebird_odbc => {
     req => {
       $ENV{DBICTEST_FIREBIRD_ODBC_DSN}
@@ -520,7 +663,6 @@ sub _check_deps {
     if (keys %errors) {
       my $missing = join (', ', map { $deps->{$_} ? "$_ >= $deps->{$_}" : $_ } (sort keys %errors) );
       $missing .= " (see $class for details)" if $reqs->{$group}{pod};
-      $missing .= "\n";
       $res = {
         status => 0,
         errorlist => \%errors,