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

[Jifty commits]

Author: ruz
Date: Tue Aug 12 02:48:39 2008
New Revision: 5686

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

Log:
* make query method chainable - return $self
* don't use merge_joins - let's finish language
  and only then implement optimisations
* in apply_query_tree we only need conditions,
  we're going to change api, stay tuned


Modified: Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm
==============================================================================
--- Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm	(original)
+++ Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm	Tue Aug 12 02:48:39 2008
@@ -77,9 +77,8 @@
         operand_cb => sub { return $self->parse_condition( $_[0], $tree->{'aliases'} ) },
     );
     $self->{'tisql'}{'conditions'} = $tree->{'conditions'};
-    $self->merge_joins( $tree );
-    $self->apply_query_tree( $tree );
-    return $tree;
+    $self->apply_query_tree( $tree->{'conditions'} );
+    return $self;
 }
 
 sub apply_query_tree {