0
@@ -536,8 +536,8 @@
0
           unless query.order.empty?
0
             parts = []
0
             query.order.each do |item|
0
-              parts << item.name if DataMapper::Property === item
0
-              parts << "#{item.property.name} #{item.direction}" if DataMapper::Query::Direction === item
0
+              parts << item.field if DataMapper::Property === item
0
+              parts << "#{item.property.field} #{item.direction}" if DataMapper::Query::Direction === item
0
             end
0
             sql << " ORDER BY #{parts.join(', ')}"
0
           end

0
@@ -237,6 +237,21 @@
0
         other = DataMapper::Query.new(repository(:mock), Article, :order => order)
0
         @query.update(other).order.should == order
0
       end
0
+      
0
+      it "#order with a property that uses :field => something" do
0
+        class Article
0
+          property :plank, String, :field => 'real_plank'
0
+        end
0
+
0
+        query = DataMapper::Query.new(repository(:mock), Article, :order => [:plank.desc])
0
+        
0
+        query.order.first.property.should == Article.properties[:plank]
0
+        query.order.first.property.field.should == 'real_plank'
0
+        query.order.first.direction.should == :desc
0
+        
0
+        # this is the real test here, I can't find any other way to make it parse the order into sql than to run the whole query through
0
+        repository(:mock).adapter.query_read_statement(query).should == %Q{SELECT "id", "blog_id", "created_at", "author", "title" FROM "articles" ORDER BY real_plank desc}
0
+      end
0
 
0
       # dkubb: I am not sure i understand the intent here. link now needs to be
0
       #       a DM::Assoc::Relationship or the name (Symbol or String) of an