X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=b56fcf56a55ab7f8a02bb822acb30fe636fbf077;hb=c5df73970f77123305f69d77d213aab3d984529f;hp=e07ce3662afb81e0d4f74b3e2537e6f0ac07da1c;hpb=f170d55b2829518155a9b8817639affab3559b03;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index e07ce36..b56fcf5 100644
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -63,8 +63,8 @@ sub _custom_column_info {
     $table_name = lc ( $table_name );
     $column_name = lc ( $column_name );
 
-    if ( $table_name eq 'loader_test11' 
-        and $column_name eq 'loader_test10' 
+    if ( $table_name eq 'loader_test35' 
+        and $column_name eq 'an_int' 
     ){
         return { is_numeric => 1 }
     }
@@ -366,7 +366,7 @@ sub test_schema {
     );
 
     SKIP: {
-        skip $self->{skip_rels}, 96 if $self->{skip_rels};
+        skip $self->{skip_rels}, 99 if $self->{skip_rels};
 
         my $moniker3 = $monikers->{loader_test3};
         my $class3   = $classes->{loader_test3};
@@ -635,20 +635,6 @@ sub test_schema {
         ok($class10->column_info('loader_test11')->{is_foreign_key}, 'Foreign key detected');
         ok($class11->column_info('loader_test10')->{is_foreign_key}, 'Foreign key detected');
 
-        # Added by custom_column_info
-        ok($class11->column_info('loader_test10')->{is_numeric}, 'custom_column_info');
-
-        is($class36->column_info('a_date')->{locale},'de_DE','datetime_locale');
-        is($class36->column_info('a_date')->{timezone},'Europe/Berlin','datetime_timezone');
-
-        ok($class36->column_info('b_char_as_data')->{inflate_datetime},'custom_column_info');
-        is($class36->column_info('b_char_as_data')->{locale},'de_DE','datetime_locale');
-        is($class36->column_info('b_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
-
-        ok($class36->column_info('c_char_as_data')->{inflate_date},'custom_column_info');
-        is($class36->column_info('c_char_as_data')->{locale},'de_DE','datetime_locale');
-        is($class36->column_info('c_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
-
         my $obj10 = $rsobj10->create({ subject => 'xyzzy' });
 
         $obj10->update();
@@ -726,6 +712,25 @@ sub test_schema {
         }
     }
 
+    # test custom_column_info and datetime_timezone/datetime_locale
+    {
+        my $class35 = $classes->{loader_test35};
+        my $class36 = $classes->{loader_test36};
+
+        ok($class35->column_info('an_int')->{is_numeric}, 'custom_column_info');
+
+        is($class36->column_info('a_date')->{locale},'de_DE','datetime_locale');
+        is($class36->column_info('a_date')->{timezone},'Europe/Berlin','datetime_timezone');
+
+        ok($class36->column_info('b_char_as_data')->{inflate_datetime},'custom_column_info');
+        is($class36->column_info('b_char_as_data')->{locale},'de_DE','datetime_locale');
+        is($class36->column_info('b_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
+
+        ok($class36->column_info('c_char_as_data')->{inflate_date},'custom_column_info');
+        is($class36->column_info('c_char_as_data')->{locale},'de_DE','datetime_locale');
+        is($class36->column_info('c_char_as_data')->{timezone},'Europe/Berlin','datetime_timezone');
+    }
+
     # rescan and norewrite test
     SKIP: {
         my @statements_rescan = (