From 7032a50297fce4d7724d1735e81e5df5fd919e71 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:31:04 -0400
Subject: reorganized file structures

Conflicts:

	lib/arel.rb
	lib/arel/arel.rb
	lib/arel/engines/memory/predicates.rb
	lib/arel/engines/memory/relations/array.rb
	lib/arel/engines/sql/relations/table.rb
---
 lib/arel/engines/memory/engine.rb                  | 12 +++++
 lib/arel/engines/memory/predicates.rb              | 58 ++++++++++++++++++++++
 lib/arel/engines/memory/primitives.rb              |  2 +
 lib/arel/engines/memory/primitives/attribute.rb    |  7 +++
 lib/arel/engines/memory/primitives/value.rb        |  7 +++
 lib/arel/engines/memory/relations.rb               |  2 +
 lib/arel/engines/memory/relations/array.rb         | 21 ++++++++
 .../engines/memory/relations/operations/where.rb   |  7 +++
 8 files changed, 116 insertions(+)
 create mode 100644 lib/arel/engines/memory/engine.rb
 create mode 100644 lib/arel/engines/memory/predicates.rb
 create mode 100644 lib/arel/engines/memory/primitives.rb
 create mode 100644 lib/arel/engines/memory/primitives/attribute.rb
 create mode 100644 lib/arel/engines/memory/primitives/value.rb
 create mode 100644 lib/arel/engines/memory/relations.rb
 create mode 100644 lib/arel/engines/memory/relations/array.rb
 create mode 100644 lib/arel/engines/memory/relations/operations/where.rb

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/engine.rb b/lib/arel/engines/memory/engine.rb
new file mode 100644
index 0000000000..67a084f2cd
--- /dev/null
+++ b/lib/arel/engines/memory/engine.rb
@@ -0,0 +1,12 @@
+module Arel
+  module Memory
+    class Engine
+      module CRUD
+        def read(relation)
+          relation.eval
+        end
+      end
+      include CRUD
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb
new file mode 100644
index 0000000000..3522ea3ffa
--- /dev/null
+++ b/lib/arel/engines/memory/predicates.rb
@@ -0,0 +1,58 @@
+module Arel
+  class Predicate
+    def or(other_predicate)
+      Or.new(self, other_predicate)
+    end
+
+    def and(other_predicate)
+      And.new(self, other_predicate)
+    end
+  end
+
+  class Binary < Predicate
+    def eval(row)
+      operand1.eval(row).send(operator, operand2.eval(row))
+    end
+  end
+
+  class CompoundPredicate < Binary
+    def to_sql(formatter = nil)
+      "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})"
+    end
+  end
+
+  class Or < CompoundPredicate
+    def predicate_sql; "OR" end
+  end
+
+  class And < CompoundPredicate
+    def predicate_sql; "AND" end
+  end
+
+  class Equality < Binary
+    def ==(other)
+      Equality === other and
+        ((operand1 == other.operand1 and operand2 == other.operand2) or
+         (operand1 == other.operand2 and operand2 == other.operand1))
+    end
+  end
+
+  class GreaterThanOrEqualTo < Binary
+  end
+
+  class GreaterThan < Binary
+  end
+
+  class LessThanOrEqualTo < Binary
+  end
+
+  class LessThan < Binary
+    def operator; :< end
+  end
+
+  class Match < Binary
+  end
+
+  class In < Binary
+  end
+end
diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb
new file mode 100644
index 0000000000..4d5c76e956
--- /dev/null
+++ b/lib/arel/engines/memory/primitives.rb
@@ -0,0 +1,2 @@
+require 'arel/engines/memory/primitives/attribute'
+require 'arel/engines/memory/primitives/value'
diff --git a/lib/arel/engines/memory/primitives/attribute.rb b/lib/arel/engines/memory/primitives/attribute.rb
new file mode 100644
index 0000000000..9864feadc2
--- /dev/null
+++ b/lib/arel/engines/memory/primitives/attribute.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Attribute
+    def eval(row)
+      row[self]
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/primitives/value.rb b/lib/arel/engines/memory/primitives/value.rb
new file mode 100644
index 0000000000..b83cd02e57
--- /dev/null
+++ b/lib/arel/engines/memory/primitives/value.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Value
+    def eval(row)
+      value
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
new file mode 100644
index 0000000000..6361d7c9d7
--- /dev/null
+++ b/lib/arel/engines/memory/relations.rb
@@ -0,0 +1,2 @@
+require 'arel/engines/memory/relations/array'
+require 'arel/engines/memory/relations/operations/where'
diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb
new file mode 100644
index 0000000000..c02c62891b
--- /dev/null
+++ b/lib/arel/engines/memory/relations/array.rb
@@ -0,0 +1,21 @@
+module Arel
+  class Array < Relation
+    attributes :array,  :attribute_names
+    deriving :initialize
+    include Recursion::BaseCase
+    
+    def engine
+      @engine ||= Memory::Engine.new
+    end
+
+    def attributes
+      @attributes ||= @attribute_names.collect do |name|
+        Attribute.new(self, name.to_sym)
+      end
+    end
+
+    def eval
+      @array.collect { |row| attributes.zip(row).to_hash }
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations/operations/where.rb b/lib/arel/engines/memory/relations/operations/where.rb
new file mode 100644
index 0000000000..eb11fb55fd
--- /dev/null
+++ b/lib/arel/engines/memory/relations/operations/where.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Where < Compound
+    def eval
+      relation.eval.select { |row| predicate.eval(row) }
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From b0a45d52fdb7d8ce564f4dc2013bc790f98f1da3 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:38:09 -0400
Subject: consolidated files

