fix sybase tests for new columns

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 74b777e..430c9ab 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -1418,7 +1418,7 @@ sub _resolve_col_accessor_collisions {
     while (my ($col, $info) = each %$col_info) {
         my $accessor = $info->{accessor} || $col;
 
-        next if $accessor eq 'id'; # XXX fix this in DBIC
+        next if $accessor eq 'id'; # special case (very common column)
 
         if (exists $methods{$accessor}) {
             $info->{accessor} = undef;
@@ -1452,7 +1452,9 @@ sub _setup_src_meta {
             $col_info->{$col}{accessor} = lc $col
                 if $col ne lc($col);
         }
-    } else {
+    }
+    else {
+        # XXX this needs to go away
         $col_info = { map { lc($_), $col_info->{$_} } keys %$col_info };
     }
 

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index c4e750f..676e58e 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -1052,8 +1052,8 @@ sub create {
                 id $self->{auto_inc_pk},
                 dat VARCHAR(32) NOT NULL,
                 dat2 VARCHAR(32) NOT NULL,
-                set_primary_key INTEGER,
-                dbix_class_testcomponent INTEGER,
+                set_primary_key INTEGER $self->{null},
+                dbix_class_testcomponent INTEGER $self->{null},
                 UNIQUE (dat2, dat)
             ) $self->{innodb}
         },