From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 12 May 2009 05:08:59 +0000 (+0000)
Subject: Merge 'trunk' into 'oracle-tweaks'
X-Git-Tag: v0.08103~100^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a876774cce93fa0d27ff1b0d61a1fc1a2741df55;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'oracle-tweaks'

r6195@Thesaurus (orig r6194):  caelum | 2009-05-09 15:46:55 +0200
added postgres default port stuff to FAQ
r6199@Thesaurus (orig r6198):  mo | 2009-05-10 17:37:16 +0200
set_$rel accepts now a $link_vals hashref like add_to_$rel does
r6202@Thesaurus (orig r6201):  ribasushi | 2009-05-10 19:57:31 +0200
Require DBICTest.pm in all tests even if it is not needed at all
r6203@Thesaurus (orig r6202):  ribasushi | 2009-05-10 20:17:09 +0200
No more 'I forgot to run perl Makefile.PL'
r6204@Thesaurus (orig r6203):  ribasushi | 2009-05-10 21:35:03 +0200
Switch the m2m method warnings from warnings::register to $ENV{DBIC_METHOD_CLOBBER_OK} = 1
r6206@Thesaurus (orig r6205):  ribasushi | 2009-05-11 12:50:54 +0200
Change the makefile to test r6202
r6218@Thesaurus (orig r6217):  ribasushi | 2009-05-12 07:02:14 +0200
Trying to untangle failing merge (whitespace change)
r6220@Thesaurus (orig r6219):  ribasushi | 2009-05-12 07:02:56 +0200
 r5757@Thesaurus (orig r5756):  arcanez | 2009-03-14 14:55:55 +0100
 created count_distinct branch
 r5758@Thesaurus (orig r5757):  arcanez | 2009-03-14 15:33:03 +0100
  * change count with group_by (distinct) to use a subquery
  * rewrite of _bind_to_sql (uses placeholders and bindvars)
  * tests for count distinct
  * fixed tests for from subquery

 r5760@Thesaurus (orig r5759):  arcanez | 2009-03-16 16:48:28 +0100
 don't remove the where clause unless we're doing distinct, it needs to be there
 r5850@Thesaurus (orig r5849):  arcanez | 2009-03-30 21:40:05 +0200
  * add more tests
  * remove old cruft
  * remove old note

 r6035@Thesaurus (orig r6034):  ribasushi | 2009-04-30 09:10:36 +0200
 Add joined count test
 r6079@Thesaurus (orig r6078):  arcanez | 2009-05-01 08:41:34 +0200
 cleanup/fix some broken tests
 r6097@Thesaurus (orig r6096):  arcanez | 2009-05-01 19:37:04 +0200
 make sure merge bind
 test for aformentioned
 TODO count_joined test for a little while

 r6105@Thesaurus (orig r6104):  arcanez | 2009-05-02 02:33:49 +0200
 remove hackish ways

 r6106@Thesaurus (orig r6105):  arcanez | 2009-05-02 03:20:04 +0200
 more fixes to tests
 r6107@Thesaurus (orig r6106):  arcanez | 2009-05-02 03:33:47 +0200
 remove DBIx::Class::Storage::DBI::MultiDistinctEmulation
 r6111@Thesaurus (orig r6110):  ribasushi | 2009-05-03 02:00:19 +0200
 Failing test without immediate fixes go to branches, not to trunk
 r6114@Thesaurus (orig r6113):  ribasushi | 2009-05-03 10:23:28 +0200
 Bump SQLA ependencies so parenthesis_significant is guaranteed to be there
 r6148@Thesaurus (orig r6147):  ribasushi | 2009-05-06 17:40:31 +0200
 Add subquery/from test by michaelr (copied from subquery branch r5742)
 r6151@Thesaurus (orig r6150):  ribasushi | 2009-05-06 17:56:07 +0200
 TODOify sqla-dependent tests
 r6152@Thesaurus (orig r6151):  arcanez | 2009-05-06 18:33:58 +0200
 fix old test using new bind vars (no more interpolating)
 r6154@Thesaurus (orig r6153):  ribasushi | 2009-05-07 00:56:40 +0200
 Rename internal function to clarify what it does
 r6171@Thesaurus (orig r6170):  ribasushi | 2009-05-07 19:53:30 +0200
 Adjust tests for the IN fixes
 r6187@Thesaurus (orig r6186):  ribasushi | 2009-05-08 23:11:43 +0200
 Final count tests
 r6188@Thesaurus (orig r6187):  arcanez | 2009-05-09 03:50:12 +0200
 rewrite DISTINCT/COUNT(DISTINCT) Cookbook entries
 r6213@Thesaurus (orig r6212):  arcanez | 2009-05-11 22:41:21 +0200
 warn/die based on { select => { distinct => { } } }
 r6214@Thesaurus (orig r6213):  arcanez | 2009-05-11 23:21:11 +0200
 use carp instead of warn
 r6216@Thesaurus (orig r6215):  arcanez | 2009-05-11 23:45:05 +0200
 make sure we get just a string
 r6217@Thesaurus (orig r6216):  arcanez | 2009-05-11 23:52:11 +0200
 oops
---

a876774cce93fa0d27ff1b0d61a1fc1a2741df55
diff --cc t/41orrible.t
index 8c91929,0b5e49b..b0117a7
--- a/t/41orrible.t
+++ b/t/41orrible.t
@@@ -2,9 -2,10 +2,10 @@@ use strict
  use warnings;
  
  use Test::More;
 -use DBIx::Class::Storage::DBI::Oracle::WhereJoins;
 +use DBIx::Class::SQLAHacks::OracleJoins;
  
  use lib qw(t/lib);
+ use DBICTest; # do not remove even though it is not used
  use DBIC::SqlMakerTest;
  
  plan tests => 4;
diff --cc t/73oracle.t
index 2d70a50,c5fe45a..2e73050
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@@ -40,7 -39,7 +40,7 @@@ plan skip_all => 'Set $ENV{DBICTEST_ORA
    ' as well as following sequences: \'pkid1_seq\', \'pkid2_seq\' and \'nonpkid_seq\''
    unless ($dsn && $user && $pass);
  
- plan tests => 32;
 -plan tests => 26;
++plan tests => 34;
  
  DBICTest::Schema->load_classes('ArtistFQN');
  my $schema = DBICTest::Schema->connect($dsn, $user, $pass);