more unfactoring before we refactor

1 files changed, 24 insertions, 3 deletions

diff --git a/lib/arel/algebra/relations/operations/skip.rb b/lib/arel/algebra/relations/operations/skip.rb
index 43db134ea0..f6a58d15bd 100644
--- a/lib/arel/algebra/relations/operations/skip.rb
+++ b/lib/arel/algebra/relations/operations/skip.rb
@@ -1,7 +1,28 @@
 module Arel
   class Skip < Compound
-    attributes :relation, :skipped
-    deriving   :initialize, :==
-    requires   :skipping
+    attr_reader :relation, :skipped
+
+    def initialize relation, skipped
+      super(relation)
+      @skipped = skipped
+    end
+
+    def == other
+      super ||
+        Skip === other &&
+        relation == other.relation &&
+        skipped == other.skipped
+    end
+
+    def engine
+      engine   = relation.engine
+
+      # Temporary check of whether or not the engine supports where.
+      if engine.respond_to?(:supports) && !engine.supports(:skipping)
+        Memory::Engine.new
+      else
+        engine
+      end
+    end
   end
 end