Move Sequel::Model related optimization code to sequel_pg/model

This will allow it to be required separately to optimize model
code if Sequel::Model was not already required when sequel_pg
was loaded.

Author: jeremyevans

lib/sequel_pg/model.rb

@@ -0,0 +1,48 @@
+class Sequel::Postgres::Dataset
+  # If model loads are being optimized and this is a model load, use the optimized
+  # version.
+  def each(&block)
+    rp = row_proc
+    return super unless allow_sequel_pg_optimization? && optimize_model_load?(rp)
+    clone(:_sequel_pg_type=>:model, :_sequel_pg_value=>rp).fetch_rows(sql, &block)
+  end
+
+  # Avoid duplicate method warning
+  alias with_sql_all with_sql_all
+
+  # Always use optimized version
+  def with_sql_all(sql, &block)
+    rp = row_proc
+    return super unless allow_sequel_pg_optimization?
+
+    if optimize_model_load?(rp)
+      clone(:_sequel_pg_type=>:all_model, :_sequel_pg_value=>row_proc).fetch_rows(sql) do |array|
+        post_load(array)
+        array.each(&block) if block
+        return array
+      end
+      []
+    else 
+      clone(:_sequel_pg_type=>:all).fetch_rows(sql) do |array|
+        if rp = row_proc
+          array.map!{|h| rp.call(h)}
+        end
+        post_load(array)
+        array.each(&block) if block
+        return array
+      end
+      []
+    end
+  end
+
+  private
+
+  # The model load can only be optimized if it's for a model and it's not a graphed dataset
+  # or using a cursor.
+  def optimize_model_load?(rp)
+    rp.is_a?(Class) &&
+      rp < Sequel::Model &&
+      rp.method(:call).owner == Sequel::Model::ClassMethods &&
+      opts[:optimize_model_load] != false
+  end
+end

lib/sequel_pg/sequel_pg.rb

@@ -91,28 +91,19 @@ def to_hash_groups(key_column, value_column = nil, opts = Sequel::OPTS)
     end
   end
 
-  # If model loads are being optimized and this is a model load, use the optimized
-  # version.
-  def each(&block)
-    if optimize_model_load?
-      clone(:_sequel_pg_type=>:model, :_sequel_pg_value=>row_proc).fetch_rows(sql, &block)
-    else
-      super
-    end
-  end
-
   # Delegate to with_sql_all using the default SQL
   def all(&block)
     with_sql_all(sql, &block)
   end
 
-  # Always use optimized version
+  # :nocov:
+  # Generally overridden by the model support, only used if the model
+  # support is not used.
   def with_sql_all(sql, &block)
-    return super if opts[:graph] || opts[:cursor]
-    type = optimize_model_load? ? :all_model : :all
-    rp = row_proc
-    clone(:_sequel_pg_type=>type, :_sequel_pg_value=>rp).fetch_rows(sql) do |array|
-      if rp && type == :all
+    return super unless allow_sequel_pg_optimization?
+
+    clone(:_sequel_pg_type=>:all).fetch_rows(sql) do |array|
+      if rp = row_proc
         array.map!{|h| rp.call(h)}
       end
       post_load(array)
@@ -121,6 +112,7 @@ def with_sql_all(sql, &block)
     end
     []
   end
+  # :nocov:
 
   protected
 
@@ -170,19 +162,15 @@ def _select_set_single
     # :nocov:
   end
 
+  if defined?(Sequel::Model::ClassMethods)
+    require_relative 'model'
+  end
+
   private
 
-  # The model load can only be optimized if it's for a model and it's not a graphed dataset
-  # or using a cursor.
-  def optimize_model_load?
-    defined?(Sequel::Model::ClassMethods) &&
-      (rp = row_proc) &&
-      rp.is_a?(Class) &&
-      rp < Sequel::Model &&
-      rp.method(:call).owner == Sequel::Model::ClassMethods &&
-      opts[:optimize_model_load] != false &&
-      !opts[:use_cursor] &&
-      !opts[:graph]
+  # Whether to allow sequel_pg to optimize the each/all/with_sql_all call.
+  def allow_sequel_pg_optimization?
+    (!opts[:graph] || opts[:eager_graph]) && !opts[:cursor]
   end
 end
 

sequel_pg.gemspec

@@ -12,7 +12,7 @@ SEQUEL_PG_GEMSPEC = Gem::Specification.new do |s|
   s.email = "[email protected]"
   s.homepage = "http://github.com/jeremyevans/sequel_pg"
   s.required_ruby_version = ">= 1.9.3"
-  s.files = %w(MIT-LICENSE CHANGELOG README.rdoc Rakefile ext/sequel_pg/extconf.rb ext/sequel_pg/sequel_pg.c lib/sequel_pg/sequel_pg.rb lib/sequel/extensions/pg_streaming.rb)
+  s.files = %w(MIT-LICENSE CHANGELOG README.rdoc Rakefile ext/sequel_pg/extconf.rb ext/sequel_pg/sequel_pg.c lib/sequel_pg/sequel_pg.rb lib/sequel_pg/model.rb lib/sequel/extensions/pg_streaming.rb)
   s.license = 'MIT'
   s.extensions << 'ext/sequel_pg/extconf.rb'
   s.add_dependency("pg", [">= 0.18.0", "!= 1.2.0"])