Conflicts:

	lib/arel/algebra/predicates.rb
	lib/arel/algebra/relations/writes/delete.rb
	lib/arel/algebra/relations/writes/insert.rb
	lib/arel/algebra/relations/writes/update.rb
	lib/arel/engines/memory/predicates.rb
	lib/arel/engines/memory/relations.rb
	lib/arel/engines/sql/primitives/attribute.rb
	lib/arel/engines/sql/relations/writes/insert.rb
	lib/arel/engines/sql/relations/writes/update.rb
---
 lib/arel/engines/memory/predicates.rb                 | 14 --------------
 lib/arel/engines/memory/primitives.rb                 | 15 +++++++++++++--
 lib/arel/engines/memory/primitives/attribute.rb       |  7 -------
 lib/arel/engines/memory/primitives/value.rb           |  7 -------
 lib/arel/engines/memory/relations.rb                  |  3 ++-
 lib/arel/engines/memory/relations/operations.rb       |  7 +++++++
 lib/arel/engines/memory/relations/operations/where.rb |  7 -------
 7 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 lib/arel/engines/memory/primitives/attribute.rb
 delete mode 100644 lib/arel/engines/memory/primitives/value.rb
 create mode 100644 lib/arel/engines/memory/relations/operations.rb
 delete mode 100644 lib/arel/engines/memory/relations/operations/where.rb

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb
index 3522ea3ffa..bbf39ba794 100644
--- a/lib/arel/engines/memory/predicates.rb
+++ b/lib/arel/engines/memory/predicates.rb
@@ -1,13 +1,4 @@
 module Arel
-  class Predicate
-    def or(other_predicate)
-      Or.new(self, other_predicate)
-    end
-
-    def and(other_predicate)
-      And.new(self, other_predicate)
-    end
-  end
 
   class Binary < Predicate
     def eval(row)
@@ -30,11 +21,6 @@ module Arel
   end
 
   class Equality < Binary
-    def ==(other)
-      Equality === other and
-        ((operand1 == other.operand1 and operand2 == other.operand2) or
-         (operand1 == other.operand2 and operand2 == other.operand1))
-    end
   end
 
   class GreaterThanOrEqualTo < Binary
diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb
index 4d5c76e956..77d4c1a52c 100644
--- a/lib/arel/engines/memory/primitives.rb
+++ b/lib/arel/engines/memory/primitives.rb
@@ -1,2 +1,13 @@
-require 'arel/engines/memory/primitives/attribute'
-require 'arel/engines/memory/primitives/value'
+module Arel
+  class Attribute
+    def eval(row)
+      row[self]
+    end
+  end
+  
+  class Value
+    def eval(row)
+      value
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/primitives/attribute.rb b/lib/arel/engines/memory/primitives/attribute.rb
deleted file mode 100644
index 9864feadc2..0000000000
--- a/lib/arel/engines/memory/primitives/attribute.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Arel
-  class Attribute
-    def eval(row)
-      row[self]
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/primitives/value.rb b/lib/arel/engines/memory/primitives/value.rb
deleted file mode 100644
index b83cd02e57..0000000000
--- a/lib/arel/engines/memory/primitives/value.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Arel
-  class Value
-    def eval(row)
-      value
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
index 6361d7c9d7..9f8264c439 100644
--- a/lib/arel/engines/memory/relations.rb
+++ b/lib/arel/engines/memory/relations.rb
@@ -1,2 +1,3 @@
 require 'arel/engines/memory/relations/array'
-require 'arel/engines/memory/relations/operations/where'
+require 'arel/engines/memory/relations/operations'
+
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
new file mode 100644
index 0000000000..eb11fb55fd
--- /dev/null
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Where < Compound
+    def eval
+      relation.eval.select { |row| predicate.eval(row) }
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations/operations/where.rb b/lib/arel/engines/memory/relations/operations/where.rb
deleted file mode 100644
index eb11fb55fd..0000000000
--- a/lib/arel/engines/memory/relations/operations/where.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Arel
-  class Where < Compound
-    def eval
-      relation.eval.select { |row| predicate.eval(row) }
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From 4e3c9a01307339916f6b947d24f19b0f442afd78 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:58:46 -0400
Subject: most in memory operations save join and group

Conflicts:

	lib/arel/algebra/extensions/object.rb
	lib/arel/algebra/primitives/value.rb
	lib/arel/engines/memory/relations.rb
	lib/arel/engines/sql/formatters.rb
	lib/arel/engines/sql/primitives.rb
	spec/arel/unit/relations/alias_spec.rb
	spec/arel/unit/relations/array_spec.rb
	spec/arel/unit/relations/order_spec.rb
---
 lib/arel/engines/memory/primitives.rb           | 14 +++++++++++
 lib/arel/engines/memory/relations.rb            |  1 +
 lib/arel/engines/memory/relations/compound.rb   |  5 ++++
 lib/arel/engines/memory/relations/operations.rb | 33 +++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 lib/arel/engines/memory/relations/compound.rb

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb
index 77d4c1a52c..f8bbcedb55 100644
--- a/lib/arel/engines/memory/primitives.rb
+++ b/lib/arel/engines/memory/primitives.rb
@@ -10,4 +10,18 @@ module Arel
       value
     end
   end
+  
+  class Ordering
+    def eval(row1, row2)
+      (attribute.eval(row1) <=> attribute.eval(row2)) * direction
+    end
+  end
+  
+  class Descending < Ordering
+    def direction; -1 end
+  end
+  
+  class Ascending < Ordering
+    def direction; 1 end
+  end
 end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
index 9f8264c439..1b009537b9 100644
--- a/lib/arel/engines/memory/relations.rb
+++ b/lib/arel/engines/memory/relations.rb
@@ -1,3 +1,4 @@
 require 'arel/engines/memory/relations/array'
 require 'arel/engines/memory/relations/operations'
+require 'arel/engines/memory/relations/compound'
 
diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb
new file mode 100644
index 0000000000..b029082d57
--- /dev/null
+++ b/lib/arel/engines/memory/relations/compound.rb
@@ -0,0 +1,5 @@
+module Arel
+  class Compound < Relation
+    delegate :array, :to => :relation
+  end
+end
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index eb11fb55fd..115df054df 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -4,4 +4,37 @@ module Arel
       relation.eval.select { |row| predicate.eval(row) }
     end
   end
+  
+  class Order < Compound
+    def eval
+      relation.eval.sort do |row1, row2|
+        ordering = orderings.detect { |o| o.eval(row1, row2) != 0 } || orderings.last
+        ordering.eval(row1, row2)
+      end
+    end
+  end
+  
+  class Project < Compound
+    def eval
+      relation.eval.collect { |r| r.slice(*projections) }
+    end
+  end
+  
+  class Take < Compound
+    def eval
+      relation.eval[0, taken]
+    end
+  end
+  
+  class Skip < Compound
+    def eval
+      relation.eval[skipped..-1]
+    end
+  end
+  
+  class Group < Compound
+    def eval
+      raise NotImplementedError
+    end
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 8339f024c7663133a78c4d0a8824b5b6fafaf239 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 15:42:42 -0400
Subject: recursive memory operations now possible

Conflicts:

	lib/arel/algebra/relations/relation.rb
---
 lib/arel/engines/memory/predicates.rb           |  6 ++++++
 lib/arel/engines/memory/relations.rb            |  1 +
 lib/arel/engines/memory/relations/array.rb      |  2 +-
 lib/arel/engines/memory/relations/compound.rb   |  4 ++++
 lib/arel/engines/memory/relations/operations.rb | 10 +++++-----
 lib/arel/engines/memory/relations/relation.rb   |  7 +++++++
 6 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 lib/arel/engines/memory/relations/relation.rb

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb
index bbf39ba794..e233f3ba39 100644
--- a/lib/arel/engines/memory/predicates.rb
+++ b/lib/arel/engines/memory/predicates.rb
@@ -21,15 +21,19 @@ module Arel
   end
 
   class Equality < Binary
+    def operator; :== end
   end
 
   class GreaterThanOrEqualTo < Binary
+    def operator; :>= end
   end
 
   class GreaterThan < Binary
+    def operator; :> end
   end
 
   class LessThanOrEqualTo < Binary
+    def operator; :<= end
   end
 
   class LessThan < Binary
@@ -37,8 +41,10 @@ module Arel
   end
 
   class Match < Binary
+    def operator; :=~ end
   end
 
   class In < Binary
+    def operator; :include? end
   end
 end
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
index 1b009537b9..820b0af4b2 100644
--- a/lib/arel/engines/memory/relations.rb
+++ b/lib/arel/engines/memory/relations.rb
@@ -1,3 +1,4 @@
+require 'arel/engines/memory/relations/relation'
 require 'arel/engines/memory/relations/array'
 require 'arel/engines/memory/relations/operations'
 require 'arel/engines/memory/relations/compound'
diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb
index c02c62891b..ea0b5af5ba 100644
--- a/lib/arel/engines/memory/relations/array.rb
+++ b/lib/arel/engines/memory/relations/array.rb
@@ -15,7 +15,7 @@ module Arel
     end
 
     def eval
-      @array.collect { |row| attributes.zip(row).to_hash }
+      @array.collect { |r| Row.new(self, r) }
     end
   end
 end
\ No newline at end of file
diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb
index b029082d57..3791fa4622 100644
--- a/lib/arel/engines/memory/relations/compound.rb
+++ b/lib/arel/engines/memory/relations/compound.rb
@@ -1,5 +1,9 @@
 module Arel
   class Compound < Relation
     delegate :array, :to => :relation
+    
+    def unoperated_rows
+      relation.eval.collect { |row| row.bind(self) }
+    end
   end
 end
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index 115df054df..8e03aca7b1 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -1,13 +1,13 @@
 module Arel
   class Where < Compound
     def eval
