From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 10 Aug 2009 06:11:46 +0000 (+0000)
Subject: privatize dormant method - it may be useful for sybase at *some* point
X-Git-Tag: v0.08112~14^2~66
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=90a63099ad8b0269a300f6aa1c48d336e9e6c21e;hp=6f7344b8c4e5f208a18f4ae5023333f02a1584bb

privatize dormant method - it may be useful for sybase at *some* point
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index f86a6ca..e2dab82 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -2770,9 +2770,9 @@ sub _resolved_attrs {
       : (
           ( delete $attrs->{columns} )
             ||
-          $source->storage->order_columns_for_select(
+          $source->storage->_order_select_columns(
               $source,
-              [ $source->columns ]
+              [ $source->columns ],
           )
         )
     ;
diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index d321545..355edf9 100644
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -1868,6 +1868,21 @@ sub _subq_count_select {
   return @pcols ? \@pcols : [ 1 ];
 }
 
+#
+# Returns an ordered list of column names before they are used
+# in a SELECT statement. By default simply returns the list
+# passed in.
+#
+# This may be overridden in a specific storage when there are
+# requirements such as moving BLOB columns to the end of the 
+# SELECT list.
+sub _order_select_columns {
+  #my ($self, $source, $columns) = @_;
+  return @{$_[2]};
+}
+
+
+
 
 sub source_bind_attributes {
   my ($self, $source) = @_;
@@ -2433,23 +2448,6 @@ sub lag_behind_master {
     return;
 }
 
-=head2 order_columns_for_select
-
-Returns an ordered list of column names for use with a C<SELECT> when the column
-list is not explicitly specified.
-By default returns the result of L<DBIx::Class::ResultSource/columns>.
-
-This may be overridden in a specific storage when there are requirements such
-as moving C<BLOB> columns to the end of the list.
-
-=cut
-
-sub order_columns_for_select {
-  my ($self, $source, $columns) = @_;
-
-  return @$columns;
-}
-
 sub DESTROY {
   my $self = shift;
   return if !$self->_dbh;
diff --git a/lib/DBIx/Class/Storage/DBI/Replicated.pm b/lib/DBIx/Class/Storage/DBI/Replicated.pm
index 322e7df..8badd5c 100644
--- a/lib/DBIx/Class/Storage/DBI/Replicated.pm
+++ b/lib/DBIx/Class/Storage/DBI/Replicated.pm
@@ -326,6 +326,7 @@ has 'write_handler' => (
     _count_select
     _subq_count_select
     _subq_update_delete
+    _order_select_columns
     svp_rollback
     svp_begin
     svp_release