[Bast-commits] r8487 - in DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class: . Relationship

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-01-31 10:07:25 +0000 (Sun, 31 Jan 2010)
New Revision: 8487

Modified:
   DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Ordered.pm
   DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Relationship/HasOne.pm
   DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/ResultSourceProxy.pm
Log:
Stupid errors

Modified: DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Ordered.pm
===================================================================
--- DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Ordered.pm	2010-01-31 09:25:55 UTC (rev 8486)
+++ DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Ordered.pm	2010-01-31 10:07:25 UTC (rev 8487)
@@ -801,7 +801,7 @@
         my $cursor = $shift_rs->search ({}, { order_by => { "-$ord", $position_column }, columns => \@pcols } )->cursor;
         my $rs = $self->result_source->resultset;
 
-        my @all_pks = $cusrsor->all;
+        my @all_pks = $cursor->all;
         while (my $pks = shift @all_pks) {
           my $cond;
           for my $i (0.. $#pcols) {

Modified: DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Relationship/HasOne.pm
===================================================================
--- DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Relationship/HasOne.pm	2010-01-31 09:25:55 UTC (rev 8486)
+++ DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/Relationship/HasOne.pm	2010-01-31 10:07:25 UTC (rev 8487)
@@ -62,7 +62,7 @@
   $target_class ||= $class;
   my ($pri, $too_many) = eval { $target_class->_pri_cols };
   $class->throw_exception(
-    "Can't infer join condition for ${rel} on ${target_class}: $@"
+    "Can't infer join condition on ${target_class}: $@"
   ) if $@;
 
   $class->throw_exception(

Modified: DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/ResultSourceProxy.pm
===================================================================
--- DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/ResultSourceProxy.pm	2010-01-31 09:25:55 UTC (rev 8486)
+++ DBIx-Class/0.08/branches/pri_key_refactor/lib/DBIx/Class/ResultSourceProxy.pm	2010-01-31 10:07:25 UTC (rev 8487)
@@ -75,6 +75,10 @@
   shift->result_source_instance->primary_columns(@_);
 }
 
+sub _pri_cols {
+  shift->result_source_instance->_pri_cols(@_);
+}
+
 sub add_unique_constraint {
   shift->result_source_instance->add_unique_constraint(@_);
 }