[Jifty-commit] r5756 - Jifty-DBI/branches/tisql/lib/Jifty/DBI

[Jifty commits]

Author: ruz
Date: Tue Aug 19 04:36:31 2008
New Revision: 5756

Modified:
   Jifty-DBI/branches/tisql/lib/Jifty/DBI/Collection.pm

Log:
* add type of join argument to new_alias

Modified: Jifty-DBI/branches/tisql/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/branches/tisql/lib/Jifty/DBI/Collection.pm	(original)
+++ Jifty-DBI/branches/tisql/lib/Jifty/DBI/Collection.pm	Tue Aug 19 04:36:31 2008
@@ -1754,8 +1754,10 @@
 =cut
 
 sub new_alias {
-    my $self = shift;
+    my $self      = shift;
     my $refers_to = shift || die "Missing parameter";
+    my $type      = shift || 'CROSS';
+
     my $table;
     my $class = undef;
     if ( $refers_to->can('table') ) {
@@ -1770,9 +1772,10 @@
     $self->{'joins'}{$alias} = {
         alias => $alias,
         table => $table,
-        type  => 'CROSS',
+        type  => $type,
         ( $class ? ( class => $class ) : () ),
-        alias_string => " CROSS JOIN $table $alias ",
+        alias_string => " $type JOIN $table $alias ",
+        depends_on => 'main',
     };
 
     return $alias;