[Bast-commits] r4588 - in DBIx-Class/0.08/branches/complex_join_rels: lib/DBIx/Class t

[groditi at dev.catalyst.perl.org]

Author: groditi
Date: 2008-07-16 21:17:07 +0100 (Wed, 16 Jul 2008)
New Revision: 4588

Added:
   DBIx-Class/0.08/branches/complex_join_rels/t/96_is_deteministic_value.t
Modified:
   DBIx-Class/0.08/branches/complex_join_rels/lib/DBIx/Class/ResultSet.pm
Log:
_is_deteministic_value

Modified: DBIx-Class/0.08/branches/complex_join_rels/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/complex_join_rels/lib/DBIx/Class/ResultSet.pm	2008-07-16 19:36:25 UTC (rev 4587)
+++ DBIx-Class/0.08/branches/complex_join_rels/lib/DBIx/Class/ResultSet.pm	2008-07-16 20:17:07 UTC (rev 4588)
@@ -12,6 +12,7 @@
 use DBIx::Class::ResultSetColumn;
 use DBIx::Class::ResultSourceHandle;
 use List::Util ();
+use Scalar::Util ();
 use base qw/DBIx::Class/;
 
 __PACKAGE__->mk_group_accessors('simple' => qw/result_class _source_handle/);
@@ -1527,8 +1528,18 @@
 
   # precendence must be given to passed values over values inherited from the cond, 
   # so the order here is important.
-  my %new = (
-    %{ $self->_remove_alias($collapsed_cond, $alias) },
+  my %new;
+  my %implied =  %{$self->_remove_alias($collapsed_cond, $alias)};
+  while( my($col,$value) = each %implied ){
+    if(ref($value) eq 'HASH' && keys(%$value) && (keys %$value)[0] eq '='){
+      $new{$col} = $value->{'='};
+      next;
+    }
+    $new{$col} = $value if $self->_is_deterministic_value($value);
+  }
+
+  %new = (
+    %new,
     %{ $self->_remove_alias($values, $alias) },
     -source_handle => $self->_source_handle,
     -result_source => $self->result_source, # DO NOT REMOVE THIS, REQUIRED
@@ -1537,6 +1548,20 @@
   return $self->result_class->new(\%new);
 }
 
+# _is_deterministic_value
+#
+# Make an effor to strip non-deterministic values from the condition, 
+# to make sure new_result chokes less
+
+sub _is_deterministic_value {
+  my $self = shift;
+  my $value = shift;
+  my $ref_type = ref $value;
+  return 1 if $ref_type eq '' || $ref_type eq 'SCALAR';
+  return 1 if Scalar::Util::blessed($value);
+  return 0;
+}
+
 # _collapse_cond
 #
 # Recursively collapse the condition.

Added: DBIx-Class/0.08/branches/complex_join_rels/t/96_is_deteministic_value.t
===================================================================
--- DBIx-Class/0.08/branches/complex_join_rels/t/96_is_deteministic_value.t	                        (rev 0)
+++ DBIx-Class/0.08/branches/complex_join_rels/t/96_is_deteministic_value.t	2008-07-16 20:17:07 UTC (rev 4588)
@@ -0,0 +1,65 @@
+use strict;
+use warnings;
+
+# 6 tests
+
+use Test::More qw(no_plan);
+use lib qw(t/lib);
+use DBICTest;
+use DateTime;
+use DateTime::Format::Strptime;
+use Test::Exception;
+
+my $schema = DBICTest->init_schema();
+my $artist_rs = $schema->resultset('Artist');
+my $cd_rs = $schema->resultset('CD');
+
+ {
+   my $cd;
+   lives_ok {
+     $cd = $cd_rs->search({ year => {'=' => 1999}})->create
+       ({
+         artist => {name => 'Guillermo1'},
+         title => 'Guillermo 1',
+        });
+   };
+   is($cd->year, 1999);
+ }
+
+ {
+   my $formatter = DateTime::Format::Strptime->new(pattern => '%Y');
+   my $dt = DateTime->new(year => 2006, month => 06, day => 06,
+                          formatter => $formatter );
+   my $cd;
+   lives_ok {
+     $cd = $cd_rs->search({ year => $dt})->create
+       ({
+         artist => {name => 'Guillermo2'},
+         title => 'Guillermo 2',
+        });
+   };
+   is($cd->year, 2006);
+ }
+
+
+{
+  my $artist;
+  lives_ok {
+    $artist = $artist_rs->search({ name => {'!=' => 'Killer'}})
+      ->create({artistid => undef});
+  };
+  is($artist->name, undef);
+}
+
+
+{
+  my $artist;
+  lives_ok {
+    $artist = $artist_rs->search({ name => [ q/ some stupid names here/]})
+      ->create({artistid => undef});
+  };
+  is($artist->name, undef);
+}
+
+
+1;