Changeset 2463 for branches/release-39/lib/MT/ObjectDriver/Driver/DBI.pm

Timestamp:

05/30/08 02:23:26 (18 months ago)

Author:

bchoate

Message:

Updates to optimize recently_commented_on, category and tag attributes for Entries tag - BugId:79914. Search app can now supply user state - BugId:79906. Fix for 2-digit year bug - BugId:79924

Files:

• branches/release-39/lib/MT/ObjectDriver/Driver/DBI.pm (modified) (2 diffs)

branches/release-39/lib/MT/ObjectDriver/Driver/DBI.pm

@@ -160 +160 @@
     $stmt->group([ map { { column => $_ } } @group ]);
 
-    ## Ugly.
-    my $sql = $stmt->as_sql;
-
     ## Set statement's ORDER clause if any.
     if ($order) {
         if (! ref($order)) {
-            $sql .= "\nORDER BY " . $decorate->($order);
-            if ($direction) {
-                $sql .= $direction eq 'descend' ? ' DESC' : ' ASC';
-            }
+            $stmt->order( [ { column => $decorate->($order),
+                desc => $direction eq 'descend' ? 'DESC' : 'ASC'
+            } ] );
         } else {
             my @order;
@@ -179 +175 @@
             }
             $stmt->order(\@order);
-            $sql .= "\n" . $stmt->as_aggregate('order');
-        }
-    }
+        }
+    }
+
+    my $sql = $stmt->as_sql;
 
     my $dbh = $driver->r_handle;