X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=5ed2434dc1176e878f21429c8c7f1059a7eca596;hb=6818ce9fd83510b82b5d1cc152a230954b332e35;hp=7b83ea9f3a21076c289553875982577b9c5c7e30;hpb=6e566cc4a06b1661597200611a03320f969e2566;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index 7b83ea9..5ed2434 100644
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -605,8 +605,8 @@ sub test_schema {
         is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update}, 'CASCADE',
             "on_update => 'CASCADE' on belongs_to by default";
 
-        is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}, 1,
-            "is_deferrable => 1 on belongs_to by default";
+        ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}),
+            "is_deferrable => 1 not on belongs_to by default");
 
         ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete}),
             'belongs_to does not have cascade_delete');
@@ -635,7 +635,7 @@ sub test_schema {
 	    eval { $rsobj5->find({id1 => 1, id2 => 1}) };
 	die $@ if $@;
 
-        is( $obj5->id2, 1, "Find on multi-col PK" );
+        is( (eval { $obj5->id2 } || eval { $obj5->i_d2 }), 1, "Find on multi-col PK" );
 
         # mulit-col fk def
         my $obj6 = $rsobj6->find(1);
@@ -1684,7 +1684,7 @@ sub setup_data_type_tests {
         my @size = split /,/, $size;
 
         # some DBs don't like very long column names
-        if ($self->{vendor} =~ /^firebird|sqlanywhere\z/i) {
+        if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle)\z/i) {
             my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
 
             $type_alias = substr $col_def, 0, 15;