applied patch from nicg : Modified DFV.pm to allow for multiple column primary keys

[maypole.git] / lib / Maypole / Model / CDBI / DFV.pm

diff --git a/lib/Maypole/Model/CDBI/DFV.pm b/lib/Maypole/Model/CDBI/DFV.pm
index 7848759d610a72bc97711b175af01bd196d41704..ca3609c193578760322f983fc1eb0840426332ca 100644 (file)
--- a/lib/Maypole/Model/CDBI/DFV.pm
+++ b/lib/Maypole/Model/CDBI/DFV.pm
@@ -181,8 +181,16 @@ sub _do_update {
 
 
   my $this_class_params = {};
+
+
+  # NG changes start here.
+  # Code below fails to handle multi col PKs
+  my @pks = $class->columns('Primary');
+
   foreach my $param ( $class->columns ) {
-    next if ($param eq $class->columns('Primary'));
+    # next if ($param eq $class->columns('Primary'));
+    next if grep {/^${param}$/} @pks;
+
     my $value = $r->params->{$param};
     next unless (defined $value);
     $this_class_params->{$param} = ( $value eq '' ) ?  undef : $value;