From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 10 Jun 2009 07:43:04 +0000 (+0000)
Subject: Merge 'trunk' into 'run_file_against_storage'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=26c6a8fd92883af83eb1e94388aaf4e35de14fb1;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'trunk' into 'run_file_against_storage'

r6553@Thesaurus (orig r6552):  ribasushi | 2009-06-08 23:56:41 +0200
duh
r6557@Thesaurus (orig r6556):  ash | 2009-06-09 12:20:34 +0200
Addjust bug to show problem with rows => 1 + child rel

r6558@Thesaurus (orig r6557):  ribasushi | 2009-06-09 13:12:46 +0200
Require a recent bugfixed Devel::Cycle
r6560@Thesaurus (orig r6559):  ash | 2009-06-09 15:07:30 +0200
Make IC::DT extra warning state the column name too

r6575@Thesaurus (orig r6574):  ribasushi | 2009-06-10 00:19:48 +0200
AuthorCheck fixes
r6579@Thesaurus (orig r6578):  ribasushi | 2009-06-10 00:52:17 +0200
 r6522@Thesaurus (orig r6521):  ribasushi | 2009-06-05 19:27:55 +0200
 New branch to try resultsource related stuff
 r6545@Thesaurus (orig r6544):  ribasushi | 2009-06-08 13:00:54 +0200
 First stab at adding resultsources to each join in select - works won-der-ful-ly
 r6546@Thesaurus (orig r6545):  ribasushi | 2009-06-08 13:14:08 +0200
 Commit failing test and thoughts on search arg deflation
 r6576@Thesaurus (orig r6575):  ribasushi | 2009-06-10 00:31:55 +0200
 Todoify DT in search deflation test until after 0.09
 r6577@Thesaurus (orig r6576):  ribasushi | 2009-06-10 00:48:07 +0200
 Factor out the $ident resolver

r6581@Thesaurus (orig r6580):  ribasushi | 2009-06-10 01:21:50 +0200
Move as_query out of the cursor
r6582@Thesaurus (orig r6581):  ribasushi | 2009-06-10 01:27:19 +0200
Think before commit
r6583@Thesaurus (orig r6582):  ribasushi | 2009-06-10 09:37:19 +0200
Clarify and disable rows/prefetch test - fix is easy, but architecturally unsound - need more time
---

26c6a8fd92883af83eb1e94388aaf4e35de14fb1
diff --cc lib/DBIx/Class/Storage/DBI.pm
index 1483348,c9f816e..d316bd3
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@@ -9,8 -9,7 +9,8 @@@ use Carp::Clan qw/^DBIx::Class/
  use DBI;
  use DBIx::Class::Storage::DBI::Cursor;
  use DBIx::Class::Storage::Statistics;
 +use Path::Class::File ();
- use Scalar::Util qw/blessed weaken/;
+ use Scalar::Util();
  use List::Util();
  
  __PACKAGE__->mk_group_accessors('simple' =>