diff options
| -rw-r--r-- | doc/TODO | 8 | ||||
| -rw-r--r-- | lib/arel/algebra/relations/relation.rb | 2 | ||||
| -rw-r--r-- | lib/arel/engines/memory/engine.rb | 4 | ||||
| -rw-r--r-- | lib/arel/engines/memory/relations.rb | 1 | ||||
| -rw-r--r-- | lib/arel/engines/memory/relations/writes.rb | 7 | ||||
| -rw-r--r-- | lib/arel/session.rb | 3 | ||||
| -rw-r--r-- | spec/arel/engines/memory/unit/relations/insert_spec.rb | 28 |
7 files changed, 49 insertions, 4 deletions
@@ -1,11 +1,12 @@ todo: -- fix AR +- insertions for in memory - cross-engine joins - blocks for joins -- deal with table tests in algebra +- test sql insertions - implement mnesia adapter -- rename externalize to derived. +- rename externalize to derived. +- deal with table tests in algebra - fix grouping - audit unit coverage of algebra - data objects @@ -92,6 +93,7 @@ done: - result sets to attr correlation too - implement joins in memory - result sets should be array relations +- fix AR icebox: - #bind in Attribute and Expression should be doing a descend? diff --git a/lib/arel/algebra/relations/relation.rb b/lib/arel/algebra/relations/relation.rb index c38ab0e9c5..9fdac26528 100644 --- a/lib/arel/algebra/relations/relation.rb +++ b/lib/arel/algebra/relations/relation.rb @@ -57,7 +57,7 @@ module Arel module Writable def insert(record) - session.create Insert.new(self, record); self + session.create Insert.new(self, record) end def update(assignments) diff --git a/lib/arel/engines/memory/engine.rb b/lib/arel/engines/memory/engine.rb index 67a084f2cd..c8f79c9d57 100644 --- a/lib/arel/engines/memory/engine.rb +++ b/lib/arel/engines/memory/engine.rb @@ -5,6 +5,10 @@ module Arel def read(relation) relation.eval end + + def create(relation) + relation.eval + end end include CRUD end diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb index 1b009537b9..c67af2d63b 100644 --- a/lib/arel/engines/memory/relations.rb +++ b/lib/arel/engines/memory/relations.rb @@ -1,4 +1,5 @@ require 'arel/engines/memory/relations/array' require 'arel/engines/memory/relations/operations' +require 'arel/engines/memory/relations/writes' require 'arel/engines/memory/relations/compound' diff --git a/lib/arel/engines/memory/relations/writes.rb b/lib/arel/engines/memory/relations/writes.rb new file mode 100644 index 0000000000..fa8b84a32c --- /dev/null +++ b/lib/arel/engines/memory/relations/writes.rb @@ -0,0 +1,7 @@ +module Arel + class Insert < Compound + def eval + unoperated_rows + [Row.new(self, record.values.collect(&:value))] + end + end +end
\ No newline at end of file diff --git a/lib/arel/session.rb b/lib/arel/session.rb index cf04e8a93a..921ad0a7ac 100644 --- a/lib/arel/session.rb +++ b/lib/arel/session.rb @@ -24,6 +24,7 @@ module Arel module CRUD def create(insert) insert.call + insert end def read(select) @@ -34,10 +35,12 @@ module Arel def update(update) update.call + update end def delete(delete) delete.call + delete end end include CRUD diff --git a/spec/arel/engines/memory/unit/relations/insert_spec.rb b/spec/arel/engines/memory/unit/relations/insert_spec.rb new file mode 100644 index 0000000000..4b5e8833a0 --- /dev/null +++ b/spec/arel/engines/memory/unit/relations/insert_spec.rb @@ -0,0 +1,28 @@ +require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper') + +module Arel + describe Insert do + before do + @relation = Array.new([ + [1, 'duck' ], + [2, 'duck' ], + [3, 'goose'] + ], [:id, :name]) + end + + describe '#call' do + it "manufactures an array of hashes of attributes to values" do + @relation \ + .insert(@relation[:id] => 4, @relation[:name] => 'guinea fowl') \ + .let do |relation| + relation.call.should == [ + Row.new(relation, [1, 'duck']), + Row.new(relation, [2, 'duck']), + Row.new(relation, [3, 'goose']), + Row.new(relation, [4, 'guinea fowl']) + ] + end + end + end + end +end
\ No newline at end of file |