Changeset 98 for trunk/lib/Data/ObjectDriver/Driver/DBI.pm

Timestamp:

05/04/06 00:07:56 (4 years ago)

Author:

sky

Message:

r101@crucially-3 (orig r1085): mpaschal | 2006-01-13 13:09:03 -0800
Use DBD's column name decoration in ORDER BY clauses too
(Is this right? When does a class have no datasource?)

Files:

• trunk/lib/Data/ObjectDriver/Driver/DBI.pm (modified) (1 diff)

trunk/lib/Data/ObjectDriver/Driver/DBI.pm

@@ -473 +473 @@
             }
         }
+
+        ## Set statement's ORDER clause if any.
+        if ($args->{sort} || $args->{direction}) {
+            my $order = $args->{sort} || 'id';
+            my $dir = $args->{direction} &&
+                      $args->{direction} eq 'descend' ? 'DESC' : 'ASC';
+            $stmt->order({
+                column => $dbd->db_column_name($tbl, $order),
+                desc   => $dir,
+            });
+        }
     }
     $stmt->limit($args->{limit}) if $args->{limit};
     $stmt->offset($args->{offset}) if $args->{offset};
-    if ($args->{sort} || $args->{direction}) {
-        my $order = $args->{sort} || 'id';
-        my $dir = $args->{direction} &&
-                  $args->{direction} eq 'descend' ? 'DESC' : 'ASC';
-        $stmt->order({
-            column => $order,
-            desc   => $dir,
-        });
-    }
     $stmt;
 }