lib/mongo/collection/view/aggregation.rb in mongo-2.4.0.rc0 vs lib/mongo/collection/view/aggregation.rb in mongo-2.4.0.rc1

- old
+ new

@@ -118,10 +118,12 @@ validate_collation!(server) initial_query_op.execute(server) end def validate_collation!(server) - raise Error::UnsupportedCollation.new if @options[:collation] && !server.features.collation_enabled? + if (@options[:collation] || @options[Operation::COLLATION]) && !server.features.collation_enabled? + raise Error::UnsupportedCollation.new + end end end end end end