From: Matt S Trout <mst@shadowcat.co.uk>
Date: Wed, 19 Apr 2006 23:46:58 +0000 (+0000)
Subject: Merge 'trunk' into 'DBIx-Class-current'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b2078cd5ce75c6b74ddcec39369dea28390345d9;p=dbsrgits%2FDBIx-Class-Historic.git

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

r9713@obrien (orig r1493):  purge | 2006-04-19 19:57:26 +0100
=Test for Data::Dumper::Sortkeys incompatibility (export DATA_DUMPER_TEST=1).
r9714@obrien (orig r1494):  matthewt | 2006-04-19 21:18:18 +0100
Fix to copy
r9715@obrien (orig r1495):  matthewt | 2006-04-19 21:47:36 +0100
fixup for Dumper brain damage
r9718@obrien (orig r1496):  matthewt | 2006-04-19 23:01:31 +0100
make set_from_related handle undef
r9719@obrien (orig r1497):  matthewt | 2006-04-20 00:19:13 +0100
nuked last remaining each uses. just because.
r9720@obrien (orig r1498):  matthewt | 2006-04-20 00:45:47 +0100
Changes for 0.06002
---

b2078cd5ce75c6b74ddcec39369dea28390345d9
diff --cc Changes
index bfd86af,0d1e740..e8b7378
--- a/Changes
+++ b/Changes
@@@ -1,22 -1,9 +1,25 @@@
  Revision history for DBIx::Class
  
 +        - modified SQLT parser to skip dupe table names
 +        - added remove_column(s) to ResultSource/ResultSourceProxy
 +        - added add_column alias to ResultSourceProxy
 +        - added source_name to ResultSource
 +        - load_classes now uses source_name and sets it if necessary
 +        - add update_or_create_related to Relationship::Base
 +        - add find_or_new to ResultSet/ResultSetProxy and find_or_new_related
 +          to Relationship::Base
 +        - add accessors for unique constraint names and coulums to
 +          ResultSource/ResultSourceProxy
 +        - rework ResultSet::find() to search unique constraints
 +        - CDBICompat: modify retrieve to fix column casing when ColumnCase is
 +          loaded
 +        - CDBICompat: override find_or_create to fix column casing when
 +          ColumnCase is loaded
 +
- 0.06002
+ 0.06002 2006-04-20 00:42:41
+         - fix set_from_related to accept undef
+         - fix to Dumper-induced hash iteration bug
+         - fix to copy() with non-composed resultsource
          - fix to ->search without args to clone rs but maintain cache
          - grab $self->dbh once per function in Storage::DBI
          - nuke ResultSource caching of ->resultset for consistency reasons
diff --cc t/run/06relationship.tl
index 19fceb8,bc84c2e..b85fea1
--- a/t/run/06relationship.tl
+++ b/t/run/06relationship.tl
@@@ -3,7 -3,7 +3,7 @@@ my $schema = shift
  
  use strict;
  use warnings;  
- plan tests => 29;
 -plan tests => 26;
++plan tests => 30;
  
  # has_a test
  my $cd = $schema->resultset("CD")->find(4);