Merge 'trunk' into 'DBIx-Class-current'

r12625@evoc8 (orig r2780):  dwc | 2006-09-14 09:29:02 -0500
Fix for recent SQLite versions interpreting single quotes as string literals

diff --cc t/19quotes.t
index d2f5a8d,2ce7a26..83fcf9d
--- 1/t/19quotes.t
--- 2/t/19quotes.t
+++ b/t/19quotes.t
@@@ -28,8 -28,10 +28,8 @@@ cmp_ok( $rs->count, '==', 1, "join wit
  $rs = DBICTest::CD->search({},
              { 'order_by' => 'year DESC'});
  {
 -       my $warnings = '';
 -       local $SIG{__WARN__} = sub { $warnings .= $_[0] };
 -       my $first = eval{ $rs->first() };
 -       like( $warnings, qr/no such column: year DESC/, "Problem with ORDER BY quotes" );
 +       eval{ $rs->first() };
-        like( $@, qr/ORDER BY terms/, "Problem with ORDER BY quotes" );
++       like( $@, qr/no such column: year DESC/, "Problem with ORDER BY quotes" );
  }
  
  my $order = 'year DESC';

diff --cc t/19quotes_newstyle.t
index 68f13a8,de32393..d2c40e0
--- 1/t/19quotes_newstyle.t
--- 2/t/19quotes_newstyle.t
+++ b/t/19quotes_newstyle.t
@@@ -29,8 -29,10 +29,8 @@@ cmp_ok( $rs->count, '==', 1, "join wit
  $rs = DBICTest::CD->search({},
              { 'order_by' => 'year DESC'});
  {
 -       my $warnings = '';
 -       local $SIG{__WARN__} = sub { $warnings .= $_[0] };
 -       my $first = eval{ $rs->first() };
 -       like( $warnings, qr/no such column: year DESC/, "Problem with ORDER BY quotes" );
 +       eval { $rs->first() };
-        like( $@, qr/ORDER BY terms/, "Problem with ORDER BY quotes" );
++       like( $@, qr/no such column: year DESC/, "Problem with ORDER BY quotes" );
  }
  
  my $order = 'year DESC';