From bdca9ed42ffea10aa6989ea3ecebedb424fa01ed Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:20:29 -0400
Subject: moved sql related code to its own engine area

Conflicts:

	lib/arel/engine.rb
	lib/arel/extensions/object.rb
	lib/arel/predicates.rb
	lib/arel/primitives/attribute.rb
	lib/arel/primitives/expression.rb
	lib/arel/primitives/value.rb
	lib/arel/relations/operations/join.rb
	lib/arel/relations/relation.rb
	lib/arel/relations/utilities/externalization.rb
	lib/arel/relations/utilities/nil.rb
	lib/arel/relations/writes/delete.rb
	lib/arel/relations/writes/insert.rb
	lib/arel/relations/writes/update.rb
	spec/arel/unit/relations/skip_spec.rb
	spec/arel/unit/relations/take_spec.rb
	spec/spec_helper.rb
---
 lib/arel/engines/array/array.rb                    |   1 +
 lib/arel/engines/array/relations/array.rb          |  19 ++++
 lib/arel/engines/sql/christener.rb                 |  13 +++
 lib/arel/engines/sql/engine.rb                     |  41 +++++++
 lib/arel/engines/sql/extensions.rb                 |   4 +
 lib/arel/engines/sql/extensions/array.rb           |   9 ++
 lib/arel/engines/sql/extensions/nil_class.rb       |   5 +
 lib/arel/engines/sql/extensions/object.rb          |   9 ++
 lib/arel/engines/sql/extensions/range.rb           |   9 ++
 lib/arel/engines/sql/formatters.rb                 | 121 +++++++++++++++++++++
 lib/arel/engines/sql/predicates.rb                 |  37 +++++++
 lib/arel/engines/sql/primitives.rb                 |   3 +
 lib/arel/engines/sql/primitives/attribute.rb       |  17 +++
 lib/arel/engines/sql/primitives/expression.rb      |   7 ++
 lib/arel/engines/sql/primitives/value.rb           |  11 ++
 lib/arel/engines/sql/relations.rb                  |   5 +
 lib/arel/engines/sql/relations/operations.rb       |   2 +
 lib/arel/engines/sql/relations/operations/alias.rb |   5 +
 lib/arel/engines/sql/relations/operations/join.rb  |  19 ++++
 lib/arel/engines/sql/relations/relation.rb         |  28 +++++
 lib/arel/engines/sql/relations/table.rb            |  36 ++++++
 lib/arel/engines/sql/relations/utilities.rb        |   3 +
 .../sql/relations/utilities/externalization.rb     |  14 +++
 lib/arel/engines/sql/relations/utilities/nil.rb    |   6 +
 .../engines/sql/relations/utilities/recursion.rb   |  13 +++
 lib/arel/engines/sql/relations/writes.rb           |   3 +
 lib/arel/engines/sql/relations/writes/delete.rb    |  12 ++
 lib/arel/engines/sql/relations/writes/insert.rb    |  12 ++
 lib/arel/engines/sql/relations/writes/update.rb    |  14 +++
 lib/arel/engines/sql/sql.rb                        |   7 ++
 30 files changed, 485 insertions(+)
 create mode 100644 lib/arel/engines/array/array.rb
 create mode 100644 lib/arel/engines/array/relations/array.rb
 create mode 100644 lib/arel/engines/sql/christener.rb
 create mode 100644 lib/arel/engines/sql/engine.rb
 create mode 100644 lib/arel/engines/sql/extensions.rb
 create mode 100644 lib/arel/engines/sql/extensions/array.rb
 create mode 100644 lib/arel/engines/sql/extensions/nil_class.rb
 create mode 100644 lib/arel/engines/sql/extensions/object.rb
 create mode 100644 lib/arel/engines/sql/extensions/range.rb
 create mode 100644 lib/arel/engines/sql/formatters.rb
 create mode 100644 lib/arel/engines/sql/predicates.rb
 create mode 100644 lib/arel/engines/sql/primitives.rb
 create mode 100644 lib/arel/engines/sql/primitives/attribute.rb
 create mode 100644 lib/arel/engines/sql/primitives/expression.rb
 create mode 100644 lib/arel/engines/sql/primitives/value.rb
 create mode 100644 lib/arel/engines/sql/relations.rb
 create mode 100644 lib/arel/engines/sql/relations/operations.rb
 create mode 100644 lib/arel/engines/sql/relations/operations/alias.rb
 create mode 100644 lib/arel/engines/sql/relations/operations/join.rb
 create mode 100644 lib/arel/engines/sql/relations/relation.rb
 create mode 100644 lib/arel/engines/sql/relations/table.rb
 create mode 100644 lib/arel/engines/sql/relations/utilities.rb
 create mode 100644 lib/arel/engines/sql/relations/utilities/externalization.rb
 create mode 100644 lib/arel/engines/sql/relations/utilities/nil.rb
 create mode 100644 lib/arel/engines/sql/relations/utilities/recursion.rb
 create mode 100644 lib/arel/engines/sql/relations/writes.rb
 create mode 100644 lib/arel/engines/sql/relations/writes/delete.rb
 create mode 100644 lib/arel/engines/sql/relations/writes/insert.rb
 create mode 100644 lib/arel/engines/sql/relations/writes/update.rb
 create mode 100644 lib/arel/engines/sql/sql.rb

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/array/array.rb b/lib/arel/engines/array/array.rb
new file mode 100644
index 0000000000..3a3a47308a
--- /dev/null
+++ b/lib/arel/engines/array/array.rb
@@ -0,0 +1 @@
+require 'arel/engines/array/relations/array'
\ No newline at end of file
diff --git a/lib/arel/engines/array/relations/array.rb b/lib/arel/engines/array/relations/array.rb
new file mode 100644
index 0000000000..dac65abbc2
--- /dev/null
+++ b/lib/arel/engines/array/relations/array.rb
@@ -0,0 +1,19 @@
+module Arel
+  class Array < Relation
+    include Recursion::BaseCase
+
+    def initialize(array, attribute_names)
+      @array, @attribute_names = array, attribute_names
+    end
+
+    def attributes
+      @attributes ||= @attribute_names.collect do |name|
+        Attribute.new(self, name.to_sym)
+      end
+    end
+
+    def call(connection = nil)
+      @array.collect { |row| attributes.zip(row).to_hash }
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/christener.rb b/lib/arel/engines/sql/christener.rb
new file mode 100644
index 0000000000..5883a75f41
--- /dev/null
+++ b/lib/arel/engines/sql/christener.rb
@@ -0,0 +1,13 @@
+module Arel
+  module Sql
+    class Christener
+      def name_for(relation)
+        @used_names ||= Hash.new(0)
+        (@relation_names ||= Hash.new do |hash, relation|
+          @used_names[name = relation.name] += 1
+          hash[relation] = name + (@used_names[name] > 1 ? "_#{@used_names[name]}" : '')
+        end)[relation.table]
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb
new file mode 100644
index 0000000000..e5d1a8b0ca
--- /dev/null
+++ b/lib/arel/engines/sql/engine.rb
@@ -0,0 +1,41 @@
+module Arel
+  module Sql
+    class Engine
+      def initialize(ar = nil)
+        @ar = ar
+      end
+
+      def connection
+        @ar.connection
+      end
+
+      def method_missing(method, *args, &block)
+        @ar.connection.send(method, *args, &block)
+      end
+
+      module CRUD
+        def create(relation)
+          connection.insert(relation.to_sql)
+        end
+
+        def read(relation)
+          results = connection.execute(relation.to_sql)
+          rows = []
+          results.each do |row|
+            rows << attributes.zip(row).to_hash
+          end
+          rows
+        end
+
+        def update(relation)
+          connection.update(relation.to_sql)
+        end
+
+        def delete(relation)
+          connection.delete(relation.to_sql)
+        end
+      end
+      include CRUD
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/extensions.rb b/lib/arel/engines/sql/extensions.rb
new file mode 100644
index 0000000000..6f4ad32148
--- /dev/null
+++ b/lib/arel/engines/sql/extensions.rb
@@ -0,0 +1,4 @@
+require 'arel/engines/sql/extensions/object'
+require 'arel/engines/sql/extensions/array'
+require 'arel/engines/sql/extensions/range'
+require 'arel/engines/sql/extensions/nil_class'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/extensions/array.rb b/lib/arel/engines/sql/extensions/array.rb
new file mode 100644
index 0000000000..1daa5abca7
--- /dev/null
+++ b/lib/arel/engines/sql/extensions/array.rb
@@ -0,0 +1,9 @@
+class Array
+  def to_sql(formatter = nil)
+    "(" + collect { |e| e.to_sql(formatter) }.join(', ') + ")"
+  end
+
+  def inclusion_predicate_sql
+    "IN"
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/extensions/nil_class.rb b/lib/arel/engines/sql/extensions/nil_class.rb
new file mode 100644
index 0000000000..729c4cada7
--- /dev/null
+++ b/lib/arel/engines/sql/extensions/nil_class.rb
@@ -0,0 +1,5 @@
+class NilClass
+  def equality_predicate_sql
+    'IS'
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/extensions/object.rb b/lib/arel/engines/sql/extensions/object.rb
new file mode 100644
index 0000000000..ef990eee2f
--- /dev/null
+++ b/lib/arel/engines/sql/extensions/object.rb
@@ -0,0 +1,9 @@
+class Object
+  def to_sql(formatter)
+    formatter.scalar self
+  end
+
+  def equality_predicate_sql
+    '='
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/extensions/range.rb b/lib/arel/engines/sql/extensions/range.rb
new file mode 100644
index 0000000000..d7329efe34
--- /dev/null
+++ b/lib/arel/engines/sql/extensions/range.rb
@@ -0,0 +1,9 @@
+class Range
+  def to_sql(formatter = nil)
+    formatter.range self.begin, self.end
+  end
+  
+  def inclusion_predicate_sql
+    "BETWEEN"
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
new file mode 100644
index 0000000000..f82ddf631f
--- /dev/null
+++ b/lib/arel/engines/sql/formatters.rb
@@ -0,0 +1,121 @@
+module Arel
+  module Sql
+    class Formatter
+      attr_reader :environment
+      delegate :christener, :engine, :to => :environment
+      delegate :name_for, :to => :christener
+      delegate :quote_table_name, :quote_column_name, :quote, :to => :engine
+
+      def initialize(environment)
+        @environment = environment
+      end
+    end
+
+    class SelectClause < Formatter
+      def attribute(attribute)
+        # FIXME this should check that the column exists
+        if attribute.name.to_s =~ /^\w*$/
+          "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}" + (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
+        else
+          attribute.name.to_s + (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
+        end
+      end
+
+      def expression(expression)
+        if expression.function_sql == "DISTINCT"
+          "#{expression.function_sql} #{expression.attribute.to_sql(self)}" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '')
+        else
+          "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : " AS #{expression.function_sql.to_s.downcase}_id")
+        end
+      end
+
+      def select(select_sql, table)
+        "(#{select_sql}) AS #{quote_table_name(name_for(table))}"
+      end
+
+      def value(value)
+        value
+      end
+    end
+
+    class PassThrough < Formatter
+      def value(value)
+        value
+      end
+    end
+
+    class WhereClause < PassThrough
+    end
+
+    class OrderClause < PassThrough
+      def attribute(attribute)
+        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+      end
+    end
+
+    class GroupClause < PassThrough
+      def attribute(attribute)
+        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+      end
+    end
+
+    class WhereCondition < Formatter
+      def attribute(attribute)
+        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+      end
+
+      def expression(expression)
+        "#{expression.function_sql}(#{expression.attribute.to_sql(self)})"
+      end
+
+      def value(value)
+        value.to_sql(self)
+      end
+
+      def scalar(value, column = nil)
+        quote(value, column)
+      end
+
+      def select(select_sql, table)
+        "(#{select_sql})"
+      end
+    end
+
+    class SelectStatement < Formatter
+      def select(select_sql, table)
+        select_sql
+      end
+    end
+
+    class TableReference < Formatter
+      def select(select_sql, table)
+        "(#{select_sql}) AS #{quote_table_name(name_for(table))}"
+      end
+
+      def table(table)
+        if table.name =~ /^(\w|-)*$/
+          quote_table_name(table.name) + (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
+        else
+          table.name + (table.name != name_for(table) ? " AS " + (name_for(table)) : '')
+        end
+      end
+    end
+
+    class Attribute < WhereCondition
+      def scalar(scalar)
+        quote(scalar, environment.column)
+      end
+
+      def array(array)
+        "(" + array.collect { |e| e.to_sql(self) }.join(', ') + ")"
+      end
+
+      def range(left, right)
+        "#{left} AND #{right}"
+      end
+    end
+
+    class Value < WhereCondition
+    end
+  end
+end
diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb
new file mode 100644
index 0000000000..dfeddb2de1
--- /dev/null
+++ b/lib/arel/engines/sql/predicates.rb
@@ -0,0 +1,37 @@
+module Arel
+  class Binary < Predicate
+    def to_sql(formatter = nil)
+      "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}"
+    end
+  end
+
+  class Equality < Binary
+    def predicate_sql
+      operand2.equality_predicate_sql
+    end
+  end
+
+  class GreaterThanOrEqualTo < Binary
+    def predicate_sql; '>=' end
+  end
+
+  class GreaterThan < Binary
+    def predicate_sql; '>' end
+  end
+
+  class LessThanOrEqualTo < Binary
+    def predicate_sql; '<=' end
+  end
+
+  class LessThan < Binary
+    def predicate_sql; '<' end
+  end
+
+  class Match < Binary
+    def predicate_sql; 'LIKE' end
+  end
+
+  class In < Binary
+    def predicate_sql; operand2.inclusion_predicate_sql end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
new file mode 100644
index 0000000000..405b1ca803
--- /dev/null
+++ b/lib/arel/engines/sql/primitives.rb
@@ -0,0 +1,3 @@
+require 'arel/engines/sql/primitives/attribute'
+require 'arel/engines/sql/primitives/value'
+require 'arel/engines/sql/primitives/expression'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/attribute.rb b/lib/arel/engines/sql/primitives/attribute.rb
new file mode 100644
index 0000000000..48de690b6f
--- /dev/null
+++ b/lib/arel/engines/sql/primitives/attribute.rb
@@ -0,0 +1,17 @@
+require 'set'
+
+module Arel
+  class Attribute
+    def column
+      original_relation.column_for(self)
+    end
+
+    def format(object)
+      object.to_sql(Sql::Attribute.new(self))
+    end
+
+    def to_sql(formatter = Sql::WhereCondition.new(relation))
+      formatter.attribute self
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/expression.rb b/lib/arel/engines/sql/primitives/expression.rb
new file mode 100644
index 0000000000..24f6879848
--- /dev/null
+++ b/lib/arel/engines/sql/primitives/expression.rb
@@ -0,0 +1,7 @@
+module Arel
+  class Expression < Attribute
+    def to_sql(formatter = Sql::SelectClause.new(relation))
+      formatter.expression self
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/value.rb b/lib/arel/engines/sql/primitives/value.rb
new file mode 100644
index 0000000000..a44acc26e0
--- /dev/null
+++ b/lib/arel/engines/sql/primitives/value.rb
@@ -0,0 +1,11 @@
+module Arel
+  class Value
+    def to_sql(formatter = Sql::WhereCondition.new(relation))
+      formatter.value value
+    end
+
+    def format(object)
+      object.to_sql(Sql::Value.new(relation))
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
new file mode 100644
index 0000000000..4de01b2691
--- /dev/null
+++ b/lib/arel/engines/sql/relations.rb
@@ -0,0 +1,5 @@
+require 'arel/engines/sql/relations/utilities'
+require 'arel/engines/sql/relations/relation'
+require 'arel/engines/sql/relations/operations'
+require 'arel/engines/sql/relations/writes'
+require 'arel/engines/sql/relations/table'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/operations.rb b/lib/arel/engines/sql/relations/operations.rb
new file mode 100644
index 0000000000..ff33fc6bc3
--- /dev/null
+++ b/lib/arel/engines/sql/relations/operations.rb
@@ -0,0 +1,2 @@
+require 'arel/engines/sql/relations/operations/alias'
+require 'arel/engines/sql/relations/operations/join'
diff --git a/lib/arel/engines/sql/relations/operations/alias.rb b/lib/arel/engines/sql/relations/operations/alias.rb
new file mode 100644
index 0000000000..32c9911a69
--- /dev/null
+++ b/lib/arel/engines/sql/relations/operations/alias.rb
@@ -0,0 +1,5 @@
+module Arel
+  class Alias < Compound
+    include Recursion::BaseCase
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
new file mode 100644
index 0000000000..be21119bc9
--- /dev/null
+++ b/lib/arel/engines/sql/relations/operations/join.rb
@@ -0,0 +1,19 @@
+module Arel
+  class Join < Relation
+    def table_sql(formatter = Sql::TableReference.new(self))
+      relation1.externalize.table_sql(formatter)
+    end
+
+    def joins(environment, formatter = Sql::TableReference.new(environment))
+      @joins ||= begin
+        this_join = [
+          join_sql,
+          relation2.externalize.table_sql(formatter),
+          ("ON" unless predicates.blank?),
+          (ons + relation2.externalize.wheres).collect { |p| p.bind(environment).to_sql(Sql::WhereClause.new(environment)) }.join(' AND ')
+        ].compact.join(" ")
+        [relation1.joins(environment), this_join, relation2.joins(environment)].compact.join(" ")
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
new file mode 100644
index 0000000000..5fd4121176
--- /dev/null
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -0,0 +1,28 @@
+module Arel
+  class Relation
+    def to_sql(formatter = Sql::SelectStatement.new(self))
+      formatter.select select_sql, self
+    end
+
+    def select_sql
+      [
+        "SELECT     #{attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }.join(', ')}",
+        "FROM       #{table_sql(Sql::TableReference.new(self))}",
+        (joins(self)                                                                                    unless joins(self).blank? ),
+        ("WHERE     #{wheres   .collect { |w| w.to_sql(Sql::WhereClause.new(self)) }.join("\n\tAND ")}" unless wheres.blank?      ),
+        ("GROUP BY  #{groupings.collect { |g| g.to_sql(Sql::GroupClause.new(self)) }.join(', ')}"       unless groupings.blank?   ),
+        ("ORDER BY  #{orders   .collect { |o| o.to_sql(Sql::OrderClause.new(self)) }.join(', ')}"       unless orders.blank?      ),
+        ("LIMIT     #{taken}"                                                                           unless taken.blank?       ),
+        ("OFFSET    #{skipped}"                                                                         unless skipped.blank?     )
+      ].compact.join("\n")
+    end
+
+    def inclusion_predicate_sql
+      "IN"
+    end
+
+    def christener
+      @christener ||= Sql::Christener.new
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
new file mode 100644
index 0000000000..0433abbbb2
--- /dev/null
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -0,0 +1,36 @@
+module Arel
+  class Table < Relation
+    include Recursion::BaseCase
+
+    cattr_accessor :engine
+    attr_reader :name, :engine
+    hash_on :name
+
+    def initialize(name, engine = Table.engine)
+      @name, @engine = name.to_s, engine
+    end
+
+    def attributes
+      @attributes ||= columns.collect do |column|
+        Attribute.new(self, column.name.to_sym)
+      end
+    end
+
+    def column_for(attribute)
+      has_attribute?(attribute) and columns.detect { |c| c.name == attribute.name.to_s }
+    end
+
+    def columns
+      @columns ||= engine.columns(name, "#{name} Columns")
+    end
+
+    def reset
+      @attributes = @columns = nil
+    end
+
+    def ==(other)
+      Table      === other and
+      name       ==  other.name
+    end
+  end
+end
diff --git a/lib/arel/engines/sql/relations/utilities.rb b/lib/arel/engines/sql/relations/utilities.rb
new file mode 100644
index 0000000000..a1451ed448
--- /dev/null
+++ b/lib/arel/engines/sql/relations/utilities.rb
@@ -0,0 +1,3 @@
+require 'arel/engines/sql/relations/utilities/recursion'
+require 'arel/engines/sql/relations/utilities/externalization'
+require 'arel/engines/sql/relations/utilities/nil'
diff --git a/lib/arel/engines/sql/relations/utilities/externalization.rb b/lib/arel/engines/sql/relations/utilities/externalization.rb
new file mode 100644
index 0000000000..1ac6f2de8e
--- /dev/null
+++ b/lib/arel/engines/sql/relations/utilities/externalization.rb
@@ -0,0 +1,14 @@
+module Arel
+  class Externalization < Compound
+    include Recursion::BaseCase
+
+    def table_sql(formatter = Sql::TableReference.new(relation))
+      formatter.select relation.select_sql, self
+    end
+
+    # REMOVEME
+    def name
+      relation.name + '_external'
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/utilities/nil.rb b/lib/arel/engines/sql/relations/utilities/nil.rb
new file mode 100644
index 0000000000..77534b25ad
--- /dev/null
+++ b/lib/arel/engines/sql/relations/utilities/nil.rb
@@ -0,0 +1,6 @@
+module Arel
+  class Nil < Relation
+    def table_sql(formatter = nil); '' end
+    def name; '' end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/utilities/recursion.rb b/lib/arel/engines/sql/relations/utilities/recursion.rb
new file mode 100644
index 0000000000..848b059507
--- /dev/null
+++ b/lib/arel/engines/sql/relations/utilities/recursion.rb
@@ -0,0 +1,13 @@
+module Arel
+  module Recursion
+    module BaseCase
+      def table
+        self
+      end
+
+      def table_sql(formatter = Sql::TableReference.new(self))
+        formatter.table self
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
new file mode 100644
index 0000000000..dcadc326d9
--- /dev/null
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -0,0 +1,3 @@
+require 'arel/engines/sql/relations/writes/delete'
+require 'arel/engines/sql/relations/writes/insert'
+require 'arel/engines/sql/relations/writes/update'
diff --git a/lib/arel/engines/sql/relations/writes/delete.rb b/lib/arel/engines/sql/relations/writes/delete.rb
new file mode 100644
index 0000000000..b22ee51e24
--- /dev/null
+++ b/lib/arel/engines/sql/relations/writes/delete.rb
@@ -0,0 +1,12 @@
+module Arel
+  class Deletion < Compound
+    def to_sql(formatter = nil)
+      [
+        "DELETE",
+        "FROM #{table_sql}",
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank?  ),
+        ("LIMIT #{taken}"                                     unless taken.blank?    ),
+      ].compact.join("\n")
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes/insert.rb b/lib/arel/engines/sql/relations/writes/insert.rb
new file mode 100644
index 0000000000..aac9c87a5b
--- /dev/null
+++ b/lib/arel/engines/sql/relations/writes/insert.rb
@@ -0,0 +1,12 @@
+module Arel
+  class Insert < Compound
+    def to_sql(formatter = nil)
+      [
+        "INSERT",
+        "INTO #{table_sql}",
+        "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
+        "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
+      ].join("\n")
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes/update.rb b/lib/arel/engines/sql/relations/writes/update.rb
new file mode 100644
index 0000000000..3e35a0d5cc
--- /dev/null
+++ b/lib/arel/engines/sql/relations/writes/update.rb
@@ -0,0 +1,14 @@
+module Arel
+  class Update < Compound
+    def to_sql(formatter = nil)
+      [
+        "UPDATE #{table_sql} SET",
+        assignments.collect do |attribute, value|
+          "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
+        end.join(",\n"),
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank?  ),
+        ("LIMIT #{taken}"                                      unless taken.blank?    )
+      ].join("\n")
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/sql.rb b/lib/arel/engines/sql/sql.rb
new file mode 100644
index 0000000000..aed1fd861e
--- /dev/null
+++ b/lib/arel/engines/sql/sql.rb
@@ -0,0 +1,7 @@
+require 'arel/engines/sql/engine'
+require 'arel/engines/sql/relations'
+require 'arel/engines/sql/primitives'
+require 'arel/engines/sql/predicates'
+require 'arel/engines/sql/formatters'
+require 'arel/engines/sql/extensions'
+require 'arel/engines/sql/christener'
\ No newline at end of file
-- 
cgit v1.2.3


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/array/array.rb                    |  1 -
 lib/arel/engines/array/relations/array.rb          | 19 -------
 lib/arel/engines/memory.rb                         |  4 ++
 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 +++
 lib/arel/engines/sql.rb                            |  7 +++
 lib/arel/engines/sql/primitives/attribute.rb       |  2 -
 lib/arel/engines/sql/relations.rb                  | 13 +++--
 lib/arel/engines/sql/relations/operations.rb       |  2 -
 lib/arel/engines/sql/relations/table.rb            |  5 ++
 lib/arel/engines/sql/relations/utilities.rb        |  3 --
 lib/arel/engines/sql/relations/writes.rb           |  3 --
 lib/arel/engines/sql/sql.rb                        |  7 ---
 19 files changed, 141 insertions(+), 41 deletions(-)
 delete mode 100644 lib/arel/engines/array/array.rb
 delete mode 100644 lib/arel/engines/array/relations/array.rb
 create mode 100644 lib/arel/engines/memory.rb
 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
 create mode 100644 lib/arel/engines/sql.rb
 delete mode 100644 lib/arel/engines/sql/relations/operations.rb
 delete mode 100644 lib/arel/engines/sql/relations/utilities.rb
 delete mode 100644 lib/arel/engines/sql/relations/writes.rb
 delete mode 100644 lib/arel/engines/sql/sql.rb

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/array/array.rb b/lib/arel/engines/array/array.rb
deleted file mode 100644
index 3a3a47308a..0000000000
--- a/lib/arel/engines/array/array.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'arel/engines/array/relations/array'
\ No newline at end of file
diff --git a/lib/arel/engines/array/relations/array.rb b/lib/arel/engines/array/relations/array.rb
deleted file mode 100644
index dac65abbc2..0000000000
--- a/lib/arel/engines/array/relations/array.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Arel
-  class Array < Relation
-    include Recursion::BaseCase
-
-    def initialize(array, attribute_names)
-      @array, @attribute_names = array, attribute_names
-    end
-
-    def attributes
-      @attributes ||= @attribute_names.collect do |name|
-        Attribute.new(self, name.to_sym)
-      end
-    end
-
-    def call(connection = nil)
-      @array.collect { |row| attributes.zip(row).to_hash }
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/memory.rb b/lib/arel/engines/memory.rb
new file mode 100644
index 0000000000..df6f6f3d48
--- /dev/null
+++ b/lib/arel/engines/memory.rb
@@ -0,0 +1,4 @@
+require 'arel/engines/memory/relations'
+require 'arel/engines/memory/primitives'
+require 'arel/engines/memory/engine'
+require 'arel/engines/memory/predicates'
\ No newline at end of file
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
diff --git a/lib/arel/engines/sql.rb b/lib/arel/engines/sql.rb
new file mode 100644
index 0000000000..aed1fd861e
--- /dev/null
+++ b/lib/arel/engines/sql.rb
@@ -0,0 +1,7 @@
+require 'arel/engines/sql/engine'
+require 'arel/engines/sql/relations'
+require 'arel/engines/sql/primitives'
+require 'arel/engines/sql/predicates'
+require 'arel/engines/sql/formatters'
+require 'arel/engines/sql/extensions'
+require 'arel/engines/sql/christener'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/attribute.rb b/lib/arel/engines/sql/primitives/attribute.rb
index 48de690b6f..ad78a9ec5b 100644
--- a/lib/arel/engines/sql/primitives/attribute.rb
+++ b/lib/arel/engines/sql/primitives/attribute.rb
@@ -1,5 +1,3 @@
-require 'set'
-
 module Arel
   class Attribute
     def column
diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
index 4de01b2691..39ef8852a1 100644
--- a/lib/arel/engines/sql/relations.rb
+++ b/lib/arel/engines/sql/relations.rb
@@ -1,5 +1,10 @@
-require 'arel/engines/sql/relations/utilities'
+require 'arel/engines/sql/relations/utilities/recursion'
+require 'arel/engines/sql/relations/utilities/externalization'
+require 'arel/engines/sql/relations/utilities/nil'
 require 'arel/engines/sql/relations/relation'
-require 'arel/engines/sql/relations/operations'
-require 'arel/engines/sql/relations/writes'
-require 'arel/engines/sql/relations/table'
\ No newline at end of file
+require 'arel/engines/sql/relations/table'
+require 'arel/engines/sql/relations/operations/join'
+require 'arel/engines/sql/relations/operations/alias'
+require 'arel/engines/sql/relations/writes/delete'
+require 'arel/engines/sql/relations/writes/insert'
+require 'arel/engines/sql/relations/writes/update'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/operations.rb b/lib/arel/engines/sql/relations/operations.rb
deleted file mode 100644
index ff33fc6bc3..0000000000
--- a/lib/arel/engines/sql/relations/operations.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'arel/engines/sql/relations/operations/alias'
-require 'arel/engines/sql/relations/operations/join'
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index 0433abbbb2..2653744149 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -34,3 +34,8 @@ module Arel
     end
   end
 end
