Merge 'trunk' into 'sybase_support'

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / ResultSet.pm

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 45e838f..60da1ca 100644 (file)
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -2796,7 +2796,10 @@ sub _resolved_attrs {
       : (
           ( delete $attrs->{columns} )
             ||
-          $source->columns
+          $source->storage->_order_select_columns(
+              $source,
+              [ $source->columns ],
+          )
         )
     ;