[Bast-commits] r8216 - in DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class: . Storage

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-01-01 12:42:03 +0000 (Fri, 01 Jan 2010)
New Revision: 8216

Modified:
   DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/ResultSet.pm
   DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/Storage/DBI.pm
Log:
fix uninitialized warning and a bug in ResultSet

Modified: DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/ResultSet.pm	2010-01-01 11:01:40 UTC (rev 8215)
+++ DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/ResultSet.pm	2010-01-01 12:42:03 UTC (rev 8216)
@@ -2523,7 +2523,8 @@
 
     my $join_count = $attrs->{seen_join}{$rel};
 
-    my $alias = $self->storage->relname_to_table_alias($rel, $join_count);
+    my $alias = $self->result_source->storage
+        ->relname_to_table_alias($rel, $join_count);
 
     #XXX - temp fix for result_class bug. There likely is a more elegant fix -groditi
     delete @{$attrs}{qw(result_class alias)};

Modified: DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/Storage/DBI.pm	2010-01-01 11:01:40 UTC (rev 8215)
+++ DBIx-Class/0.08/branches/oracle_shorten_aliases/lib/DBIx/Class/Storage/DBI.pm	2010-01-01 12:42:03 UTC (rev 8216)
@@ -2532,7 +2532,8 @@
 sub relname_to_table_alias {
   my ($self, $relname, $join_count) = @_;
 
-  my $alias = ($join_count > 1 ? join('_', $relname, $join_count) : $relname);
+  my $alias = ($join_count && $join_count > 1 ?
+    join('_', $relname, $join_count) : $relname);
 
   return $alias;
 }