@@ -4,16 +4,20 @@ module Koios attr_reader :engine - def call(&blk) - engine.read(self, &blk) + def eval + @rows ||= engine.read(self) + @rows end def reload - # NOOP + @rows = nil + true end - def each(&blk) - engine.read(self, &blk) + def each + eval.each do |r| + yield r + end end def where(query = nil) @@ -57,16 +61,16 @@ module Koios end def length - engine.read(self).length + eval.length end def [](i) - engine.read(self)[i] + eval[i] end def first(query = nil) - return engine.read(self).first unless query - all(query).first + return all(query).first if query + eval.first end def empty? lib/koios/algebra/relation.rb @@ -6,6 +6,10 @@ module Koios delegate :join?, :engine, :properties, :name, :externalizable?, :to => :relation + def initialize(relation) + @relation = relation + end + def properties @properties ||= relation.properties.bind(self) end lib/koios/algebra/relations/compound.rb @@ -41,9 +41,6 @@ module Koios begin while reader.next! rows << (obj = relation.load(reader.values)) - if block_given? - yield obj - end end ensure reader.close lib/koios/engines/sql.rb @@ -62,6 +62,10 @@ module Koios def create(attrs = {}) new(attrs).tap { |i| i.save } end + + def eval + Compound.new(self).eval + end end def model lib/koios/resource.rb @@ -20,6 +20,7 @@ Spec::Runner.configure do |config| def empty! before :all do @relation.each { |resource| resource.destroy } + @relation.reload end end end) spec/spec_helper.rb a26db7e8ec0299ddaa9fc5a155658b9ec0bccfa7 Carl Lerche carllerche@mac.com http://github.com/carllerche/koios/commit/4d8be0714cc677cd3b43662b13e36706468018f9 4d8be0714cc677cd3b43662b13e36706468018f9 2009-11-02T10:05:30-08:00 2009-11-02T10:05:30-08:00 Change up relations to call eval to fetch records 3918af89990ee2287d31379355ef630d00c5ad83 Carl Lerche carllerche@mac.com