Add (slowish) sanity check to detect incorrect non-nullable metadata

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / ResultSource / RowParser.pm

diff --git a/lib/DBIx/Class/ResultSource/RowParser.pm b/lib/DBIx/Class/ResultSource/RowParser.pm
index fa69299..704ebf8 100644 (file)
--- a/lib/DBIx/Class/ResultSource/RowParser.pm
+++ b/lib/DBIx/Class/ResultSource/RowParser.pm
@@ -109,34 +109,38 @@ sub _mk_row_parser {
     },
   );
 
-  my $src = $args->{collapse}
-    ? assemble_collapsing_parser({
+  my $check_null_columns;
+
+  my $src = (! $args->{collapse} ) ? assemble_simple_parser(\%common) : do {
+    my $collapse_map = $self->_resolve_collapse ({
+      # FIXME
+      # only consider real columns (not functions) during collapse resolution
+      # this check shouldn't really be here, as fucktards are not supposed to
+      # alias random crap to existing column names anyway, but still - just in
+      # case
+      # FIXME !!!! - this does not yet deal with unbalanced selectors correctly
+      # (it is now trivial as the attrs specify where things go out of sync
+      # needs MOAR tests)
+      as => { map
+        { ref $attrs->{select}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
+        keys %{$common{val_index}}
+      },
+      premultiplied => $args->{premultiplied},
+    });
+
+    $check_null_columns = $collapse_map->{-identifying_columns}
+      if @{$collapse_map->{-identifying_columns}};
+
+    assemble_collapsing_parser({
       %common,
-      collapse_map => $self->_resolve_collapse ({
-        # FIXME
-        # only consider real columns (not functions) during collapse resolution
-        # this check shouldn't really be here, as fucktards are not supposed to
-        # alias random crap to existing column names anyway, but still - just in
-        # case
-        # FIXME !!!! - this does not yet deal with unbalanced selectors correctly
-        # (it is now trivial as the attrs specify where things go out of sync
-        # needs MOAR tests)
-        as => { map
-          { ref $attrs->{select}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
-          keys %{$common{val_index}}
-        },
-        premultiplied => $args->{premultiplied},
-      })
-    })
-    : assemble_simple_parser(
-      \%common
-    )
-  ;
-
-  return $args->{eval}
-    ? ( eval "sub $src" || die $@ )
-    : $src
-  ;
+      collapse_map => $collapse_map,
+    });
+  };
+
+  return (
+    $args->{eval} ? ( eval "sub $src" || die $@ ) : $src,
+    $check_null_columns,
+  );
 }