[Catalyst-commits] r8400 - CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2008-09-11 07:10:23 +0100 (Thu, 11 Sep 2008)
New Revision: 8400

Modified:
   CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm
Log:
use dbic() in query maker

Modified: CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm	2008-09-11 06:10:03 UTC (rev 8399)
+++ CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm	2008-09-11 06:10:23 UTC (rev 8400)
@@ -278,13 +278,8 @@
 
     #carp "make_sql_query : " . dump $q;
 
-    if ( defined $q->{query}->[0] ) {
-        if ( uc( $q->{query}->[0] ) eq 'OR' ) {
-            $q->{query}->[0] = '-or';
-        }
-        elsif ( uc( $q->{query}->[0] ) eq 'AND' ) {
-            $q->{query}->[0] = '-and';
-        }
+    if ( $q->{query_obj} ) {
+        $q->{query} = $q->{query_obj}->dbic;
     }
 
     #carp "make_sql_query : " . dump $q;