X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=a7ab5e5bc37e1c39b7fd41bf99f47cc41f2c3925;hb=25c1ed5f32dfcefdc12df885669e1dcf9baabbe9;hp=4f71084b7b8921b1e863fd8bd29ebd7ca1816b99;hpb=0d1e52803869860b29a06f33afeb4c8f922ba8c9;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm index 4f71084..a7ab5e5 100644 --- a/lib/DBIx/Class/Optional/Dependencies.pm +++ b/lib/DBIx/Class/Optional/Dependencies.pm @@ -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', }, @@ -80,6 +80,7 @@ my $dbic_reqs = { 'Class::Unload' => '0.07', 'Time::Piece' => '0', 'Time::Piece::MySQL' => '0', + 'DBD::mysql' => '4.023', }, }, @@ -98,8 +99,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,7 +144,7 @@ my $dbic_reqs = { }, }, - icdt => { + ic_dt => { req => { 'DateTime' => '0.55', 'DateTime::TimeZone::OlsonDB' => 0, @@ -225,6 +236,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 @@ -237,7 +259,7 @@ my $dbic_reqs = { desc => 'Modules required to connect to SQLite', }, augment => { - icdt => { + ic_dt => { req => { 'DateTime::Format::SQLite' => '0', }, @@ -247,10 +269,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', }, @@ -258,20 +279,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 => { @@ -302,7 +333,7 @@ my $dbic_reqs = { }, _rdbms_msaccess_common => { - include => '_icdt_strptime_based', + include => '_ic_dt_strptime_based', }, rdbms_msaccess_odbc => { @@ -323,10 +354,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', }, @@ -334,8 +364,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, }, @@ -355,7 +389,7 @@ my $dbic_reqs = { desc => 'Modules required to connect to Oracle', }, augment => { - icdt => { + ic_dt => { req => { 'DateTime::Format::Oracle' => '0', }, @@ -364,7 +398,7 @@ my $dbic_reqs = { }, rdbms_ase => { - include => '_icdt_strptime_based', + include => '_ic_dt_strptime_based', req => { 'DBD::Sybase' => 0, }, @@ -376,7 +410,7 @@ my $dbic_reqs = { _rdbms_db2_common => { augment => { - icdt => { + ic_dt => { req => { 'DateTime::Format::DB2' => '0', }, @@ -404,7 +438,7 @@ my $dbic_reqs = { }, rdbms_informix => { - include => '_icdt_strptime_based', + include => '_ic_dt_strptime_based', req => { 'DBD::Informix' => 0, }, @@ -415,7 +449,7 @@ my $dbic_reqs = { }, _rdbms_sqlanywhere_common => { - inclide => '_icdt_strptime_based', + include => '_ic_dt_strptime_based', }, rdbms_sqlanywhere => { @@ -438,7 +472,7 @@ my $dbic_reqs = { }, _rdbms_firebird_common => { - include => '_icdt_strptime_based', + include => '_ic_dt_strptime_based', }, rdbms_firebird => { @@ -491,13 +525,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 => { @@ -872,7 +899,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; @@ -1232,7 +1259,7 @@ Somewhere in your build-file (e.g. L's F): 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} = {