+
+def Table(name, engine = Arel::Table.engine)
+  Arel::Table.new(name, engine)
+end
+
diff --git a/lib/arel/engines/sql/relations/utilities.rb b/lib/arel/engines/sql/relations/utilities.rb
deleted file mode 100644
index a1451ed448..0000000000
--- a/lib/arel/engines/sql/relations/utilities.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'arel/engines/sql/relations/utilities/recursion'
-require 'arel/engines/sql/relations/utilities/externalization'
-require 'arel/engines/sql/relations/utilities/nil'
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
deleted file mode 100644
index dcadc326d9..0000000000
--- a/lib/arel/engines/sql/relations/writes.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'arel/engines/sql/relations/writes/delete'
-require 'arel/engines/sql/relations/writes/insert'
-require 'arel/engines/sql/relations/writes/update'
diff --git a/lib/arel/engines/sql/sql.rb b/lib/arel/engines/sql/sql.rb
deleted file mode 100644
index aed1fd861e..0000000000
--- a/lib/arel/engines/sql/sql.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'arel/engines/sql/engine'
-require 'arel/engines/sql/relations'
-require 'arel/engines/sql/primitives'
-require 'arel/engines/sql/predicates'
-require 'arel/engines/sql/formatters'
-require 'arel/engines/sql/extensions'
-require 'arel/engines/sql/christener'
\ 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 +++++
 .../engines/memory/relations/operations/where.rb   |  7 -----
 lib/arel/engines/sql/primitives.rb                 | 34 ++++++++++++++++++--
 lib/arel/engines/sql/primitives/attribute.rb       | 15 ---------
 lib/arel/engines/sql/primitives/expression.rb      |  7 -----
 lib/arel/engines/sql/primitives/value.rb           | 11 -------
 lib/arel/engines/sql/relations.rb                  |  4 +--
 lib/arel/engines/sql/relations/writes.rb           | 36 ++++++++++++++++++++++
 lib/arel/engines/sql/relations/writes/delete.rb    | 12 --------
 lib/arel/engines/sql/relations/writes/insert.rb    | 12 --------
 lib/arel/engines/sql/relations/writes/update.rb    | 14 ---------
 16 files changed, 90 insertions(+), 115 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
 delete mode 100644 lib/arel/engines/sql/primitives/attribute.rb
 delete mode 100644 lib/arel/engines/sql/primitives/expression.rb
 delete mode 100644 lib/arel/engines/sql/primitives/value.rb
 create mode 100644 lib/arel/engines/sql/relations/writes.rb
 delete mode 100644 lib/arel/engines/sql/relations/writes/delete.rb
 delete mode 100644 lib/arel/engines/sql/relations/writes/insert.rb
 delete mode 100644 lib/arel/engines/sql/relations/writes/update.rb