-      relation.eval.select { |row| predicate.eval(row) }
+      unoperated_rows.select { |row| predicate.eval(row) }
     end
   end
   
   class Order < Compound
     def eval
-      relation.eval.sort do |row1, row2|
+      unoperated_rows.sort do |row1, row2|
         ordering = orderings.detect { |o| o.eval(row1, row2) != 0 } || orderings.last
         ordering.eval(row1, row2)
       end
@@ -16,19 +16,19 @@ module Arel
   
   class Project < Compound
     def eval
-      relation.eval.collect { |r| r.slice(*projections) }
+      unoperated_rows.collect { |r| r.slice(*projections) }
     end
   end
   
   class Take < Compound
     def eval
-      relation.eval[0, taken]
+      unoperated_rows[0, taken]
     end
   end
   
   class Skip < Compound
     def eval
-      relation.eval[skipped..-1]
+      unoperated_rows[skipped..-1]
     end
   end
   
diff --git a/lib/arel/engines/memory/relations/relation.rb b/lib/arel/engines/memory/relations/relation.rb
new file mode 100644
index 0000000000..abfb8bb37f
--- /dev/null
+++ b/lib/arel/engines/memory/relations/relation.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Relation
+    def position_of(attribute)
+      attributes.index(self[attribute])
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 2fe585328d6a24df310d3e60059c9c7b05b64bac Mon Sep 17 00:00:00 2001
From: Nick Kallen <nkallen@nick-kallens-computer-2.local>
Date: Tue, 27 May 2008 14:19:59 -0700
Subject: performing in memory joins

---
 lib/arel/engines/memory/relations/operations.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index 8e03aca7b1..e35fbe3234 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -37,4 +37,25 @@ module Arel
       raise NotImplementedError
     end
   end
+  
+  class Alias < Compound
+    def eval
+      unoperated_rows
+    end
+  end
+  
+  class Join < Relation
+    def eval
+      result = []
+      relation1.eval.each do |row1|
+        relation2.eval.each do |row2|
+          combined_row = row1.combine(row2, self)
+          if predicates.all? { |p| p.eval(combined_row) }
+            result << combined_row
+          end
+        end
+      end
+      result
+    end
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 20b28b441b651d0404d64049253898c061a039be Mon Sep 17 00:00:00 2001
From: Nick Kallen <nkallen@nick-kallens-computer-2.local>
Date: Tue, 27 May 2008 14:37:11 -0700
Subject: using in memory relations as results from sql relation

Conflicts:

	lib/arel/algebra/primitives/expression.rb
	lib/arel/algebra/relations/relation.rb
---
 lib/arel/engines/memory/relations.rb          | 1 -
 lib/arel/engines/memory/relations/array.rb    | 4 ++--
 lib/arel/engines/memory/relations/relation.rb | 7 -------
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 lib/arel/engines/memory/relations/relation.rb

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
index 820b0af4b2..1b009537b9 100644
--- a/lib/arel/engines/memory/relations.rb
+++ b/lib/arel/engines/memory/relations.rb
@@ -1,4 +1,3 @@
-require 'arel/engines/memory/relations/relation'
 require 'arel/engines/memory/relations/array'
 require 'arel/engines/memory/relations/operations'
 require 'arel/engines/memory/relations/compound'
diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb
index ea0b5af5ba..15a3e95e1b 100644
--- a/lib/arel/engines/memory/relations/array.rb
+++ b/lib/arel/engines/memory/relations/array.rb
@@ -1,8 +1,8 @@
 module Arel
   class Array < Relation
     attributes :array,  :attribute_names
-    deriving :initialize
     include Recursion::BaseCase
+    deriving :==, :initialize
     
     def engine
       @engine ||= Memory::Engine.new
@@ -10,7 +10,7 @@ module Arel
 
     def attributes
       @attributes ||= @attribute_names.collect do |name|
-        Attribute.new(self, name.to_sym)
+        name.to_attribute(self)
       end
     end
 
