From: Brandon L. Black <blblack@gmail.com>
Date: Mon, 31 Jul 2006 20:31:20 +0000 (+0000)
Subject: Merge 'trunk' into 'DBIx-Class-current'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a9196897efe0c699d743adcf41ba5ebcdaf30931;p=dbsrgits%2FDBIx-Class-Historic.git

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

r11259@evoc8 (orig r2634):  ningu | 2006-07-27 01:22:57 -0500
add result_class to ResultSourceProxy; move _ident_cond into CDBI code, not needed elsewhere
r11260@evoc8 (orig r2635):  ningu | 2006-07-27 01:32:47 -0500
small cleanup to ResultSourceProxy
r11261@evoc8 (orig r2636):  castaway | 2006-07-27 02:13:53 -0500
Add some new docs

r11262@evoc8 (orig r2637):  castaway | 2006-07-27 02:28:11 -0500
Documentation improvements

r13028@evoc8 (orig r2641):  dwc | 2006-07-27 22:19:58 -0500
Add previous changes for 0.07001
r13029@evoc8 (orig r2642):  dwc | 2006-07-27 22:30:28 -0500
Remove anonymous blesses to avoid major speed hit on Fedora Core 5, or 'the anti-dead-rat fix'
r13030@evoc8 (orig r2643):  dwc | 2006-07-27 23:14:05 -0500
Pass attrs to find from update_or_create (reported by Nathan Kurz)
r13031@evoc8 (orig r2644):  dwc | 2006-07-27 23:20:15 -0500
Typo in scalar ref example
r13032@evoc8 (orig r2645):  dwc | 2006-07-27 23:25:35 -0500
Add missing quote to example.  I looked over this last night, but I guess my eyes aren't working as well anymore.
r13033@evoc8 (orig r2646):  dwc | 2006-07-27 23:55:37 -0500
Minor test cleanup (I think I'm losing my mind)
r13092@evoc8 (orig r2650):  blblack | 2006-07-31 15:31:05 -0500
added Cwd 3.19 + Alg::C3 0.02 to requirements
---

a9196897efe0c699d743adcf41ba5ebcdaf30931
diff --cc lib/DBIx/Class/ResultSourceProxy.pm
index 591927f,a668164..c1d6164
--- a/lib/DBIx/Class/ResultSourceProxy.pm
+++ b/lib/DBIx/Class/ResultSourceProxy.pm
@@@ -31,16 -31,11 +31,15 @@@ sub has_column 
  }
  
  sub column_info {
-   my ($self, $column) = @_;
-   return $self->result_source_instance->column_info($column);
+   shift->result_source_instance->column_info(@_);
  }
  
 +sub load_column_info_from_storage {
 +  shift->result_source_instance->load_column_info_from_storage;
 +}
 +
  sub columns {
-   return shift->result_source_instance->columns(@_);
+   shift->result_source_instance->columns(@_);
  }
  
  sub remove_columns {
diff --cc lib/DBIx/Class/Storage/DBI.pm
index dff783b,5984c94..22aa2c1
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@@ -278,11 -275,9 +278,11 @@@ Constructor.  Only argument is the sche
  =cut
  
  sub new {
 +  my ($self, $schema) = @_;
 +
-   my $new = bless({}, ref $self || $self);
- 
+   my $new = {};
+   bless $new, (ref $_[0] || $_[0]);
 -
 +  $new->set_schema($schema);
    $new->cursor("DBIx::Class::Storage::DBI::Cursor");
    $new->transaction_depth(0);