[Catalyst-commits] r8304 - in CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk: . lib/CatalystX/CRUD/ModelAdapter

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2008-08-27 13:16:19 +0100 (Wed, 27 Aug 2008)
New Revision: 8304

Modified:
   CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/Changes
   CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm
Log:
0.06 release

Modified: CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/Changes
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/Changes	2008-08-27 03:42:32 UTC (rev 8303)
+++ CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/Changes	2008-08-27 12:16:19 UTC (rev 8304)
@@ -18,7 +18,5 @@
 0.05    26 Aug 2008
         * fix ORDER BY feature and override make_sql_query()
 
-
-
-
-
+0.06    27 Aug 2008
+        * tweek make_query() to return hash struct like RDBO does

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-08-27 03:42:32 UTC (rev 8303)
+++ CatalystX-CRUD/CatalystX-CRUD-ModelAdapter-DBIC/trunk/lib/CatalystX/CRUD/ModelAdapter/DBIC.pm	2008-08-27 12:16:19 UTC (rev 8304)
@@ -10,7 +10,7 @@
 use Carp;
 use Data::Dump qw( dump );
 
-our $VERSION = '0.05';
+our $VERSION = '0.06';
 
 =head1 NAME
 
@@ -163,10 +163,8 @@
 
     my $query = $self->make_sql_query( $controller, $c, $field_names ) || {};
 
-    my %dbic = ( query => $query );
-
     # WHERE
-    $dbic{WHERE} = { @{ $query->{query} } };
+    $query->{WHERE} = { @{ $query->{query} } };
 
     my %opts;
 
@@ -180,11 +178,11 @@
         $opts{order_by} ||= $query->{order_by};
     }
 
-    $dbic{OPTS} = \%opts;
+    $query->{OPTS} = \%opts;
 
-    #carp "query: " . dump \%dbic;
+    #carp "query: " . dump $query;
 
-    return \%dbic;
+    return $query;
 }
 
 =head2 make_sql_query( I<controller>, I<context>, I<field_names> )