Make Model.any? forward to the dataset, to work better with the any_not_empty extension

In Sequel 6, we'll likely change behavior to forward most or all
Enumerable methods to the dataset, with a plugin for the current
behavior (for the users that may be overriding Model.each).

Author: jeremyevans

CHANGELOG

@@ -1,5 +1,7 @@
 === master
 
+* Make Model.any? forward to the dataset, to work better with the any_not_empty extension (jeremyevans) (#2337)
+
 * Make the rcte_tree and split_values plugins work together (jeremyevans)
 
 * Make split_values plugin work when eager loading using join tables (jeremyevans) (#2336)

lib/sequel/model/base.rb

@@ -2,13 +2,15 @@
 
 module Sequel
   class Model
+    # SEQUEL6: Remove Enumerable here, and send all Enumerable methods to dataset
+    # by default, with a plugin for the current behavior.
     extend Enumerable
     extend Inflections
 
     # Class methods for Sequel::Model that implement basic model functionality.
     #
     # * All of the following methods have class methods created that send the method
-    #   to the model's dataset: all, as_hash, avg, count, cross_join, distinct, each,
+    #   to the model's dataset: all, any?, as_hash, avg, count, cross_join, distinct, each,
     #   each_server, empty?, except, exclude, exclude_having, fetch_rows,
     #   filter, first, first!, for_update, from, from_self, full_join, full_outer_join,
     #   get, graph, grep, group, group_and_count, group_append, group_by, having, import,
@@ -695,7 +697,7 @@ def with_pk!(pk)
       end
 
       # Add model methods that call dataset methods
-      Plugins.def_dataset_methods(self, (Dataset::ACTION_METHODS + Dataset::QUERY_METHODS + [:each_server]) - [:<<, :or, :[], :columns, :columns!, :delete, :update, :set_graph_aliases, :add_graph_aliases])
+      Plugins.def_dataset_methods(self, (Dataset::ACTION_METHODS + Dataset::QUERY_METHODS + [:any?, :each_server]) - [:<<, :or, :[], :columns, :columns!, :delete, :update, :set_graph_aliases, :add_graph_aliases])
 
       private
 

spec/extensions/any_not_empty_spec.rb

@@ -12,6 +12,17 @@
     @ds.db.sqls.must_equal ["SELECT 1 AS one FROM t LIMIT 1"]
   end
 
+  it "should use a limited query if called on a model" do
+    @c = Sequel::Model(@ds)
+    @ds.db.sqls
+    @ds.db.fetch = {:one=>1}
+    @c.any?.must_equal true
+    @ds.db.sqls.must_equal ["SELECT 1 AS one FROM t LIMIT 1"]
+    @ds.db.fetch = []
+    @c.any?.must_equal false
+    @ds.db.sqls.must_equal ["SELECT 1 AS one FROM t LIMIT 1"]
+  end
+
   it "should use default behavior if block is given" do
     @ds.with_fetch(:one=>1).any?{|x| x[:one] == 1}.must_equal true
     @ds.db.sqls.must_equal ["SELECT * FROM t"]

spec/model/class_dataset_methods_spec.rb

@@ -11,6 +11,8 @@
   it "should call the dataset method of the same name with the same args" do
     @c.all.must_equal [@c.load(:id=>1)]
     @db.sqls.must_equal ["SELECT * FROM items"]
+    @c.any?.must_equal true
+    @db.sqls.must_equal ["SELECT * FROM items"]
     @c.avg(:id).must_equal 1
     @db.sqls.must_equal ["SELECT avg(id) AS avg FROM items LIMIT 1"]
     @c.count.must_equal 1