arel 0.4.0 → 1.0.0.rc1

data/spec/support/model.rb

@@ -1,6 +1,6 @@
 module Arel
   module Testing
-    class Engine
+    class Engine < Arel::Memory::Engine
       attr_reader :rows
 
       def initialize
@@ -12,7 +12,12 @@ module Arel
       end
 
       def read(relation)
-        @rows.dup.map { |r| Row.new(relation, r) }
+        case relation
+        when Arel::Take, Arel::Order, Arel::Skip, Arel::Where
+          relation.eval
+        else
+          @rows.dup.map { |r| Row.new(relation, r) }
+        end
       end
 
       def create(insert)

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 977940574
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -16,16 +18,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31098225
         segments: 
         - 3
         - 0
@@ -57,7 +61,6 @@ files:
 - lib/arel/algebra/attributes/string.rb
 - lib/arel/algebra/attributes/time.rb
 - lib/arel/algebra/attributes.rb
-- lib/arel/algebra/core_extensions/class.rb
 - lib/arel/algebra/core_extensions/hash.rb
 - lib/arel/algebra/core_extensions/object.rb
 - lib/arel/algebra/core_extensions/symbol.rb
@@ -66,7 +69,6 @@ files:
 - lib/arel/algebra/header.rb
 - lib/arel/algebra/ordering.rb
 - lib/arel/algebra/predicates.rb
-- lib/arel/algebra/relations/operations/alias.rb
 - lib/arel/algebra/relations/operations/from.rb
 - lib/arel/algebra/relations/operations/group.rb
 - lib/arel/algebra/relations/operations/having.rb
@@ -87,12 +89,8 @@ files:
 - lib/arel/algebra/value.rb
 - lib/arel/algebra.rb
 - lib/arel/engines/memory/engine.rb
-- lib/arel/engines/memory/predicates.rb
-- lib/arel/engines/memory/primitives.rb
 - lib/arel/engines/memory/relations/array.rb
-- lib/arel/engines/memory/relations/compound.rb
 - lib/arel/engines/memory/relations/operations.rb
-- lib/arel/engines/memory/relations/writes.rb
 - lib/arel/engines/memory/relations.rb
 - lib/arel/engines/memory.rb
 - lib/arel/engines/sql/attributes.rb
@@ -109,26 +107,105 @@ files:
 - lib/arel/engines/sql/core_extensions.rb
 - lib/arel/engines/sql/engine.rb
 - lib/arel/engines/sql/formatters.rb
-- lib/arel/engines/sql/predicates.rb
-- lib/arel/engines/sql/primitives.rb
 - lib/arel/engines/sql/relations/compiler.rb
-- lib/arel/engines/sql/relations/operations/alias.rb
-- lib/arel/engines/sql/relations/operations/join.rb
-- lib/arel/engines/sql/relations/relation.rb
 - lib/arel/engines/sql/relations/table.rb
-- lib/arel/engines/sql/relations/utilities/compound.rb
-- lib/arel/engines/sql/relations/utilities/externalization.rb
 - lib/arel/engines/sql/relations/utilities/nil.rb
-- lib/arel/engines/sql/relations/utilities/recursion.rb
-- lib/arel/engines/sql/relations/writes.rb
 - lib/arel/engines/sql/relations.rb
 - lib/arel/engines/sql.rb
 - lib/arel/engines.rb
+- lib/arel/recursion/base_case.rb
 - lib/arel/session.rb
+- lib/arel/sql_literal.rb
 - lib/arel/version.rb
 - lib/arel.rb
 - History.txt
 - README.markdown