diff --git a/lib/arel/engines/memory/relations/relation.rb b/lib/arel/engines/memory/relations/relation.rb
deleted file mode 100644
index abfb8bb37f..0000000000
--- a/lib/arel/engines/memory/relations/relation.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Arel
-  class Relation
-    def position_of(attribute)
-      attributes.index(self[attribute])
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From 07833d39c2885a5cddf38eeb860d79353c0f447b Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 15:47:10 -0400
Subject: basic implementation of in memory insertions

Conflicts:

	lib/arel/engines/memory/relations.rb
---
 lib/arel/engines/memory/engine.rb           | 4 ++++
 lib/arel/engines/memory/relations.rb        | 1 +
 lib/arel/engines/memory/relations/writes.rb | 7 +++++++
 3 files changed, 12 insertions(+)
 create mode 100644 lib/arel/engines/memory/relations/writes.rb

(limited to 'lib/arel/engines/memory')

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
-- 
cgit v1.2.3


From 7a51983efc50c8f9092785b1b586f8884dedc01a Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 16:02:10 -0400
Subject: initial implementation of cross-engine join

Conflicts:

	lib/arel/engines/memory/relations/array.rb
	lib/arel/engines/sql/primitives.rb
---
 lib/arel/engines/memory/relations/array.rb      | 4 ++++
 lib/arel/engines/memory/relations/compound.rb   | 2 +-
 lib/arel/engines/memory/relations/operations.rb | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb
index 15a3e95e1b..6e2dc29252 100644
--- a/lib/arel/engines/memory/relations/array.rb
+++ b/lib/arel/engines/memory/relations/array.rb
@@ -14,6 +14,10 @@ module Arel
       end
     end
 
+    def format(attribute, value)
+      value
+    end
+    
     def eval
       @array.collect { |r| Row.new(self, r) }
     end
diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb
index 3791fa4622..9e7827dfb3 100644
--- a/lib/arel/engines/memory/relations/compound.rb
+++ b/lib/arel/engines/memory/relations/compound.rb
@@ -3,7 +3,7 @@ module Arel
     delegate :array, :to => :relation
     
     def unoperated_rows
-      relation.eval.collect { |row| row.bind(self) }
+      relation.call.collect { |row| row.bind(self) }
     end
   end
 end
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index e35fbe3234..e0fd2824b3 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -47,8 +47,8 @@ module Arel
   class Join < Relation
     def eval
       result = []
-      relation1.eval.each do |row1|
-        relation2.eval.each do |row2|
+      relation1.call.each do |row1|
+        relation2.call.each do |row2|
           combined_row = row1.combine(row2, self)
           if predicates.all? { |p| p.eval(combined_row) }
             result << combined_row
-- 
cgit v1.2.3


From dc7b51883b1cc8ad7e525b7315fb575ae77a5b3d Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 16:20:40 -0400
Subject: Whitespace

---
 lib/arel/engines/memory/engine.rb               |  4 ++--
 lib/arel/engines/memory/primitives.rb           | 10 +++++-----
 lib/arel/engines/memory/relations/array.rb      |  6 +++---
 lib/arel/engines/memory/relations/compound.rb   |  2 +-
 lib/arel/engines/memory/relations/operations.rb | 16 ++++++++--------
 lib/arel/engines/memory/relations/writes.rb     |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/engine.rb b/lib/arel/engines/memory/engine.rb
index c8f79c9d57..c7ac9422d4 100644
--- a/lib/arel/engines/memory/engine.rb
+++ b/lib/arel/engines/memory/engine.rb
@@ -5,7 +5,7 @@ module Arel
         def read(relation)
           relation.eval
         end
-        
+
         def create(relation)
           relation.eval
         end
@@ -13,4 +13,4 @@ module Arel
       include CRUD
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb
index f8bbcedb55..935b34f5ee 100644
--- a/lib/arel/engines/memory/primitives.rb
+++ b/lib/arel/engines/memory/primitives.rb
@@ -4,24 +4,24 @@ module Arel
       row[self]
     end
   end
