From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sun, 27 Nov 2005 03:50:33 +0000 (+0000)
Subject: Merge 'DBIx-Class-C3' into 'DBIx-Class-resultset'
X-Git-Tag: v0.05005~119^2~37
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7fcaa6a76764758db15e4bcc5c59433e555999d2;p=dbsrgits%2FDBIx-Class.git

Merge 'DBIx-Class-C3' into 'DBIx-Class-resultset'

r3593@obrien (orig r290):  paulm | 2005-11-08 17:02:49 +0000
Minor whitespace tweaks to make each file more distinct. Add note for CDBI folks to watch out.

r3594@obrien (orig r291):  matthewt | 2005-11-08 17:25:02 +0000
- Added fix to avoid undef warnings in CDBICompat stringify
r3746@obrien (orig r292):  paulm | 2005-11-10 14:05:55 +0000
Added some examples and explanations for search()

r3747@obrien (orig r293):  paulm | 2005-11-10 15:15:33 +0000
Change /record ?set/ to resultset incl. ResultSet in POD; typo.

r3749@obrien (orig r295):  andyg | 2005-11-14 17:57:49 +0000
Fixed typo in Build.PL
r3751@obrien (orig r297):  matthewt | 2005-11-15 03:55:24 +0000
- Bugfixes, optimisations
r3752@obrien (orig r298):  matthewt | 2005-11-15 06:21:38 +0000
- Added has_column and column_info methods
r3757@obrien (orig r303):  paulm | 2005-11-15 15:26:22 +0000
Add Class::Trigger and DBIx::ContextualFetch to build requirements
(needed for CDBICompat only)

r3760@obrien (orig r306):  ningu | 2005-11-18 17:26:52 +0000
- fix PK::Auto bug where it wouldn't recognize a defined but false PK
r3761@obrien (orig r307):  ningu | 2005-11-18 17:35:41 +0000
- update fix in last rev to use has_column
r3940@obrien (orig r311):  ningu | 2005-11-20 21:56:49 +0000
- docs patch from dopplecoder with cleanups to Cookbook example
r3941@obrien (orig r312):  ningu | 2005-11-20 22:00:25 +0000
- small cleanup to last patch
r3989@obrien (orig r316):  matthewt | 2005-11-24 23:56:06 +0000
- Applied Brandon Black's patch to PK::Auto::Pg
r4014@obrien (orig r319):  matthewt | 2005-11-26 23:10:13 +0000
 r3754@obrien (orig r300):  matthewt | 2005-11-15 09:05:09 +0000
 - Broke everything (C3 branch)

r4015@obrien (orig r320):  matthewt | 2005-11-26 23:10:30 +0000
 r3755@obrien (orig r301):  matthewt | 2005-11-15 09:32:16 +0000
 - Schema now loads

r4016@obrien (orig r321):  matthewt | 2005-11-26 23:10:36 +0000
 r3756@obrien (orig r302):  matthewt | 2005-11-15 10:00:36 +0000
 - Getting there ...

r4017@obrien (orig r322):  matthewt | 2005-11-26 23:10:42 +0000

r4018@obrien (orig r323):  matthewt | 2005-11-26 23:10:48 +0000
 r3759@obrien (orig r305):  matthewt | 2005-11-15 20:48:44 +0000
 - Shoved Class::Data::Inheritable into DBIx::Class, more stuff works now

r4019@obrien (orig r324):  matthewt | 2005-11-26 23:11:03 +0000
 r3763@obrien (orig r309):  matthewt | 2005-11-20 02:29:04 +0000
 - Dumped anti-NEXT-breakage hack in CDBICompat stringify

r4020@obrien (orig r325):  matthewt | 2005-11-26 23:11:10 +0000
 r3764@obrien (orig r310):  matthewt | 2005-11-20 17:02:23 +0000
 - 0.3999_01 changes

r4021@obrien (orig r326):  matthewt | 2005-11-26 23:11:20 +0000
 r3987@obrien (orig r314):  matthewt | 2005-11-24 05:27:49 +0000
 - With the addition of Class::C3 0.07 and a few tweaks, C3 branch works!

r4022@obrien (orig r327):  matthewt | 2005-11-26 23:13:03 +0000
 r3988@obrien (orig r315):  matthewt | 2005-11-24 06:23:39 +0000
 - Updated version and POD

r4023@obrien (orig r328):  matthewt | 2005-11-26 23:13:10 +0000
 r3990@obrien (orig r317):  matthewt | 2005-11-25 01:15:47 +0000
 - Version bumped to 0.03999_03, fix for Auto::PK issues in MySQL tests

r4024@obrien (orig r329):  matthewt | 2005-11-26 23:13:19 +0000

r4026@obrien (orig r331):  matthewt | 2005-11-27 03:50:14 +0000
- Committed version bump to DBIx::Class
---

7fcaa6a76764758db15e4bcc5c59433e555999d2
diff --cc Build.PL
index 0c22671,af41bb1..8ecb489
--- a/Build.PL
+++ b/Build.PL
@@@ -14,11 -13,15 +13,16 @@@ my %arguments = 
          'SQL::Abstract'             => 1.20,
          'SQL::Abstract::Limit'      => 0.101,
          'DBD::SQLite'               => 1.08,
+         'Class::C3'                 => 0.07,
  	'Tie::IxHash'               => 0,
-         'Storable'                  => 0,
          'Module::Find'              => 0,
+         'Storable'                  => 0,
+         # Following for CDBICompat only
+         'Class::Trigger'            => 0,
+         'DBIx::ContextualFetch'     => 0,
++        'Class::C3'                 => 0.05,
      },
-     reommends          => {
+     recommends          => {
          'Data::UUID'                => 0,
      },
      create_makefile_pl => 'passthrough',
diff --cc META.yml
index 8521557,878a16c..0000000
deleted file mode 100644,100644
--- a/META.yml
+++ /dev/null
diff --cc lib/DBIx/Class.pm
index 0d2f400,8ad1a6d..8966c98
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -4,9 -4,9 +4,9 @@@ use strict
  use warnings;
  
  use vars qw($VERSION);
- use base qw/DBIx::Class::Componentised/;
+ use base qw/DBIx::Class::Componentised Class::Data::Inheritable/;
  
- $VERSION = '0.03003';
 -$VERSION = '0.03999_03';
++$VERSION = '0.04';
  
  
  1;