X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F99dbic_sqlt_parser.t;h=6f3a3e21b7f10571202c4bea42b1e0f0c2561675;hb=93c508897a53337dd5f860a92fb142fd0aede2de;hp=d95f6987742eb74d70908072f2835088ad84d339;hpb=c2b7c5dcfa943d49d31ba94a6d9d6a282b714ffa;p=dbsrgits%2FDBIx-Class.git diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t index d95f698..6f3a3e2 100644 --- a/t/99dbic_sqlt_parser.t +++ b/t/99dbic_sqlt_parser.t @@ -5,22 +5,22 @@ use Test::More; use lib qw(t/lib); use DBICTest; - BEGIN { - eval "use SQL::Translator 0.09003;"; - if ($@) { - plan skip_all => 'needs SQL::Translator 0.09003 for testing'; - } + require DBIx::Class; + plan skip_all => + 'Test needs SQL::Translator ' . DBIx::Class->_sqlt_minimum_version + if not DBIx::Class->_sqlt_version_ok; } my $schema = DBICTest->init_schema(); # Dummy was yanked out by the sqlt hook test +# CustomSql tests the horrific/deprecated ->name(\$sql) hack # YearXXXXCDs are views - -my @sources = grep { $_ ne 'Dummy' && $_ !~ /^Year\d{4}CDs$/ } - $schema->sources; - -plan tests => ( @sources * 3); +# +my @sources = grep + { $_ !~ /^ (?: Dummy | CustomSql | Year\d{4}CDs ) $/x } + $schema->sources +; { my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { } } }); @@ -62,6 +62,8 @@ plan tests => ( @sources * 3); } } +done_testing; + sub create_schema { my $args = shift;