Changeset 68

Timestamp:

05/04/06 00:05:02 (4 years ago)

Author:

sky

Message:

r71@crucially-3 (orig r1013): mpaschal | 2005-11-08 10:54:55 -0800
proposed multiple ORDER BY support?

Location:

trunk

Files:

• lib/Data/ObjectDriver/SQL.pm (modified) (1 diff)
• t/11-sql.t (modified) (1 diff)

trunk/lib/Data/ObjectDriver/SQL.pm

@@ -31 +31 @@
     $sql .= $stmt->as_sql_where;
     if (my $order = $stmt->order) {
-        $sql .= 'ORDER BY ' . $order->{column} . ' ' . $order->{desc} . "\n";
+        my $orders = (ref($order) eq 'ARRAY') ? $order : [ $order ];
+        $sql .= 'ORDER BY '
+            . join(', ', map { $_->{column} . ' ' . $_->{desc} } @$orders)
+            . "\n";
     }
     if (my $n = $stmt->limit) {

trunk/t/11-sql.t

@@ -28 +28 @@
 $stmt->from([ 'foo' ]);
 $stmt->order({ column => 'baz', desc => 'DESC' });
-is($stmt->as_sql, "FROM foo\nORDER BY baz DESC\n");
+is($stmt->as_sql, "FROM foo\nORDER BY baz DESC\n", 'single order by');
+
+$stmt = ns();
+$stmt->from([ 'foo' ]);
+$stmt->order([ { column => 'baz',  desc => 'DESC' },
+               { column => 'quux', desc => 'ASC'  }, ]);
+is($stmt->as_sql, "FROM foo\nORDER BY baz DESC, quux ASC\n", 'multiple order by');
 
 ## Testing LIMIT and OFFSET