(limited to 'lib/arel/engines')

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
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 405b1ca803..5544d63710 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -1,3 +1,31 @@
-require 'arel/engines/sql/primitives/attribute'
-require 'arel/engines/sql/primitives/value'
-require 'arel/engines/sql/primitives/expression'
\ No newline at end of file
+module Arel
+  class Attribute
+    def column
+      original_relation.column_for(self)
+    end
+        
+    def format(object)
+      object.to_sql(Sql::Attribute.new(self))
+    end
+
+    def to_sql(formatter = Sql::WhereCondition.new(relation))
+      formatter.attribute self
+    end
+  end
+
+  class Expression < Attribute
+    def to_sql(formatter = Sql::SelectClause.new(relation))
+      formatter.expression self
+    end
+  end
+
+  class Value
+    def to_sql(formatter = Sql::WhereCondition.new(relation))
+      formatter.value value
+    end
+
+    def format(object)
+      object.to_sql(Sql::Value.new(relation))
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/attribute.rb b/lib/arel/engines/sql/primitives/attribute.rb
deleted file mode 100644
index ad78a9ec5b..0000000000
--- a/lib/arel/engines/sql/primitives/attribute.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Arel
-  class Attribute
-    def column
-      original_relation.column_for(self)
-    end
-
-    def format(object)
-      object.to_sql(Sql::Attribute.new(self))
-    end
-
-    def to_sql(formatter = Sql::WhereCondition.new(relation))
-      formatter.attribute self
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/expression.rb b/lib/arel/engines/sql/primitives/expression.rb
deleted file mode 100644
index 24f6879848..0000000000
--- a/lib/arel/engines/sql/primitives/expression.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Arel
-  class Expression < Attribute
-    def to_sql(formatter = Sql::SelectClause.new(relation))
-      formatter.expression self
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/primitives/value.rb b/lib/arel/engines/sql/primitives/value.rb
deleted file mode 100644
index a44acc26e0..0000000000
--- a/lib/arel/engines/sql/primitives/value.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Arel
-  class Value
-    def to_sql(formatter = Sql::WhereCondition.new(relation))
-      formatter.value value
-    end
-
-    def format(object)
-      object.to_sql(Sql::Value.new(relation))
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
index 39ef8852a1..d6e4d295ba 100644
--- a/lib/arel/engines/sql/relations.rb
+++ b/lib/arel/engines/sql/relations.rb
@@ -5,6 +5,4 @@ require 'arel/engines/sql/relations/relation'
 require 'arel/engines/sql/relations/table'
 require 'arel/engines/sql/relations/operations/join'
 require 'arel/engines/sql/relations/operations/alias'
