Skip to content

Commit

Permalink
(optdeps) Rename an inconsistent 'icdt' marker to 'ic_dt' before we'v…
Browse files Browse the repository at this point in the history
…e shipped it
  • Loading branch information
ribasushi committed May 22, 2015
1 parent ba31911 commit 54a9a08
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Changes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Revision history for DBIx::Class
* New Features
- DBIx::Class::Optional::Dependencies now properly understands
combinations of requirements and does the right thing with e.g.
->req_list_for([qw( rdbms_oracle icdt )]) bringing in the Oracle
->req_list_for([qw( rdbms_oracle ic_dt )]) bringing in the Oracle
specific DateTime::Format dependencies

* Fixes
Expand Down
46 changes: 23 additions & 23 deletions lib/DBIx/Class/Optional/Dependencies.pm
Original file line number Diff line number Diff line change
Expand Up @@ -47,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',
},
Expand Down Expand Up @@ -133,7 +133,7 @@ my $dbic_reqs = {
},
},

icdt => {
ic_dt => {
req => {
'DateTime' => '0.55',
'DateTime::TimeZone::OlsonDB' => 0,
Expand Down Expand Up @@ -237,7 +237,7 @@ my $dbic_reqs = {
desc => 'Modules required to connect to SQLite',
},
augment => {
icdt => {
ic_dt => {
req => {
'DateTime::Format::SQLite' => '0',
},
Expand All @@ -247,22 +247,22 @@ 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
_icdt_pg_base => {
_ic_dt_pg_base => {
augment => {
icdt => {
ic_dt => {
req => {
'DateTime::Format::Pg' => '0.16004',
},
},
},
},

icdt_pg => {
include => [qw( icdt _icdt_pg_base )],
ic_dt_pg => {
include => [qw( ic_dt _ic_dt_pg_base )],
},

rdbms_pg => {
include => '_icdt_pg_base',
include => '_ic_dt_pg_base',
req => {
# when changing this list make sure to adjust xt/optional_deps.t
'DBD::Pg' => 0,
Expand All @@ -274,7 +274,7 @@ my $dbic_reqs = {
},

_rdbms_mssql_common => {
include => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
},

rdbms_mssql_odbc => {
Expand Down Expand Up @@ -305,7 +305,7 @@ my $dbic_reqs = {
},

_rdbms_msaccess_common => {
include => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
},

rdbms_msaccess_odbc => {
Expand All @@ -326,22 +326,22 @@ 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
_icdt_mysql_base => {
_ic_dt_mysql_base => {
augment => {
icdt => {
ic_dt => {
req => {
'DateTime::Format::MySQL' => '0',
},
},
},
},

icdt_mysql => {
include => [qw( icdt _icdt_mysql_base )],
ic_dt_mysql => {
include => [qw( ic_dt _ic_dt_mysql_base )],
},

rdbms_mysql => {
include => '_icdt_mysql_base',
include => '_ic_dt_mysql_base',
req => {
'DBD::mysql' => 0,
},
Expand All @@ -361,7 +361,7 @@ my $dbic_reqs = {
desc => 'Modules required to connect to Oracle',
},
augment => {
icdt => {
ic_dt => {
req => {
'DateTime::Format::Oracle' => '0',
},
Expand All @@ -370,7 +370,7 @@ my $dbic_reqs = {
},

rdbms_ase => {
include => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
req => {
'DBD::Sybase' => 0,
},
Expand All @@ -382,7 +382,7 @@ my $dbic_reqs = {

_rdbms_db2_common => {
augment => {
icdt => {
ic_dt => {
req => {
'DateTime::Format::DB2' => '0',
},
Expand Down Expand Up @@ -410,7 +410,7 @@ my $dbic_reqs = {
},

rdbms_informix => {
include => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
req => {
'DBD::Informix' => 0,
},
Expand All @@ -421,7 +421,7 @@ my $dbic_reqs = {
},

_rdbms_sqlanywhere_common => {
inclide => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
},

rdbms_sqlanywhere => {
Expand All @@ -444,7 +444,7 @@ my $dbic_reqs = {
},

_rdbms_firebird_common => {
include => '_icdt_strptime_based',
include => '_ic_dt_strptime_based',
},

rdbms_firebird => {
Expand Down Expand Up @@ -1238,7 +1238,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} = {
Expand Down
2 changes: 1 addition & 1 deletion t/52leaks.t
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if ( !$ENV{DBICTEST_VIA_REPLICATED} and !DBICTest::RunMode->is_plain ) {
# Load them and empty the registry

# this loads the DT armada
$has_dt = DBIx::Class::Optional::Dependencies->req_ok_for([qw( test_rdbms_sqlite icdt )]);
$has_dt = DBIx::Class::Optional::Dependencies->req_ok_for([qw( test_rdbms_sqlite ic_dt )]);

require Errno;
require DBI;
Expand Down
2 changes: 1 addition & 1 deletion t/cdbi/68-inflate_has_a.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt cdbicompat );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt cdbicompat );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/cdbi/70_implicit_inflate.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( cdbicompat rdbms_sqlite icdt );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( cdbicompat rdbms_sqlite ic_dt );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/cdbi/set_to_undef.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt cdbicompat );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt cdbicompat );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/cdbi/set_vs_DateTime.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt cdbicompat );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt cdbicompat );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/core.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( test_rdbms_sqlite icdt );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( test_rdbms_sqlite ic_dt );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/firebird.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt _rdbms_firebird_common );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt _rdbms_firebird_common );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/informix.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt test_rdbms_informix );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt test_rdbms_informix );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/msaccess.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt _rdbms_msaccess_common );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt _rdbms_msaccess_common );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/mssql.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt _rdbms_mssql_common );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt _rdbms_mssql_common );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/oracle.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt test_rdbms_oracle );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt test_rdbms_oracle );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/sqlanywhere.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt _rdbms_sqlanywhere_common );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt _rdbms_sqlanywhere_common );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/sqlite.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt test_rdbms_sqlite );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt test_rdbms_sqlite );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/engine_specific/sybase.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt test_rdbms_ase );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt test_rdbms_ase );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/offline_mysql.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt_mysql );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt_mysql );

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/icdt/offline_pg.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt_pg );
use DBIx::Class::Optional::Dependencies -skip_all_without => qw( ic_dt_pg );

use strict;
use warnings;
Expand Down
4 changes: 2 additions & 2 deletions xt/extra/internals/optional_deps.t
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ is_deeply (
# ICDT augmentation
my %expected_icdt_base = ( DateTime => '0.55', 'DateTime::TimeZone::OlsonDB' => 0 );

my $mysql_icdt = [shuffle qw( test_rdbms_mysql icdt )];
my $mysql_icdt = [shuffle qw( test_rdbms_mysql ic_dt )];

is_deeply(
DBIx::Class::Optional::Dependencies->modreq_list_for($mysql_icdt),
Expand All @@ -222,7 +222,7 @@ is_deeply (
# test multi-level include with a variable and mandatory part converging on same included dep
local $ENV{DBICTEST_MSACCESS_ODBC_DSN};
local $ENV{DBICTEST_MSSQL_ODBC_DSN} = 'foo';
my $msaccess_mssql_icdt = [ shuffle qw( test_rdbms_msaccess_odbc test_rdbms_mssql_odbc icdt ) ];
my $msaccess_mssql_icdt = [ shuffle qw( test_rdbms_msaccess_odbc test_rdbms_mssql_odbc ic_dt ) ];
is_deeply(
DBIx::Class::Optional::Dependencies->req_missing_for($msaccess_mssql_icdt),
'Data::GUID DateTime~0.55 DateTime::Format::Strptime~1.2 DateTime::TimeZone::OlsonDB DBD::ODBC as well as the following group(s) of environment variables: DBICTEST_MSACCESS_ODBC_DSN/..._USER/..._PASS',
Expand Down

0 comments on commit 54a9a08

Please sign in to comment.