Merge 'column_info_from_storage' into 'DBIx-Class-current'

diff --combined lib/DBIx/Class/ResultSource.pm
index 864f8f0,2cf6a97..2b81444
--- 1/lib/DBIx/Class/ResultSource.pm
--- 2/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@@ -12,10 -12,10 +12,10 @@@ __PACKAGE__->load_components(qw/Accesso
  
  __PACKAGE__->mk_group_accessors('simple' => qw/_ordered_columns
    _columns _primaries _unique_constraints name resultset_attributes
-   schema from _relationships source_name/);
 -  schema from _relationships column_info_from_storage/);
++  schema from _relationships column_info_from_storage source_name/);
  
  __PACKAGE__->mk_group_accessors('component_class' => qw/resultset_class
 -  result_class source_name/);
 +  result_class/);
  
  =head1 NAME
  
@@@ -181,6 -181,7 +181,7 @@@ sub column_info 
      unless exists $self->_columns->{$column};
    #warn $self->{_columns_info_loaded}, "\n";
    if ( ! $self->_columns->{$column}{data_type}
+        and $self->column_info_from_storage
         and ! $self->{_columns_info_loaded}
         and $self->schema and $self->storage )
    {
@@@ -201,6 -202,15 +202,15 @@@
    return $self->_columns->{$column};
  }
  
+ =head2 load_column_info_from_storage
+ 
+ Enables the on-demand automatic loading of the above column
+ metadata from storage as neccesary.
+ 
+ =cut
+ 
+ sub load_column_info_from_storage { shift->column_info_from_storage(1) }
+ 
  =head2 columns
  
    my @column_names = $obj->columns;