-require 'arel/engines/sql/relations/writes/delete'
-require 'arel/engines/sql/relations/writes/insert'
-require 'arel/engines/sql/relations/writes/update'
\ No newline at end of file
+require 'arel/engines/sql/relations/writes'
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
new file mode 100644
index 0000000000..edfd9f7233
--- /dev/null
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -0,0 +1,36 @@
+module Arel
+  class Deletion < Compound
+    def to_sql(formatter = nil)
+      [
+        "DELETE",
+        "FROM #{table_sql}",
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank?  ),
+        ("LIMIT #{taken}"                                     unless taken.blank?    ),
+      ].compact.join("\n")
+    end
+  end
+
+  class Insert < Compound
+    def to_sql(formatter = nil)
+      [
+        "INSERT",
+        "INTO #{table_sql}",
+        "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
+        "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
+      ].join("\n")
+    end
+  end
+
+  class Update < Compound
+    def to_sql(formatter = nil)
+      [
+        "UPDATE #{table_sql} SET",
+        assignments.collect do |attribute, value|
+          "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
+        end.join(",\n"),
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank?  ),
+        ("LIMIT #{taken}"                                      unless taken.blank?    )
+      ].join("\n")
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes/delete.rb b/lib/arel/engines/sql/relations/writes/delete.rb
deleted file mode 100644
index b22ee51e24..0000000000
--- a/lib/arel/engines/sql/relations/writes/delete.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Arel
-  class Deletion < Compound
-    def to_sql(formatter = nil)
-      [
-        "DELETE",
-        "FROM #{table_sql}",
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank?  ),
-        ("LIMIT #{taken}"                                     unless taken.blank?    ),
-      ].compact.join("\n")
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes/insert.rb b/lib/arel/engines/sql/relations/writes/insert.rb
deleted file mode 100644
index aac9c87a5b..0000000000
--- a/lib/arel/engines/sql/relations/writes/insert.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Arel
-  class Insert < Compound
-    def to_sql(formatter = nil)
-      [
-        "INSERT",
-        "INTO #{table_sql}",
-        "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
-        "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
-      ].join("\n")
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/arel/engines/sql/relations/writes/update.rb b/lib/arel/engines/sql/relations/writes/update.rb
deleted file mode 100644
index 3e35a0d5cc..0000000000
--- a/lib/arel/engines/sql/relations/writes/update.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Arel
-  class Update < Compound
-    def to_sql(formatter = nil)
-      [
-        "UPDATE #{table_sql} SET",
-        assignments.collect do |attribute, value|
-          "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
-        end.join(",\n"),
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank?  ),
-        ("LIMIT #{taken}"                                      unless taken.blank?    )
-      ].join("\n")
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From 892337509b2bd269920dc567bc48c6a28c7222d2 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:46:08 -0400
Subject: removed function_sql in favor of polymorphism

Conflicts:

	lib/arel/algebra/primitives/attribute.rb
	lib/arel/algebra/primitives/expression.rb
	spec/arel/unit/primitives/expression_spec.rb
---
 lib/arel/engines/sql/primitives.rb | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 5544d63710..c4968558a2 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -13,12 +13,6 @@ module Arel
     end
   end
 
-  class Expression < Attribute
-    def to_sql(formatter = Sql::SelectClause.new(relation))
-      formatter.expression self
-    end
-  end
-
   class Value
     def to_sql(formatter = Sql::WhereCondition.new(relation))
       formatter.value value
@@ -28,4 +22,34 @@ module Arel
       object.to_sql(Sql::Value.new(relation))
     end
   end
+  
+  class Expression < Attribute
+    def to_sql(formatter = Sql::SelectClause.new(relation))
+      formatter.expression self
+    end
+  end
+  
+  class Count < Expression
+    def function_sql; 'COUNT' end
+  end
+  
+  class Distinct < Expression
+    def function_sql; 'DISTINCT' end
+  end
+  
+  class Sum < Expression
+    def function_sql; 'SUM' end
+  end
+  
+  class Maximum < Expression
+    def function_sql; 'MAX' end
+  end
+  
+  class Minimum < Expression
+    def function_sql; 'MIN' end
+  end
+  
+  class Average < Expression
+    def function_sql; 'AVG' end
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 3a6e8e5a3f99841691b70b89b0a10f836e6ec071 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:49:56 -0400
Subject: join sql stuff moved into sql adapter

Conflicts:

	lib/arel/algebra/primitives/value.rb
	lib/arel/algebra/relations/operations/join.rb
	lib/arel/algebra/relations/relation.rb
	spec/arel/unit/relations/join_spec.rb
---
 lib/arel/engines/sql/primitives.rb                | 18 ++++++++++--------
 lib/arel/engines/sql/relations/operations/join.rb | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index c4968558a2..6f89723afe 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -3,7 +3,7 @@ module Arel
     def column
       original_relation.column_for(self)
     end
-        
+
     def format(object)
       object.to_sql(Sql::Attribute.new(self))
     end
@@ -14,6 +14,8 @@ module Arel
   end
 
   class Value
+    delegate :inclusion_predicate_sql, :equality_predicate_sql, :to => :value
+
     def to_sql(formatter = Sql::WhereCondition.new(relation))
       formatter.value value
     end
@@ -22,33 +24,33 @@ module Arel
       object.to_sql(Sql::Value.new(relation))
     end
   end
-  
+
   class Expression < Attribute
     def to_sql(formatter = Sql::SelectClause.new(relation))
       formatter.expression self
     end
   end
-  
+
   class Count < Expression
     def function_sql; 'COUNT' end
   end
-  
+
   class Distinct < Expression
     def function_sql; 'DISTINCT' end
   end
-  
+
   class Sum < Expression
     def function_sql; 'SUM' end
   end
-  
+
   class Maximum < Expression
     def function_sql; 'MAX' end
   end
-  
+
   class Minimum < Expression
     def function_sql; 'MIN' end
   end
-  
+
   class Average < Expression
     def function_sql; 'AVG' end
   end
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
index be21119bc9..2f5e23644e 100644
--- a/lib/arel/engines/sql/relations/operations/join.rb
+++ b/lib/arel/engines/sql/relations/operations/join.rb
@@ -16,4 +16,18 @@ module Arel
       end
     end
   end
+
+  class InnerJoin < Join
+    def join_sql; "INNER JOIN" end
+  end
+
+  class OuterJoin < Join
+    def join_sql; "OUTER JOIN" end
+  end
+
+  class StringJoin < Join
+    def joins(_, __ = nil)
+      relation2
+    end
+  end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 437429764510338bdc5f4915286425f07565a573 Mon Sep 17 00:00:00 2001
From: Nick Kallen <nkallen@nick-kallens-computer-2.local>
Date: Mon, 26 May 2008 14:30:51 -0700
Subject: moved table-related stuff into sql engine

---
 lib/arel/engines/sql/relations.rb                    | 1 +
 lib/arel/engines/sql/relations/utilities/compound.rb | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 lib/arel/engines/sql/relations/utilities/compound.rb

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
index d6e4d295ba..0eb1303ec9 100644
--- a/lib/arel/engines/sql/relations.rb
+++ b/lib/arel/engines/sql/relations.rb
@@ -1,3 +1,4 @@
+require 'arel/engines/sql/relations/utilities/compound'
 require 'arel/engines/sql/relations/utilities/recursion'
 require 'arel/engines/sql/relations/utilities/externalization'
 require 'arel/engines/sql/relations/utilities/nil'
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
new file mode 100644
index 0000000000..502bf8b01e
--- /dev/null
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -0,0 +1,6 @@
+module Arel
+  class Compound < Relation
+    delegate :table, :table_sql, :array, :to => :relation
+  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 ++++++++++++++++++++++
 lib/arel/engines/sql/formatters.rb                 |  6 ++--
 lib/arel/engines/sql/primitives.rb                 | 14 +++++++++
 .../engines/sql/relations/utilities/compound.rb    |  2 +-
 7 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 lib/arel/engines/memory/relations/compound.rb

(limited to 'lib/arel/engines')

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
diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
index f82ddf631f..bc5f0f7c64 100644
--- a/lib/arel/engines/sql/formatters.rb
+++ b/lib/arel/engines/sql/formatters.rb
@@ -47,9 +47,9 @@ module Arel
     class WhereClause < PassThrough
     end
 
-    class OrderClause < PassThrough
-      def attribute(attribute)
-        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+    class OrderClause < PassThrough      
+      def ordering(ordering)
+        "#{quote_table_name(name_for(ordering.attribute.original_relation))}.#{quote_column_name(ordering.attribute.name)} #{ordering.direction_sql}"
       end
     end
 
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 6f89723afe..9e9143ac0f 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -24,6 +24,20 @@ module Arel
       object.to_sql(Sql::Value.new(relation))
     end
   end
+  
+  class Ordering
+    def to_sql(formatter = Sql::OrderClause.new(relation))
+      formatter.ordering self
+    end
+  end
+  
+  class Ascending < Ordering
+    def direction_sql; 'ASC' end
+  end
+  
+  class Descending < Ordering
+    def direction_sql; 'DESC' end
+  end
 
   class Expression < Attribute
     def to_sql(formatter = Sql::SelectClause.new(relation))
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
index 502bf8b01e..61df196d6e 100644
--- a/lib/arel/engines/sql/relations/utilities/compound.rb
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -1,6 +1,6 @@
 module Arel
   class Compound < Relation
-    delegate :table, :table_sql, :array, :to => :relation
+    delegate :table, :table_sql, :to => :relation
   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')

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')

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 -------
 lib/arel/engines/sql/engine.rb                    | 10 +++++-----
 lib/arel/engines/sql/relations/operations/join.rb |  2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 lib/arel/engines/memory/relations/relation.rb

