From: Daniel Westermann-Clark <danieltwc@cpan.org>
Date: Tue, 18 Apr 2006 18:19:31 +0000 (+0000)
Subject: Merge 'DBIx-Class-current' into 'find_changes'
X-Git-Tag: v0.07002~75^2~237^2~16
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=79e116f08f795c6ae039c6d9cfca84cabbcdf1ed;p=dbsrgits%2FDBIx-Class.git

Merge 'DBIx-Class-current' into 'find_changes'
---

79e116f08f795c6ae039c6d9cfca84cabbcdf1ed
diff --cc Changes
index 948ae23,aac5233..ea392d3
--- a/Changes
+++ b/Changes
@@@ -6,10 -6,9 +6,9 @@@ Revision history for DBIx::Clas
  	- load_classes now uses source_name and sets it if necessary
  
  0.06002
-         - nuke ResultSource caching of ->resultset for consistency reasons
          - fix for -and conditions when updating or deleting on a ResultSet
  
--0.06001 2006-04-08 21:48:43
++0.06001
          - minor fix to update in case of undefined rels
          - fixes for cascade delete
          - substantial improvements and fixes to deploy
@@@ -20,14 -19,14 +19,14 @@@
          - bugfix to Cursor to avoid error during DESTROY
          - transaction DBI operations now in debug trace output
  
--0.06000 2006-03-25 18:03:46
++0.06000
          - Lots of documentation improvements
          - Minor tweak to related_resultset to prevent it storing a searched rs
          - Fixup to columns_info_for when database returns type(size)
          - Made do_txn respect void context (on the off-chance somebody cares)
          - Fix exception text for nonexistent key in ResultSet::find()
  
--0.05999_04 2006-03-18 19:20:49
++0.05999_04
          - Fix for delete on full-table resultsets
          - Removed caching on count() and added _count for pager()
          - ->connection does nothing if ->storage defined and no args
diff --cc lib/DBIx/Class/Manual/Cookbook.pod
index 35b7d40,35b7d40..ed00d46
--- a/lib/DBIx/Class/Manual/Cookbook.pod
+++ b/lib/DBIx/Class/Manual/Cookbook.pod
@@@ -562,8 -562,8 +562,8 @@@ instead
                           },
    );
    
--  $translator->parser('SQL::Translator::Parser::DBIx::Class');
--  $translator->producer('SQL::Translator::Producer::DBIx::Class::File');
++  $translator->parser('DBIx::Class');
++  $translator->producer('DBIx::Class::File');
    
    my $output = $translator->translate(@args) or die
            "Error: " . $translator->error;