-  
+
   class Value
     def eval(row)
       value
     end
   end
-  
+
   class Ordering
     def eval(row1, row2)
       (attribute.eval(row1) <=> attribute.eval(row2)) * direction
     end
   end
-  
+
   class Descending < Ordering
     def direction; -1 end
   end
-  
+
   class Ascending < Ordering
     def direction; 1 end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb
index 6e2dc29252..5e7c0a4ab1 100644
--- a/lib/arel/engines/memory/relations/array.rb
+++ b/lib/arel/engines/memory/relations/array.rb
@@ -3,7 +3,7 @@ module Arel
     attributes :array,  :attribute_names
     include Recursion::BaseCase
     deriving :==, :initialize
-    
+
     def engine
       @engine ||= Memory::Engine.new
     end
@@ -17,9 +17,9 @@ module Arel
     def format(attribute, value)
       value
     end
-    
+
     def eval
       @array.collect { |r| Row.new(self, r) }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb
index 9e7827dfb3..6dda92a6a1 100644
--- a/lib/arel/engines/memory/relations/compound.rb
+++ b/lib/arel/engines/memory/relations/compound.rb
@@ -1,7 +1,7 @@
 module Arel
   class Compound < Relation
     delegate :array, :to => :relation
-    
+
     def unoperated_rows
       relation.call.collect { |row| row.bind(self) }
     end
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index e0fd2824b3..8e01938360 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -4,7 +4,7 @@ module Arel
       unoperated_rows.select { |row| predicate.eval(row) }
     end
   end
-  
+
   class Order < Compound
     def eval
       unoperated_rows.sort do |row1, row2|
@@ -13,37 +13,37 @@ module Arel
       end
     end
   end
-  
+
   class Project < Compound
     def eval
       unoperated_rows.collect { |r| r.slice(*projections) }
     end
   end
-  
+
   class Take < Compound
     def eval
       unoperated_rows[0, taken]
     end
   end
-  
+
   class Skip < Compound
     def eval
       unoperated_rows[skipped..-1]
     end
   end
-  
+
   class Group < Compound
     def eval
       raise NotImplementedError
     end
   end
-  
+
   class Alias < Compound
     def eval
       unoperated_rows
     end
   end
-  
+
   class Join < Relation
     def eval
       result = []
@@ -58,4 +58,4 @@ module Arel
       result
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/memory/relations/writes.rb b/lib/arel/engines/memory/relations/writes.rb
index fa8b84a32c..12c4f36c0d 100644
--- a/lib/arel/engines/memory/relations/writes.rb
+++ b/lib/arel/engines/memory/relations/writes.rb
@@ -1,7 +1,7 @@
 module Arel
   class Insert < Compound
     def eval
-      unoperated_rows + [Row.new(self, record.values.collect(&:value))]  
+      unoperated_rows + [Row.new(self, record.values.collect(&:value))]
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 0352d28a56de36946e691a0df390cfdfa7b1de7c Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 16:31:16 -0400
Subject: Moving a few stray SQL references in the memory engine code

---
 lib/arel/engines/memory/predicates.rb | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'lib/arel/engines/memory')

diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb
index e233f3ba39..03d4f25b0a 100644
--- a/lib/arel/engines/memory/predicates.rb
+++ b/lib/arel/engines/memory/predicates.rb
@@ -1,25 +1,10 @@
 module Arel
-
   class Binary < Predicate
     def eval(row)
       operand1.eval(row).send(operator, operand2.eval(row))
     end
   end
 
-  class CompoundPredicate < Binary
-    def to_sql(formatter = nil)
-      "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})"
-    end
-  end
-
-  class Or < CompoundPredicate
-    def predicate_sql; "OR" end
-  end
-
-  class And < CompoundPredicate
-    def predicate_sql; "AND" end
-  end
-
   class Equality < Binary
     def operator; :== end
   end
-- 
cgit v1.2.3