(limited to 'lib/arel/engines')

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
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb
index e5d1a8b0ca..0700ae9733 100644
--- a/lib/arel/engines/sql/engine.rb
+++ b/lib/arel/engines/sql/engine.rb
@@ -19,12 +19,12 @@ module Arel
         end
 
         def read(relation)
-          results = connection.execute(relation.to_sql)
-          rows = []
-          results.each do |row|
-            rows << attributes.zip(row).to_hash
+          # FIXME
+          class << rows = connection.execute(relation.to_sql)
+            include Enumerable
           end
-          rows
+          
+          Array.new(rows, relation.attributes)
         end
 
         def update(relation)
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
index 2f5e23644e..f848fd3268 100644
--- a/lib/arel/engines/sql/relations/operations/join.rb
+++ b/lib/arel/engines/sql/relations/operations/join.rb
@@ -22,7 +22,7 @@ module Arel
   end
 
   class OuterJoin < Join
-    def join_sql; "OUTER JOIN" end
+    def join_sql; "LEFT OUTER JOIN" end
   end
 
   class StringJoin < Join
-- 
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')

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 ++--
 lib/arel/engines/sql/engine.rb                  | 4 +++-
 lib/arel/engines/sql/primitives.rb              | 4 ++++
 lib/arel/engines/sql/relations/table.rb         | 4 ++++
 6 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'lib/arel/engines')

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
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb
index 0700ae9733..d27d93a5dc 100644
--- a/lib/arel/engines/sql/engine.rb
+++ b/lib/arel/engines/sql/engine.rb
@@ -20,7 +20,9 @@ module Arel
 
         def read(relation)
           # FIXME
-          class << rows = connection.execute(relation.to_sql)
+          rows = connection.select_rows(relation.to_sql)
+          
+          class << rows
             include Enumerable
           end
           
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 9e9143ac0f..22ee19dcf0 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -4,6 +4,10 @@ module Arel
       original_relation.column_for(self)
     end
 
+    def type_cast(value)
+      root.relation.format(self, value)
+    end
+        
     def format(object)
       object.to_sql(Sql::Attribute.new(self))
     end
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index 2653744149..e842f85ed1 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -16,6 +16,10 @@ module Arel
       end
     end
 
+    def format(attribute, value)
+      attribute.column.type_cast(value)
+    end
+    
     def column_for(attribute)
       has_attribute?(attribute) and columns.detect { |c| c.name == attribute.name.to_s }
     end
-- 
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.rb                               |  2 +-
 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 ++--
 lib/arel/engines/sql.rb                                  |  2 +-
 lib/arel/engines/sql/christener.rb                       |  2 +-
 lib/arel/engines/sql/engine.rb                           |  6 +++---
 lib/arel/engines/sql/extensions.rb                       |  2 +-
 lib/arel/engines/sql/extensions/array.rb                 |  2 +-
 lib/arel/engines/sql/extensions/nil_class.rb             |  2 +-
 lib/arel/engines/sql/extensions/object.rb                |  2 +-
 lib/arel/engines/sql/extensions/range.rb                 |  4 ++--
 lib/arel/engines/sql/formatters.rb                       |  2 +-
 lib/arel/engines/sql/predicates.rb                       |  2 +-
 lib/arel/engines/sql/primitives.rb                       | 10 +++++-----
 lib/arel/engines/sql/relations.rb                        |  2 +-
 lib/arel/engines/sql/relations/operations/alias.rb       |  2 +-
 lib/arel/engines/sql/relations/operations/join.rb        |  2 +-
 lib/arel/engines/sql/relations/relation.rb               |  2 +-
 lib/arel/engines/sql/relations/table.rb                  |  2 +-
 lib/arel/engines/sql/relations/utilities/compound.rb     |  2 +-
 .../engines/sql/relations/utilities/externalization.rb   |  2 +-
 lib/arel/engines/sql/relations/utilities/nil.rb          |  2 +-
 lib/arel/engines/sql/relations/utilities/recursion.rb    |  2 +-
 lib/arel/engines/sql/relations/writes.rb                 |  2 +-
 28 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/memory.rb b/lib/arel/engines/memory.rb
index df6f6f3d48..9e7193ef13 100644
--- a/lib/arel/engines/memory.rb
+++ b/lib/arel/engines/memory.rb
@@ -1,4 +1,4 @@
 require 'arel/engines/memory/relations'
 require 'arel/engines/memory/primitives'
 require 'arel/engines/memory/engine'
-require 'arel/engines/memory/predicates'
\ No newline at end of file
+require 'arel/engines/memory/predicates'
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
diff --git a/lib/arel/engines/sql.rb b/lib/arel/engines/sql.rb
index aed1fd861e..f31cfc7dac 100644
--- a/lib/arel/engines/sql.rb
+++ b/lib/arel/engines/sql.rb
@@ -4,4 +4,4 @@ require 'arel/engines/sql/primitives'
 require 'arel/engines/sql/predicates'
 require 'arel/engines/sql/formatters'
 require 'arel/engines/sql/extensions'
-require 'arel/engines/sql/christener'
\ No newline at end of file
+require 'arel/engines/sql/christener'
diff --git a/lib/arel/engines/sql/christener.rb b/lib/arel/engines/sql/christener.rb
index 5883a75f41..c1c9325208 100644
--- a/lib/arel/engines/sql/christener.rb
+++ b/lib/arel/engines/sql/christener.rb
@@ -10,4 +10,4 @@ module Arel
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb
index d27d93a5dc..5a8c9f16c5 100644
--- a/lib/arel/engines/sql/engine.rb
+++ b/lib/arel/engines/sql/engine.rb
@@ -21,11 +21,11 @@ module Arel
         def read(relation)
           # FIXME
           rows = connection.select_rows(relation.to_sql)
-          
+
           class << rows
             include Enumerable
           end
-          
+
           Array.new(rows, relation.attributes)
         end
 
@@ -40,4 +40,4 @@ module Arel
       include CRUD
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/extensions.rb b/lib/arel/engines/sql/extensions.rb
index 6f4ad32148..1ea31bc140 100644
--- a/lib/arel/engines/sql/extensions.rb
+++ b/lib/arel/engines/sql/extensions.rb
@@ -1,4 +1,4 @@
 require 'arel/engines/sql/extensions/object'
 require 'arel/engines/sql/extensions/array'
 require 'arel/engines/sql/extensions/range'
-require 'arel/engines/sql/extensions/nil_class'
\ No newline at end of file
+require 'arel/engines/sql/extensions/nil_class'
diff --git a/lib/arel/engines/sql/extensions/array.rb b/lib/arel/engines/sql/extensions/array.rb
index 1daa5abca7..d97dd1aa25 100644
--- a/lib/arel/engines/sql/extensions/array.rb
+++ b/lib/arel/engines/sql/extensions/array.rb
@@ -6,4 +6,4 @@ class Array
   def inclusion_predicate_sql
     "IN"
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/extensions/nil_class.rb b/lib/arel/engines/sql/extensions/nil_class.rb
index 729c4cada7..6f38ecdf3a 100644
--- a/lib/arel/engines/sql/extensions/nil_class.rb
+++ b/lib/arel/engines/sql/extensions/nil_class.rb
@@ -2,4 +2,4 @@ class NilClass
   def equality_predicate_sql
     'IS'
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/extensions/object.rb b/lib/arel/engines/sql/extensions/object.rb
index ef990eee2f..65270ee3de 100644
--- a/lib/arel/engines/sql/extensions/object.rb
+++ b/lib/arel/engines/sql/extensions/object.rb
@@ -6,4 +6,4 @@ class Object
   def equality_predicate_sql
     '='
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/extensions/range.rb b/lib/arel/engines/sql/extensions/range.rb
index d7329efe34..946dbc2633 100644
--- a/lib/arel/engines/sql/extensions/range.rb
+++ b/lib/arel/engines/sql/extensions/range.rb
@@ -2,8 +2,8 @@ class Range
   def to_sql(formatter = nil)
     formatter.range self.begin, self.end
   end
-  
+
   def inclusion_predicate_sql
     "BETWEEN"
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
index bc5f0f7c64..08a32843c9 100644
--- a/lib/arel/engines/sql/formatters.rb
+++ b/lib/arel/engines/sql/formatters.rb
@@ -47,7 +47,7 @@ module Arel
     class WhereClause < PassThrough
     end
 
-    class OrderClause < PassThrough      
+    class OrderClause < PassThrough
       def ordering(ordering)
         "#{quote_table_name(name_for(ordering.attribute.original_relation))}.#{quote_column_name(ordering.attribute.name)} #{ordering.direction_sql}"
       end
diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb
index dfeddb2de1..7e195c2605 100644
--- a/lib/arel/engines/sql/predicates.rb
+++ b/lib/arel/engines/sql/predicates.rb
@@ -34,4 +34,4 @@ module Arel
   class In < Binary
     def predicate_sql; operand2.inclusion_predicate_sql end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 22ee19dcf0..f2e8e8dabe 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -7,7 +7,7 @@ module Arel
     def type_cast(value)
       root.relation.format(self, value)
     end