+- spec/algebra/unit/predicates/binary_spec.rb
+- spec/algebra/unit/predicates/equality_spec.rb
+- spec/algebra/unit/predicates/in_spec.rb
+- spec/algebra/unit/predicates/inequality_spec.rb
+- spec/algebra/unit/predicates/predicate_spec.rb
+- spec/algebra/unit/primitives/attribute_spec.rb
+- spec/algebra/unit/primitives/expression_spec.rb
+- spec/algebra/unit/primitives/value_spec.rb
+- spec/algebra/unit/relations/alias_spec.rb
+- spec/algebra/unit/relations/delete_spec.rb
+- spec/algebra/unit/relations/group_spec.rb
+- spec/algebra/unit/relations/insert_spec.rb
+- spec/algebra/unit/relations/join_spec.rb
+- spec/algebra/unit/relations/order_spec.rb
+- spec/algebra/unit/relations/project_spec.rb
+- spec/algebra/unit/relations/relation_spec.rb
+- spec/algebra/unit/relations/skip_spec.rb
+- spec/algebra/unit/relations/table_spec.rb
+- spec/algebra/unit/relations/take_spec.rb
+- spec/algebra/unit/relations/update_spec.rb
+- spec/algebra/unit/relations/where_spec.rb
+- spec/algebra/unit/session/session_spec.rb
+- spec/attributes/boolean_spec.rb
+- spec/attributes/float_spec.rb
+- spec/attributes/header_spec.rb
+- spec/attributes/integer_spec.rb
+- spec/attributes/string_spec.rb
+- spec/attributes/time_spec.rb
+- spec/engines/memory/integration/joins/cross_engine_spec.rb
+- spec/engines/memory/unit/relations/array_spec.rb
+- spec/engines/memory/unit/relations/insert_spec.rb
+- spec/engines/memory/unit/relations/join_spec.rb
+- spec/engines/memory/unit/relations/order_spec.rb
+- spec/engines/memory/unit/relations/project_spec.rb
+- spec/engines/memory/unit/relations/skip_spec.rb
+- spec/engines/memory/unit/relations/take_spec.rb
+- spec/engines/memory/unit/relations/where_spec.rb
+- spec/engines/sql/integration/joins/with_adjacency_spec.rb
+- spec/engines/sql/integration/joins/with_aggregations_spec.rb
+- spec/engines/sql/integration/joins/with_compounds_spec.rb
+- spec/engines/sql/unit/engine_spec.rb
+- spec/engines/sql/unit/predicates/binary_spec.rb
+- spec/engines/sql/unit/predicates/equality_spec.rb
+- spec/engines/sql/unit/predicates/in_spec.rb
+- spec/engines/sql/unit/predicates/noteq_spec.rb
+- spec/engines/sql/unit/predicates/predicates_spec.rb
+- spec/engines/sql/unit/primitives/attribute_spec.rb
+- spec/engines/sql/unit/primitives/expression_spec.rb
+- spec/engines/sql/unit/primitives/literal_spec.rb
+- spec/engines/sql/unit/primitives/value_spec.rb
+- spec/engines/sql/unit/relations/alias_spec.rb
+- spec/engines/sql/unit/relations/delete_spec.rb
+- spec/engines/sql/unit/relations/from_spec.rb
+- spec/engines/sql/unit/relations/group_spec.rb
+- spec/engines/sql/unit/relations/having_spec.rb
+- spec/engines/sql/unit/relations/insert_spec.rb
+- spec/engines/sql/unit/relations/join_spec.rb
+- spec/engines/sql/unit/relations/lock_spec.rb
+- spec/engines/sql/unit/relations/order_spec.rb
+- spec/engines/sql/unit/relations/project_spec.rb
+- spec/engines/sql/unit/relations/skip_spec.rb
+- spec/engines/sql/unit/relations/table_spec.rb
+- spec/engines/sql/unit/relations/take_spec.rb
+- spec/engines/sql/unit/relations/update_spec.rb
+- spec/engines/sql/unit/relations/where_spec.rb
+- spec/relations/join_spec.rb
+- spec/relations/relation_spec.rb
+- spec/shared/relation_spec.rb
+- spec/spec_helper.rb
+- spec/sql/christener_spec.rb
+- spec/support/check.rb
+- spec/support/connections/mysql_connection.rb
+- spec/support/connections/oracle_connection.rb
+- spec/support/connections/postgresql_connection.rb
+- spec/support/connections/sqlite3_connection.rb
+- spec/support/guards.rb
+- spec/support/matchers/be_like.rb
+- spec/support/matchers/disambiguate_attributes.rb
+- spec/support/matchers/hash_the_same_as.rb
+- spec/support/matchers/have_rows.rb
+- spec/support/matchers.rb
+- spec/support/model.rb
+- spec/support/schemas/mysql_schema.rb
+- spec/support/schemas/oracle_schema.rb
+- spec/support/schemas/postgresql_schema.rb
+- spec/support/schemas/sqlite3_schema.rb
 has_rdoc: true
 homepage: http://github.com/brynary/arel
 licenses: []
@@ -139,23 +216,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: arel
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Arel is a relational algebra engine for Ruby
@@ -163,6 +246,8 @@ test_files:
 - spec/algebra/unit/predicates/binary_spec.rb
 - spec/algebra/unit/predicates/equality_spec.rb
 - spec/algebra/unit/predicates/in_spec.rb
+- spec/algebra/unit/predicates/inequality_spec.rb
+- spec/algebra/unit/predicates/predicate_spec.rb
 - spec/algebra/unit/primitives/attribute_spec.rb
 - spec/algebra/unit/primitives/expression_spec.rb
 - spec/algebra/unit/primitives/value_spec.rb
@@ -227,6 +312,7 @@ test_files:
 - spec/relations/relation_spec.rb
 - spec/shared/relation_spec.rb
 - spec/spec_helper.rb
+- spec/sql/christener_spec.rb
 - spec/support/check.rb
 - spec/support/connections/mysql_connection.rb
 - spec/support/connections/oracle_connection.rb

data/lib/arel/algebra/core_extensions/class.rb

