cvsuser     05/04/01 06:42:32

  Modified:    App-Repository/lib/App/Repository DBI.pm
  Log:
  distinct option
  
  Revision  Changes    Path
  1.25      +6 -4      p5ee/App-Repository/lib/App/Repository/DBI.pm
  
  Index: DBI.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/lib/App/Repository/DBI.pm,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- DBI.pm    14 Mar 2005 16:42:15 -0000      1.24
  +++ DBI.pm    1 Apr 2005 14:42:32 -0000       1.25
  @@ -726,8 +726,9 @@
       $order_by = $options->{order_by} || $options->{ordercols} || [];  # 
{ordercols} is deprecated
       $order_by = [$order_by] if (!ref($order_by));
       $direction = $options->{direction} || $options->{directions};     # 
{directions} is deprecated
  +    my $modifier = $options->{distinct} ? " distinct" : "";
   
  -    $sql = "select\n   " . join(",\n   ", @$cols) . "\nfrom $table\n";
  +    $sql = "select$modifier\n   " . join(",\n   ", @$cols) . "\nfrom 
$table\n";
       $sql .= $self->_mk_where_clause($table, $params);
   
       if (defined $order_by && $#$order_by > -1) {
  @@ -781,6 +782,7 @@
       $order_by = $options->{order_by} || $options->{ordercols} || [];  # 
{ordercols} is deprecated
       $order_by = [$order_by] if (!ref($order_by));
       $direction = $options->{direction} || $options->{directions};     # 
{directions} is deprecated
  +    my $modifier = $options->{distinct} ? " distinct" : "";
   
       $param_order = $params->{"_order"};
       if (!defined $param_order && ref($params) eq "HASH") {
  @@ -1304,7 +1306,7 @@
       my ($sql, $conjunction);
   
       if ($#select_phrase >= 0) {
  -        $sql = "select\n   " .
  +        $sql = "select$modifier\n   " .
                           join(",\n   ",@select_phrase) . "\n" .
                    "from\n   " .
                           join(",\n   ",@from_tables) . "\n";
  
  
  

Reply via email to