-        
+
     def format(object)
       object.to_sql(Sql::Attribute.new(self))
     end
@@ -28,17 +28,17 @@ module Arel
       object.to_sql(Sql::Value.new(relation))
     end
   end
-  
+
   class Ordering
     def to_sql(formatter = Sql::OrderClause.new(relation))
       formatter.ordering self
     end
   end
-  
+
   class Ascending < Ordering
     def direction_sql; 'ASC' end
   end
-  
+
   class Descending < Ordering
     def direction_sql; 'DESC' end
   end
@@ -72,4 +72,4 @@ module Arel
   class Average < Expression
     def function_sql; 'AVG' end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
index 0eb1303ec9..8360a1f806 100644
--- a/lib/arel/engines/sql/relations.rb
+++ b/lib/arel/engines/sql/relations.rb
@@ -6,4 +6,4 @@ require 'arel/engines/sql/relations/relation'
 require 'arel/engines/sql/relations/table'
 require 'arel/engines/sql/relations/operations/join'
 require 'arel/engines/sql/relations/operations/alias'
-require 'arel/engines/sql/relations/writes'
\ No newline at end of file
+require 'arel/engines/sql/relations/writes'
diff --git a/lib/arel/engines/sql/relations/operations/alias.rb b/lib/arel/engines/sql/relations/operations/alias.rb
index 32c9911a69..9b6a484463 100644
--- a/lib/arel/engines/sql/relations/operations/alias.rb
+++ b/lib/arel/engines/sql/relations/operations/alias.rb
@@ -2,4 +2,4 @@ module Arel
   class Alias < Compound
     include Recursion::BaseCase
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
index f848fd3268..7c5e13510a 100644
--- a/lib/arel/engines/sql/relations/operations/join.rb
+++ b/lib/arel/engines/sql/relations/operations/join.rb
@@ -30,4 +30,4 @@ module Arel
       relation2
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
index 5fd4121176..93c146352c 100644
--- a/lib/arel/engines/sql/relations/relation.rb
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -25,4 +25,4 @@ module Arel
       @christener ||= Sql::Christener.new
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index e842f85ed1..0b6574eedc 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -19,7 +19,7 @@ module Arel
     def format(attribute, value)
       attribute.column.type_cast(value)
     end
-    
+
     def column_for(attribute)
       has_attribute?(attribute) and columns.detect { |c| c.name == attribute.name.to_s }
     end
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
index 61df196d6e..b63a829c67 100644
--- a/lib/arel/engines/sql/relations/utilities/compound.rb
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -3,4 +3,4 @@ module Arel
     delegate :table, :table_sql, :to => :relation
   end
 end
-    
\ No newline at end of file
+
diff --git a/lib/arel/engines/sql/relations/utilities/externalization.rb b/lib/arel/engines/sql/relations/utilities/externalization.rb
index 1ac6f2de8e..7f937e8423 100644
--- a/lib/arel/engines/sql/relations/utilities/externalization.rb
+++ b/lib/arel/engines/sql/relations/utilities/externalization.rb
@@ -11,4 +11,4 @@ module Arel
       relation.name + '_external'
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/utilities/nil.rb b/lib/arel/engines/sql/relations/utilities/nil.rb
index 77534b25ad..519ea8acf1 100644
--- a/lib/arel/engines/sql/relations/utilities/nil.rb
+++ b/lib/arel/engines/sql/relations/utilities/nil.rb
@@ -3,4 +3,4 @@ module Arel
     def table_sql(formatter = nil); '' end
     def name; '' end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/utilities/recursion.rb b/lib/arel/engines/sql/relations/utilities/recursion.rb
index 848b059507..84a526f57c 100644
--- a/lib/arel/engines/sql/relations/utilities/recursion.rb
+++ b/lib/arel/engines/sql/relations/utilities/recursion.rb
@@ -10,4 +10,4 @@ module Arel
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
index edfd9f7233..4d753f5fca 100644
--- a/lib/arel/engines/sql/relations/writes.rb
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -33,4 +33,4 @@ module Arel
       ].join("\n")
     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 ---------------
 lib/arel/engines/sql/predicates.rb    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'lib/arel/engines')

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
diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb
index 7e195c2605..b84c183c1d 100644
--- a/lib/arel/engines/sql/predicates.rb
+++ b/lib/arel/engines/sql/predicates.rb
@@ -5,6 +5,20 @@ module Arel
     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 predicate_sql
       operand2.equality_predicate_sql
-- 
cgit v1.2.3


From ed8e0f9c02c291a51f93a2123e099d07756d75bb Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 16:42:17 -0400
Subject: Include modules to extend core classes to improve inspectability

---
 lib/arel/engines/sql/extensions/array.rb     | 19 +++++++++++++------
 lib/arel/engines/sql/extensions/nil_class.rb | 12 +++++++++---
 lib/arel/engines/sql/extensions/object.rb    | 18 ++++++++++++------
 lib/arel/engines/sql/extensions/range.rb     | 18 ++++++++++++------
 4 files changed, 46 insertions(+), 21 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/extensions/array.rb b/lib/arel/engines/sql/extensions/array.rb
index d97dd1aa25..7f15179721 100644
--- a/lib/arel/engines/sql/extensions/array.rb
+++ b/lib/arel/engines/sql/extensions/array.rb
@@ -1,9 +1,16 @@
-class Array
-  def to_sql(formatter = nil)
-    "(" + collect { |e| e.to_sql(formatter) }.join(', ') + ")"
-  end
+module Arel
+  module Sql
+    module ArrayExtensions
+      def to_sql(formatter = nil)
+        "(" + collect { |e| e.to_sql(formatter) }.join(', ') + ")"
+      end
 
-  def inclusion_predicate_sql
-    "IN"
+      def inclusion_predicate_sql
+        "IN"
+      end
+      
+      Array.send(:include, self)
+    end
   end
 end
+
diff --git a/lib/arel/engines/sql/extensions/nil_class.rb b/lib/arel/engines/sql/extensions/nil_class.rb
index 6f38ecdf3a..8c335f904a 100644
--- a/lib/arel/engines/sql/extensions/nil_class.rb
+++ b/lib/arel/engines/sql/extensions/nil_class.rb
@@ -1,5 +1,11 @@
-class NilClass
-  def equality_predicate_sql
-    'IS'
+module Arel
+  module Sql
+    module NilClassExtensions
+      def equality_predicate_sql
+        'IS'
+      end
+      
+      NilClass.send(:include, self)
+    end
   end
 end
diff --git a/lib/arel/engines/sql/extensions/object.rb b/lib/arel/engines/sql/extensions/object.rb
index 65270ee3de..8fe63dba2f 100644
--- a/lib/arel/engines/sql/extensions/object.rb
+++ b/lib/arel/engines/sql/extensions/object.rb
@@ -1,9 +1,15 @@
-class Object
-  def to_sql(formatter)
-    formatter.scalar self
-  end
+module Arel
+  module Sql
+    module ObjectExtensions
+      def to_sql(formatter)
+        formatter.scalar self
+      end
 
-  def equality_predicate_sql
-    '='
+      def equality_predicate_sql
+        '='
+      end
+      
+      Object.send(:include, self)
+    end
   end
 end
diff --git a/lib/arel/engines/sql/extensions/range.rb b/lib/arel/engines/sql/extensions/range.rb
index 946dbc2633..25bf1d01da 100644
--- a/lib/arel/engines/sql/extensions/range.rb
+++ b/lib/arel/engines/sql/extensions/range.rb
@@ -1,9 +1,15 @@
-class Range
-  def to_sql(formatter = nil)
-    formatter.range self.begin, self.end
-  end
+module Arel
+  module Sql
+    module RangeExtensions
+      def to_sql(formatter = nil)
+        formatter.range self.begin, self.end
+      end
 
-  def inclusion_predicate_sql
-    "BETWEEN"
+      def inclusion_predicate_sql
+        "BETWEEN"
+      end
+      
+      Range.send(:include, self)
+    end
   end
 end
-- 
cgit v1.2.3


From 982f100d49095614df320d449f66f69aa827a763 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 18:40:24 -0400
Subject: Refactor #select_sql. Extract methods to generate clauses

---
 lib/arel/engines/sql/relations/relation.rb | 34 ++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
