[Bast-commits] r7283 - in DBIx-Class/0.08/branches/sybase/lib/DBIx/Class: . Storage Storage/DBI

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-08-10 06:11:46 +0000 (Mon, 10 Aug 2009)
New Revision: 7283

Modified:
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/ResultSet.pm
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI.pm
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Replicated.pm
Log:
privatize dormant method - it may be useful for sybase at *some* point

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/ResultSet.pm	2009-08-10 06:08:06 UTC (rev 7282)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/ResultSet.pm	2009-08-10 06:11:46 UTC (rev 7283)
@@ -2770,9 +2770,9 @@
       : (
           ( delete $attrs->{columns} )
             ||
-          $source->storage->order_columns_for_select(
+          $source->storage->_order_select_columns(
               $source,
-              [ $source->columns ]
+              [ $source->columns ],
           )
         )
     ;

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Replicated.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Replicated.pm	2009-08-10 06:08:06 UTC (rev 7282)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Replicated.pm	2009-08-10 06:11:46 UTC (rev 7283)
@@ -326,6 +326,7 @@
     _count_select
     _subq_count_select
     _subq_update_delete
+    _order_select_columns
     svp_rollback
     svp_begin
     svp_release

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI.pm	2009-08-10 06:08:06 UTC (rev 7282)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI.pm	2009-08-10 06:11:46 UTC (rev 7283)
@@ -1868,7 +1868,22 @@
   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 @@
     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;