X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=4a15356636d5a4661ddd0ada1f61c6b18b16b38c;hb=b46b85376ad7ff53fa4ec4350a19b4514c4e0d3b;hp=7e69eea732b6fc7528cfe60de08f505d66924ad4;hpb=1888e80fedfddd48e33f6e11620b6ac9f505efb1;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index 7e69eea..4a15356 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -7,6 +7,10 @@ BEGIN {
     require warnings and warnings->import;
     require strict and strict->import;
   }
+
+  # Temporary to satisfy TempExtlib under tests
+  require DBIx::Class::StartupCheck
+    if $0 =~ /\.t$/;
 }
 
 sub croak {
@@ -47,9 +51,9 @@ my $dbic_reqs = {
   },
 
   # a common placeholder for engines with IC::DT support based off DT::F::S
-  _icdt_strptime_based => {
+  _ic_dt_strptime_based => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Strptime' => '1.2',
         },
@@ -80,6 +84,7 @@ my $dbic_reqs = {
       'Class::Unload' => '0.07',
       'Time::Piece' => '0',
       'Time::Piece::MySQL' => '0',
+      'DBD::mysql' => '4.023',
     },
   },
 
@@ -98,8 +103,18 @@ my $dbic_reqs = {
     },
   },
 
+  config_file_reader => {
+    pod => {
+      title => 'Generic config reader',
+      desc => 'Modules required for generic config file parsing, currently Config::Any (rarely used at runtime)',
+    },
+    req => {
+      'Config::Any' => '0.20',
+    },
+  },
+
   admin => {
-    include => '_json_any',
+    include => [qw( _json_any config_file_reader )],
     req => {
       %$moose_basic,
       'MooseX::Types::Path::Class' => '0.05',
@@ -133,9 +148,20 @@ my $dbic_reqs = {
     },
   },
 
-  icdt => {
+  ic_file => {
+    req => {
+      'Path::Class' => '0.18',
+    },
+    pod => {
+      title => 'DBIx::Class::InflateColumn::File (Deprecated)',
+      desc => 'Modules required for the deprecated L<DBIx::Class::InflateColumn::File>',
+    },
+  },
+
+  ic_dt => {
     req => {
       'DateTime' => '0.55',
+      'DateTime::TimeZone::OlsonDB' => 0,
     },
     pod => {
       title => 'InflateColumn::DateTime support',
@@ -156,7 +182,6 @@ my $dbic_reqs = {
 
   cdbicompat => {
     req => {
-      'Class::Data::Inheritable' => '0',
       'Class::Trigger' => '0',
       'DBIx::ContextualFetch' => '0',
       'Clone' => '0.32',
@@ -224,6 +249,17 @@ my $dbic_reqs = {
     },
   },
 
+  binary_data => {
+    pod => {
+      title => 'Binary datatype support (certain RDBMS)',
+      desc =>
+        'Some RDBMS engines require specific versions of the respective DBD '
+      . 'driver for binary data support. Note that this group does not '
+      . 'require anything on its own, but instead is augmented by various '
+      . 'RDBMS-specific groups. See the documentation of each rbms_* group '
+      . 'for details',
+    },
+  },
 
   # this is just for completeness as SQLite
   # is a core dep of DBIC for testing
@@ -236,7 +272,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to SQLite',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::SQLite' => '0',
         },
@@ -246,10 +282,9 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  # not _-prefixed so that it will show up under req_group_list
-  icdt_pg => {
+  _ic_dt_pg_base => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Pg' => '0.16004',
         },
@@ -257,20 +292,30 @@ my $dbic_reqs = {
     },
   },
 
+  ic_dt_pg => {
+    include => [qw( ic_dt _ic_dt_pg_base )],
+  },
+
   rdbms_pg => {
-    include => 'icdt_pg',
+    include => '_ic_dt_pg_base',
     req => {
-      # when changing this list make sure to adjust xt/optional_deps.t
       'DBD::Pg' => 0,
     },
     pod => {
       title => 'PostgreSQL support',
       desc => 'Modules required to connect to PostgreSQL',
     },
+    augment => {
+      binary_data => {
+        req => {
+          'DBD::Pg' => '2.009002'
+        },
+      }
+    },
   },
 
   _rdbms_mssql_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_mssql_odbc => {
@@ -301,7 +346,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_msaccess_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_msaccess_odbc => {
@@ -322,10 +367,9 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  # not _-prefixed so that it will show up under req_group_list
-  icdt_mysql => {
+  _ic_dt_mysql_base => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::MySQL' => '0',
         },
@@ -333,8 +377,12 @@ my $dbic_reqs = {
     },
   },
 
+  ic_dt_mysql => {
+    include => [qw( ic_dt _ic_dt_mysql_base )],
+  },
+
   rdbms_mysql => {
-    include => 'icdt_mysql',
+    include => '_ic_dt_mysql_base',
     req => {
       'DBD::mysql' => 0,
     },
@@ -354,7 +402,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to Oracle',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Oracle' => '0',
         },
@@ -363,7 +411,7 @@ my $dbic_reqs = {
   },
 
   rdbms_ase => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Sybase' => 0,
     },
@@ -375,7 +423,7 @@ my $dbic_reqs = {
 
   _rdbms_db2_common => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::DB2' => '0',
         },
@@ -403,7 +451,7 @@ my $dbic_reqs = {
   },
 
   rdbms_informix => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Informix' => 0,
     },
@@ -414,7 +462,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_sqlanywhere_common => {
-    inclide => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_sqlanywhere => {
@@ -437,7 +485,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_firebird_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_firebird => {
@@ -490,13 +538,6 @@ my $dbic_reqs = {
       DBICTEST_PG_USER => 0,
       DBICTEST_PG_PASS => 0,
     ],
-    req => {
-      # the order does matter because the rdbms support group might require
-      # a different version that the test group
-      #
-      # when changing this list make sure to adjust xt/optional_deps.t
-      'DBD::Pg' => '2.009002',  # specific version to test bytea
-    },
   },
 
   test_rdbms_mssql_odbc => {
@@ -665,9 +706,19 @@ my $dbic_reqs = {
     # we need to run the dbicadmin so we can self-generate its POD
     # also we do not want surprises in case JSON::XS is in the path
     # so make sure we get an always-working JSON::Any
-    include => [qw( admin_script _json_xs_compatible_json_any )],
+    include => [qw(
+      admin_script
+      _json_xs_compatible_json_any
+      id_shortener
+      deploy
+      test_pod
+      test_podcoverage
+      test_whitespace
+      test_strictures
+    )],
     req => {
       'ExtUtils::MakeMaker' => '6.64',
+      'Module::Install'     => '1.06',
       'Pod::Inherit'        => '0.91',
     },
   },
@@ -808,7 +859,7 @@ sub modreq_missing_for {
     or return '';
 
   join ' ', map
-    { $reqs->{modreqs}{$_} ? qq("$_~>=$reqs->{modreqs}{$_}") : $_ }
+    { $reqs->{modreqs}{$_} ? "$_~$reqs->{modreqs}{$_}" : $_ }
     sort { lc($a) cmp lc($b) } keys %$modreq_errors
   ;
 }
@@ -823,7 +874,9 @@ sub skip_without {
   if ( my $err = $self->req_missing_for($groups) ) {
     my ($fn, $ln) = (caller(0))[1,2];
     $tb->skip("block in $fn around line $ln requires $err");
-    local $^W = 0;
+
+    BEGIN { ${^WARNING_BITS} = "" }
+
     last SKIP;
   }
 
@@ -861,7 +914,7 @@ sub __envvar_group_desc {
   join '/', @res;
 }
 
-my $groupname_re = qr/ [A-Z_a-z][0-9A-Z_a-z]* /x;
+my $groupname_re = qr/ [a-z_] [0-9_a-z]* /x;
 my $modname_re = qr/ [A-Z_a-z] [0-9A-Z_a-z]* (?:::[0-9A-Z_a-z]+)* /x;
 my $modver_re = qr/ [0-9]+ (?: \. [0-9]+ )? /x;
 
@@ -1106,6 +1159,9 @@ sub _errorlist_for_modreqs {
     my $v = $reqs->{$m};
 
     if (! exists $req_unavailability_cache{$m}{$v} ) {
+      # masking this off is important, as it may very well be
+      # a transient error
+      local $SIG{__DIE__} if $SIG{__DIE__};
       local $@;
       eval( "require $m;" . ( $v ? "$m->VERSION(q($v))" : '' ) );
       $req_unavailability_cache{$m}{$v} = $@;
@@ -1143,7 +1199,7 @@ sub _list_physically_missing_modules {
   }
 
   join ' ', map
-    { $modreqs->{$_} ? qq("$_~>=$modreqs->{$_}") : $_ }
+    { $modreqs->{$_} ? "$_~$modreqs->{$_}" : $_ }
     sort { lc($a) cmp lc($b) } @definitely_missing
   ;
 }
@@ -1166,16 +1222,12 @@ sub _gen_pod {
 "\n\n---------------------------------------------------------------------\n"
   ;
 
-  # do not ask for a recent version, use 1.x API calls
-  # this *may* execute on a smoker with old perl or whatnot
-  require File::Path;
-
   (my $modfn = __PACKAGE__ . '.pm') =~ s|::|/|g;
 
   (my $podfn = "$pod_dir/$modfn") =~ s/\.pm$/\.pod/;
-  (my $dir = $podfn) =~ s|/[^/]+$||;
 
-  File::Path::mkpath([$dir]);
+  require DBIx::Class::_Util;
+  DBIx::Class::_Util::mkdir_p( DBIx::Class::_Util::parent_dir( $podfn ) );
 
   my $sqltver = $class->req_list_for('deploy')->{'SQL::Translator'}
     or die "Hrmm? No sqlt dep?";
@@ -1221,7 +1273,7 @@ Somewhere in your build-file (e.g. L<ExtUtils::MakeMaker>'s F<Makefile.PL>):
 
   my %DBIC_DEPLOY_AND_ORACLE_DEPS = %{ eval {
     require $class;
-    $class->req_list_for([qw( deploy rdbms_oracle icdt )]);
+    $class->req_list_for([qw( deploy rdbms_oracle ic_dt )]);
   } || {} };
 
   \$EUMM_ARGS{PREREQ_PM} = {
@@ -1495,7 +1547,7 @@ For example if some of the requirements for C<deploy> are not available,
 the returned string could look like:
 EOC
 
-  push @chunks, qq{ "SQL::Translator~>=$sqltver" (see $class documentation for details)};
+  push @chunks, qq{ "SQL::Translator~$sqltver" (see $class documentation for details)};
 
   push @chunks, <<'EOC';
 The author is expected to prepend the necessary text to this message before
@@ -1520,7 +1572,7 @@ For instance if some of the requirements for C<deploy> are not available,
 the returned string could look like:
 EOC
 
-  push @chunks, qq{ "SQL::Translator~>=$sqltver"};
+  push @chunks, qq{ "SQL::Translator~$sqltver"};
 
   push @chunks, <<'EOC';