(optdeps) Rename an inconsistent 'icdt' marker to 'ic_dt' before we've shipped it

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Optional / Dependencies.pm

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index d1d8bba..600a48e 100644 (file)
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -2,8 +2,12 @@ package DBIx::Class::Optional::Dependencies;
 
 ### This may look crazy, but it in fact tangibly ( by 50(!)% ) shortens
 #   the skip-test time when everything requested is unavailable
-use if $ENV{RELEASE_TESTING} => 'warnings';
-use if $ENV{RELEASE_TESTING} => 'strict';
+BEGIN {
+  if ( $ENV{RELEASE_TESTING} ) {
+    require warnings and warnings->import;
+    require strict and strict->import;
+  }
+}
 
 sub croak {
   require Carp;
@@ -43,9 +47,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',
         },
@@ -129,7 +133,7 @@ my $dbic_reqs = {
     },
   },
 
-  icdt => {
+  ic_dt => {
     req => {
       'DateTime' => '0.55',
     },
@@ -232,7 +236,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to SQLite',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::SQLite' => '0',
         },
@@ -242,10 +246,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',
         },
@@ -253,8 +256,12 @@ 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,
@@ -266,7 +273,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_mssql_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_mssql_odbc => {
@@ -297,7 +304,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_msaccess_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_msaccess_odbc => {
@@ -318,10 +325,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',
         },
@@ -329,8 +335,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,
     },
@@ -350,7 +360,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to Oracle',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Oracle' => '0',
         },
@@ -359,7 +369,7 @@ my $dbic_reqs = {
   },
 
   rdbms_ase => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Sybase' => 0,
     },
@@ -371,7 +381,7 @@ my $dbic_reqs = {
 
   _rdbms_db2_common => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::DB2' => '0',
         },
@@ -399,7 +409,7 @@ my $dbic_reqs = {
   },
 
   rdbms_informix => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Informix' => 0,
     },
@@ -410,7 +420,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_sqlanywhere_common => {
-    inclide => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_sqlanywhere => {
@@ -433,7 +443,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_firebird_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_firebird => {
@@ -804,7 +814,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
   ;
 }
@@ -1139,7 +1149,7 @@ sub _list_physically_missing_modules {
   }
 
   join ' ', map
-    { $modreqs->{$_} ? qq("$_~>=$modreqs->{$_}") : $_ }
+    { $modreqs->{$_} ? "$_~$modreqs->{$_}" : $_ }
     sort { lc($a) cmp lc($b) } @definitely_missing
   ;
 }
@@ -1217,7 +1227,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} = {
@@ -1491,7 +1501,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
@@ -1516,7 +1526,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';