From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 1 Jun 2009 14:41:49 +0000 (+0000)
Subject: Merge 'order_by_refactor' into 'trunk'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4c4c6184f04bd8a38aa4396e054be1a6379fc936;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'order_by_refactor' into 'trunk'
---

4c4c6184f04bd8a38aa4396e054be1a6379fc936
diff --cc Changes
index 9c7b91e,75d11a7..99c933a
--- a/Changes
+++ b/Changes
@@@ -1,9 -1,9 +1,17 @@@
  Revision history for DBIx::Class
  
+         - order_by now can take \[$sql, @bind] as in
+           order_by => { -desc => \['colA LIKE ?', 'somestring'] }
+         - SQL::Abstract errors are now properly croak()ed with the
+           correct trace
 +        - populate() now properly reports the dataset slice in case of
 +          an exception
 +        - fixed corner case when populate() erroneously falls back to
 +          create()
++        - order_by now can take \[$sql, @bind] as in
++          order_by => { -desc => \['colA LIKE ?', 'somestring'] }
++        - SQL::Abstract errors are now properly croak()ed with the
++          correct trace
  
  0.08103 2009-05-26 19:50:00 (UTC)
          - Multiple $resultset -> count/update/delete fixes. Now any
diff --cc Makefile.PL
index 8ea186c,77d1c6f..e0d90c4
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -9,9 -9,13 +9,9 @@@ name     'DBIx-Class'
  perl_version '5.006001';
  all_from 'lib/DBIx/Class.pm';
  
 -# configure_requires so _check_sqlite() below can run
 -# remove once test deprecated
 -configure_requires 'DBD::SQLite';
 -
  requires 'DBD::SQLite'              => 1.25;
  requires 'Data::Page'               => 2.00;
- requires 'SQL::Abstract'            => 1.55;
+ requires 'SQL::Abstract'            => 1.56;
  requires 'SQL::Abstract::Limit'     => 0.13;
  requires 'Class::C3::Componentised' => 1.0005;
  requires 'Carp::Clan'               => 6.0;