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