From: Peter Rabbitson Date: Fri, 13 Nov 2009 09:39:55 +0000 (+0000) Subject: Merge 'trunk' into 'prefetch_bug-unqualified_column_in_search_related_cond' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8de09adb1fed7f0e15890cfa423a7e2a5643478e;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'trunk' into 'prefetch_bug-unqualified_column_in_search_related_cond' r7884@Thesaurus (orig r7872): ribasushi | 2009-11-13 00:13:40 +0100 The real fix for the non-introspectable condition bug, mst++ r7885@Thesaurus (orig r7873): ribasushi | 2009-11-13 00:24:56 +0100 Some cleanup r7887@Thesaurus (orig r7875): frew | 2009-11-13 10:01:37 +0100 fix subtle bug with Sybase database type determination --- 8de09adb1fed7f0e15890cfa423a7e2a5643478e diff --cc lib/DBIx/Class/Storage/DBI.pm index aab6f31,0de26f6..e11a8e9 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@@ -1590,9 -1623,9 +1623,9 @@@ sub _strip_cond_qualifiers # We were sent here because the $rs contains a complex search # which will require a subquery to select the correct rows - # (i.e. joined or limited resultsets) + # (i.e. joined or limited resultsets, or non-introspectable conditions) # -# Genarating a single PK column subquery is trivial and supported +# Generating a single PK column subquery is trivial and supported # by all RDBMS. However if we have a multicolumn PK, things get ugly. # Look at _multipk_update_delete() sub _subq_update_delete {