@@ -1,32 +0,0 @@
-module Arel
-  module ClassExtensions
-    def attributes(*attrs)
-      @attributes = attrs
-      attr_reader(*attrs)
-    end
-
-    def deriving(*methods)
-      methods.each { |m| derive m }
-    end
-
-    def derive(method_name)
-      methods = {
-        :initialize => "
-          def #{method_name}(#{@attributes.join(',')})
-            #{@attributes.collect { |a| "@#{a} = #{a}" }.join("\n")}
-          end
-        ",
-        :== => "
-          def ==(other)
-            #{name} === other &&
-            #{@attributes.collect { |a| "@#{a} == other.#{a}" }.join(" &&\n")}
-          end
-        "
-      }
-      class_eval methods[method_name], __FILE__, __LINE__
-    end
-
-    Class.send(:include, self)
-  end
-end
-

data/lib/arel/algebra/relations/operations/alias.rb

@@ -1,7 +0,0 @@
-module Arel
-  class Alias < Compound
-    attributes :relation
-    deriving :initialize
-    alias_method :==, :equal?
-  end
-end

data/lib/arel/engines/memory/predicates.rb

@@ -1,99 +0,0 @@
-module Arel
-  module Predicates
-    class Binary < Predicate
-      def eval(row)
-        operand1.eval(row).send(operator, operand2.eval(row))
-      end
-    end
-
-    class Unary < Predicate
-      def eval(row)
-        operand.eval(row).send(operator)
-      end
-    end
-
-    class Not < Unary
-      def eval(row)
-        !operand.eval(row)
-      end
-    end
-
-    class Polyadic < Predicate
-      def eval(row)
-        predicates.send(compounder) do |operation|
-          operation.eval(row)
-        end
-      end
-    end
-
-    class Any < Polyadic
-      def compounder; :any? end
-    end
-
-    class All < Polyadic
-      def compounder; :all? end
-    end
-
-    class CompoundPredicate < Binary
-      def eval(row)
-        eval "operand1.eval(row) #{operator} operand2.eval(row)"
-      end
-    end
-
-    class Or < CompoundPredicate
-      def operator; :or end
-    end
-
-    class And < CompoundPredicate
-      def operator; :and end
-    end
-
-    class Equality < Binary
-      def operator; :== end
-    end
-
-    class Inequality < Binary
-      def eval(row)
-        operand1.eval(row) != operand2.eval(row)
-      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
-      def operator; :< end
-    end
-
-    class Match < Binary
-      def operator; :=~ end
-    end
-
-    class NotMatch < Binary
-      def eval(row)
-        operand1.eval(row) !~ operand2.eval(row)
-      end
-    end
-
-    class In < Binary
-      def eval(row)
-        operand2.eval(row).include?(operand1.eval(row))
-      end
-    end
-
-    class NotIn < Binary
-      def eval(row)
-        !(operand2.eval(row).include?(operand1.eval(row)))
-      end
-    end
-  end
-end

data/lib/arel/engines/memory/primitives.rb

@@ -1,27 +0,0 @@
-module Arel
-  class Attribute
-    def eval(row)
-      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

data/lib/arel/engines/memory/relations/compound.rb

@@ -1,9 +0,0 @@
-module Arel
-  class Compound
-    delegate :array, :to => :relation
-
-    def unoperated_rows
-      relation.call.collect { |row| row.bind(self) }
-    end
-  end
-end

data/lib/arel/engines/memory/relations/writes.rb

@@ -1,7 +0,0 @@
-module Arel
-  class Insert < Compound
-    def eval
-      unoperated_rows + [Row.new(self, record.values.collect(&:value))]
-    end
-  end
-end

data/lib/arel/engines/sql/predicates.rb

@@ -1,103 +0,0 @@
-module Arel
-  module Predicates
-    class Binary < Predicate
-      def to_sql(formatter = nil)
-        "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}"
-      end
-    end
-
-    class Unary < Predicate
-      def to_sql(formatter = nil)
-        "#{predicate_sql} (#{operand.to_sql(formatter)})"
-      end
-    end
-
-    class Not < Unary
-      def predicate_sql; "NOT" 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 Polyadic < Predicate
-      def to_sql(formatter = nil)
-        "(" +
-          predicates.map {|p| p.to_sql(formatter)}.join(" #{predicate_sql} ") +
-        ")"
-      end
-    end
-
-    class Any < Polyadic
-      def predicate_sql; "OR" end
-    end
-
-    class All < Polyadic
-      def predicate_sql; "AND" end
-    end
-
-    class Equality < Binary
-      def predicate_sql
-        operand2.equality_predicate_sql
-      end
-    end
-
-    class Inequality < Binary
-      def predicate_sql
-        operand2.inequality_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 NotMatch < Binary
-      def predicate_sql; 'NOT LIKE' end
-    end
-
-    class In < Binary
-      def to_sql(formatter = nil)
-        if operand2.is_a?(Range) && operand2.exclude_end?
-          GreaterThanOrEqualTo.new(operand1, operand2.begin).and(
-            LessThan.new(operand1, operand2.end)
-          ).to_sql(formatter)
-        else
-          super
-        end
-      end
-
-      def predicate_sql; operand2.inclusion_predicate_sql end
-    end
-
-    class NotIn < Binary
-      def predicate_sql; operand2.exclusion_predicate_sql end
-    end
-  end
-end