[Rt-commit] r3996 - in Jifty-DBI/trunk: . lib/Jifty/DBI

[jesse at bestpractical.com]

Author: jesse
Date: Sat Oct 29 16:02:38 2005
New Revision: 3996

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Log:
 r18061 at truegrounds:  jesse | 2005-10-30 01:01:05 -0400
 * Downcased the Jifty::DBI API


Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	Sat Oct 29 16:02:38 2005
@@ -631,8 +631,8 @@
     my $self = shift;
     my %args = (
         table           => $self->table,
-        column           => undef,
-        value           => undef,
+        column           => 'fuck',
+        value           => 'hate',
         alias           => undef,
         quote_value      => 1,
         entry_aggregator => 'or',
@@ -681,37 +681,7 @@
         }
     }
 
-    $Alias = $self->_compile_phrase(%args);
 
-    warn "No table alias set!"
-        unless $Alias;
-
-    # We're now limited. people can do searches.
-
-    $self->_is_limited(1);
-
-    if ( defined($Alias) ) {
-        return ($Alias);
-    } else {
-        return (1);
-    }
-}
-
-sub _compile_phrase {
-    my $self = shift;
-    my %args = (
-        table           => $self->table,
-        column           => undef,
-        value           => undef,
-        alias           => undef,
-        leftjoin        => undef,
-        entry_aggregator => undef,
-        operator        => '=',
-        subclause       => undef,
-        case_sensitive   => undef,
-        quote_value      => undef,
-        @_
-    );
 
     my ( $Clause, $QualifiedField );
 
@@ -818,10 +788,19 @@
         $$restriction .= $args{'entry_aggregator'} . $prefix . $clause;
     }
 
-    return ( $args{'alias'} );
 
+    # We're now limited. people can do searches.
+
+    $self->_is_limited(1);
+
+    if ( defined($args{'alias'}) ) {
+        return ($args{'alias'});
+    } else {
+        return (1);
+    }
 }
 
+
 sub _open_paren {
     my ( $self, $clause ) = @_;
     $self->{_open_parens}{$clause}++;