Merge 'trunk' into 'dephandling'

[dbsrgits/DBIx-Class.git] / t / 99dbic_sqlt_parser.t

diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index 5ce9fe4..7487c72 100644 (file)
--- a/t/99dbic_sqlt_parser.t
+++ b/t/99dbic_sqlt_parser.t
@@ -9,10 +9,10 @@ use DBICTest::Schema;
 use Scalar::Util ();
 
 BEGIN {
-  require DBIx::Class::Storage::DBI;
+  require DBIx::Class;
   plan skip_all =>
-      'Test needs SQL::Translator ' . DBIx::Class::Storage::DBI->_sqlt_minimum_version
-    if not DBIx::Class::Storage::DBI->_sqlt_version_ok;
+      'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('deploy')
+    unless DBIx::Class::Optional::Dependencies->req_ok_for ('deploy')
 }
 
 # Test for SQLT-related leaks
@@ -42,7 +42,7 @@ my $idx_exceptions = {
     'TwoKeys'       => -1, # TwoKeys has the index turned off on the rel def
 };
 
-{ 
+{
   my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { } } });
 
   foreach my $source_name (@sources) {
@@ -54,7 +54,7 @@ my $idx_exceptions = {
 
     my $index_count = scalar(@indices);
     is($index_count, $fk_count, "correct number of indices for $source_name with no args");
-    
+
     for my $index (@indices) {
         my $source = $schema->source($source_name);
         my $pk_test = join("\x00", $source->primary_columns);
@@ -64,7 +64,7 @@ my $idx_exceptions = {
   }
 }
 
-{ 
+{
   my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { add_fk_index => 1 } } });
 
   foreach my $source_name (@sources) {
@@ -78,7 +78,7 @@ my $idx_exceptions = {
   }
 }
 
-{ 
+{
   my $sqlt_schema = create_schema({ schema => $schema, args => { parser_args => { add_fk_index => 0 } } });
 
   foreach my $source (@sources) {
@@ -90,7 +90,7 @@ my $idx_exceptions = {
   }
 }
 
-{ 
+{
     {
         package # hide from PAUSE
             DBICTest::Schema::NoViewDefinition;