index 93c146352c..c8a4d952fe 100644
--- a/lib/arel/engines/sql/relations/relation.rb
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -6,17 +6,18 @@ module Arel
 
     def select_sql
       [
-        "SELECT     #{attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }.join(', ')}",
+        "SELECT     #{select_clauses.join(', ')}",
         "FROM       #{table_sql(Sql::TableReference.new(self))}",
-        (joins(self)                                                                                    unless joins(self).blank? ),
-        ("WHERE     #{wheres   .collect { |w| w.to_sql(Sql::WhereClause.new(self)) }.join("\n\tAND ")}" unless wheres.blank?      ),
-        ("GROUP BY  #{groupings.collect { |g| g.to_sql(Sql::GroupClause.new(self)) }.join(', ')}"       unless groupings.blank?   ),
-        ("ORDER BY  #{orders   .collect { |o| o.to_sql(Sql::OrderClause.new(self)) }.join(', ')}"       unless orders.blank?      ),
-        ("LIMIT     #{taken}"                                                                           unless taken.blank?       ),
-        ("OFFSET    #{skipped}"                                                                         unless skipped.blank?     )
+        (joins(self)                                   unless joins(self).blank? ),
+        ("WHERE     #{where_clauses.join("\n\tAND ")}" unless wheres.blank?      ),
+        ("GROUP BY  #{group_clauses.join(', ')}"       unless groupings.blank?   ),
+        ("ORDER BY  #{order_clauses.join(', ')}"       unless orders.blank?      ),
+        ("LIMIT     #{taken}"                          unless taken.blank?       ),
+        ("OFFSET    #{skipped}"                        unless skipped.blank?     )
       ].compact.join("\n")
     end
 
+
     def inclusion_predicate_sql
       "IN"
     end
@@ -24,5 +25,24 @@ module Arel
     def christener
       @christener ||= Sql::Christener.new
     end
+
+  protected
+
+    def select_clauses
+      attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }
+    end
+
+    def where_clauses
+      wheres.collect { |w| w.to_sql(Sql::WhereClause.new(self)) }
+    end
+
+    def group_clauses
+      groupings.collect { |g| g.to_sql(Sql::GroupClause.new(self)) }
+    end
+
+    def order_clauses
+      orders.collect { |o| o.to_sql(Sql::OrderClause.new(self)) }
+    end
+
   end
 end
-- 
cgit v1.2.3


From 2e6fbf4f75c8e33380623b52e86ca8b90037712f Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 18:47:45 -0400
Subject: Extracting #build_query method for creating SQL from parts

---
 lib/arel/engines/sql/relations/relation.rb         |  8 +++---
 .../engines/sql/relations/utilities/compound.rb    |  4 +++
 lib/arel/engines/sql/relations/writes.rb           | 29 ++++++++++++----------
 3 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
index c8a4d952fe..4cfb83a601 100644
--- a/lib/arel/engines/sql/relations/relation.rb
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -5,7 +5,7 @@ module Arel
     end
 
     def select_sql
-      [
+      build_query \
         "SELECT     #{select_clauses.join(', ')}",
         "FROM       #{table_sql(Sql::TableReference.new(self))}",
         (joins(self)                                   unless joins(self).blank? ),
@@ -14,10 +14,8 @@ module Arel
         ("ORDER BY  #{order_clauses.join(', ')}"       unless orders.blank?      ),
         ("LIMIT     #{taken}"                          unless taken.blank?       ),
         ("OFFSET    #{skipped}"                        unless skipped.blank?     )
-      ].compact.join("\n")
     end
 
-
     def inclusion_predicate_sql
       "IN"
     end
@@ -28,6 +26,10 @@ module Arel
 
   protected
 
+    def build_query(*parts)
+      parts.compact.join("\n")
+    end
+
     def select_clauses
       attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }
     end
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
index b63a829c67..f8ce4033fd 100644
--- a/lib/arel/engines/sql/relations/utilities/compound.rb
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -1,6 +1,10 @@
 module Arel
   class Compound < Relation
     delegate :table, :table_sql, :to => :relation
+
+    def build_query(*parts)
+      parts.compact.join("\n")
+    end
   end
 end
 
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
index 4d753f5fca..f1a9bfd2ac 100644
--- a/lib/arel/engines/sql/relations/writes.rb
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -1,36 +1,39 @@
 module Arel
   class Deletion < Compound
     def to_sql(formatter = nil)
-      [
+      build_query \
         "DELETE",
         "FROM #{table_sql}",
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank?  ),
-        ("LIMIT #{taken}"                                     unless taken.blank?    ),
-      ].compact.join("\n")
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank? ),
+        ("LIMIT #{taken}"                                     unless taken.blank?  )
     end
   end
 
   class Insert < Compound
     def to_sql(formatter = nil)
-      [
+      build_query \
         "INSERT",
         "INTO #{table_sql}",
         "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
         "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
-      ].join("\n")
     end
   end
 
   class Update < Compound
     def to_sql(formatter = nil)
-      [
+      build_query \
         "UPDATE #{table_sql} SET",
-        assignments.collect do |attribute, value|
-          "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
-        end.join(",\n"),
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank?  ),
-        ("LIMIT #{taken}"                                      unless taken.blank?    )
-      ].join("\n")
+        assignment_sql,
+        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank? ),
+        ("LIMIT #{taken}"                                      unless taken.blank?  )
+    end
+
+  protected
+
+    def assignment_sql
+      assignments.collect do |attribute, value|
+        "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
+      end.join(",\n")
     end
   end
 end
-- 
cgit v1.2.3


From 1234c926cce2a979ec967a8c5bc6ba58cda1ce71 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Mon, 18 May 2009 00:59:08 -0400
Subject: Cleaning up Sql::Engine#read

---
 lib/arel/engines/sql/engine.rb | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb
index 5a8c9f16c5..7d2926040c 100644
--- a/lib/arel/engines/sql/engine.rb
+++ b/lib/arel/engines/sql/engine.rb
@@ -19,13 +19,7 @@ module Arel
         end
 
         def read(relation)
-          # FIXME
           rows = connection.select_rows(relation.to_sql)
-
-          class << rows
-            include Enumerable
-          end
-
           Array.new(rows, relation.attributes)
         end
 
-- 
cgit v1.2.3


From 930c9f90a03729bdc380ab84882a118d8c17e54d Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Mon, 18 May 2009 01:11:40 -0400
Subject: Cleanup Sql formatters a bit

---
 lib/arel/engines/sql/formatters.rb | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
index 08a32843c9..ae80feb18e 100644
--- a/lib/arel/engines/sql/formatters.rb
+++ b/lib/arel/engines/sql/formatters.rb
@@ -14,18 +14,17 @@ module Arel
     class SelectClause < Formatter
       def attribute(attribute)
         # FIXME this should check that the column exists
-        if attribute.name.to_s =~ /^\w*$/
-          "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}" + (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
-        else
-          attribute.name.to_s + (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
-        end
+        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}" +
+        (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
       end
 
       def expression(expression)
         if expression.function_sql == "DISTINCT"
-          "#{expression.function_sql} #{expression.attribute.to_sql(self)}" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '')
+          "#{expression.function_sql} #{expression.attribute.to_sql(self)}" +
+          (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '')
         else
-          "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : " AS #{expression.function_sql.to_s.downcase}_id")
+          "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" +
+          (expression.alias ? " AS #{quote_column_name(expression.alias)}" : " AS #{expression.function_sql.to_s.downcase}_id")
         end
       end
 
@@ -93,11 +92,8 @@ module Arel
       end
 
       def table(table)
-        if table.name =~ /^(\w|-)*$/
-          quote_table_name(table.name) + (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
-        else
-          table.name + (table.name != name_for(table) ? " AS " + (name_for(table)) : '')
-        end
+        quote_table_name(table.name) +
+        (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
       end
     end
 
@@ -106,10 +102,6 @@ module Arel
         quote(scalar, environment.column)
       end
 
-      def array(array)
-        "(" + array.collect { |e| e.to_sql(self) }.join(', ') + ")"
-      end
-
       def range(left, right)
         "#{left} AND #{right}"
       end
-- 
cgit v1.2.3


From 65e419c172217f9747e2e56b36fcc4b6089a0d6d Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Mon, 18 May 2009 01:25:09 -0400
Subject: Expand usages of #hash_on. The #hash definition it produces looks
 broken, but leaving it for now

---
 lib/arel/engines/sql/relations/table.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index 0b6574eedc..dd22f44226 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -4,7 +4,6 @@ module Arel
 
     cattr_accessor :engine
     attr_reader :name, :engine
-    hash_on :name
 
     def initialize(name, engine = Table.engine)
       @name, @engine = name.to_s, engine
@@ -16,6 +15,14 @@ module Arel
       end
     end
 
+    def eql?(other)
+      self == other
+    end
+
+    def hash
+      @hash ||= :name.hash
+    end
+
     def format(attribute, value)
       attribute.column.type_cast(value)
     end
-- 
cgit v1.2.3


From 86364591af807ed3fa4a7304f53e6f3458cb4961 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Tue, 19 May 2009 21:36:34 -0400
Subject: Adding SqlLiteral with spec for counts

---
 lib/arel/engines/sql/primitives.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lib/arel/engines')

diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index f2e8e8dabe..bb3bed78e6 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -1,4 +1,14 @@
 module Arel
+  class SqlLiteral < String
+    def relation
+      nil
+    end
+    
+    def to_sql(formatter = nil)
+      self
+    end
+  end
+
   class Attribute
     def column
       original_relation.column_for(self)
-- 
cgit v1.2.3