arel 6.0.0.beta2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 574ad2e118c98249afe11b53301402b5147f4c30
-  data.tar.gz: 57ffac4daf00d333d7e7f7e892a1803e000d3c92
+  metadata.gz: 607f322b2e6662d91cbef8d1433904774af2584c
+  data.tar.gz: 7b45ade5c1572eb9b60ec5bc96b90cf307ddd470
 SHA512:
-  metadata.gz: 9a60726582ea96b9c18f1ffd0dac8930b54c970c1ba31c8f21e7ab52f8bdbc2fdf88b46cd3481b208abe62f5977520680604d13df5caca1568b79b519e8896e6
-  data.tar.gz: 70f4af33cc151ca020f80a95520914540f51c66bad7ff2c8dc06963cacda3aa34c2208a0fe88545d4206d5b6408aa69a4ab7c6f4c7ac1a39d58416d09702402b
+  metadata.gz: 9d3471ace631b643c589efca9461e4810a5db0b5f4a4f0126b56cd033c802d75a3cfb5b44771738869582bf651103679e4bfa7b3628328c5493f9992490bf627
+  data.tar.gz: 8e5a1949954982acc175e6bc1f6c3e15070245d5d2643c292ac47fdc56b9cd19a37ac7390ee97c3570dd4269d4b4ae886ee8b35fcdcfc29056b4840bb1ae225b

data/History.txt

@@ -1,4 +1,4 @@
-=== NEXT / 2014-02-10
+=== 6.0.0 / 2014-11-25
 
 * Enhancements
 

data/README.markdown

@@ -120,10 +120,10 @@ Aggregate functions `AVG`, `SUM`, `COUNT`, `MIN`, `MAX`, `HAVING`:
 
 ```ruby
 photos.group(photos[:user_id]).having(photos[:id].count.gt(5)) # => SELECT FROM photos GROUP BY photos.user_id HAVING COUNT(photos.id) > 5
-users.project(users[:age].sum) # => SELECT SUM(users.age) AS sum_id FROM users
-users.project(users[:age].average) # => SELECT AVG(users.age) AS avg_id FROM users
-users.project(users[:age].maximum) # => SELECT MAX(users.age) AS max_id FROM users
-users.project(users[:age].minimum) # => SELECT MIN(users.age) AS min_id FROM users
+users.project(users[:age].sum) # => SELECT SUM(users.age) FROM users
+users.project(users[:age].average) # => SELECT AVG(users.age) FROM users
+users.project(users[:age].maximum) # => SELECT MAX(users.age) FROM users
+users.project(users[:age].minimum) # => SELECT MIN(users.age) FROM users
 users.project(users[:age].count) # => SELECT COUNT(users.age) FROM users
 ```
 
@@ -201,7 +201,7 @@ users.
   project(users[:id], cte_table[:click].sum).
   with(composed_cte)
 
-# => WITH cte_table AS (SELECT FROM photos  WHERE photos.created_at > '2014-05-02') SELECT users.id, SUM(cte_table.click) AS sum_id FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
+# => WITH cte_table AS (SELECT FROM photos  WHERE photos.created_at > '2014-05-02') SELECT users.id, SUM(cte_table.click) FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
 ```
 
 When your query is too complex for `Arel`, you can use `Arel::SqlLiteral`:

data/lib/arel.rb

@@ -21,7 +21,7 @@ require 'arel/delete_manager'
 require 'arel/nodes'
 
 module Arel
-  VERSION = '6.0.0.beta2'
+  VERSION = '6.0.0'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/collectors/sql_string.rb

@@ -5,8 +5,14 @@ require 'arel/collectors/plain_string'
 module Arel
   module Collectors
     class SQLString < PlainString
+      def initialize(*)
+        super
+        @bind_index = 1
+      end
+
       def add_bind bind
-        self << bind.to_s
+        self << yield(@bind_index)
+        @bind_index += 1
         self
       end
 

data/lib/arel/expressions.rb

@@ -5,23 +5,24 @@ module Arel
     end
 
     def sum
-      Nodes::Sum.new [self], Nodes::SqlLiteral.new('sum_id')
+      Nodes::Sum.new [self]
     end
 
     def maximum
-      Nodes::Max.new [self], Nodes::SqlLiteral.new('max_id')
+      Nodes::Max.new [self]
     end
 
     def minimum
-      Nodes::Min.new [self], Nodes::SqlLiteral.new('min_id')
+      Nodes::Min.new [self]
     end
 
     def average
-      Nodes::Avg.new [self], Nodes::SqlLiteral.new('avg_id')
+      Nodes::Avg.new [self]
     end
 
     def extract field
       Nodes::Extract.new [self], field
     end
+
   end
 end

data/lib/arel/nodes.rb

@@ -4,6 +4,7 @@ require 'arel/nodes/select_statement'
 require 'arel/nodes/select_core'
 require 'arel/nodes/insert_statement'
 require 'arel/nodes/update_statement'
+require 'arel/nodes/bind_param'
 
 # terminal
 

data/lib/arel/nodes/bind_param.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class BindParam < Node
+    end
+  end
+end

data/lib/arel/nodes/sql_literal.rb

@@ -10,8 +10,5 @@ module Arel
         coder.scalar = self.to_s
       end
     end
-
-    class BindParam < SqlLiteral
-    end
   end
 end

data/lib/arel/predications.rb

@@ -55,7 +55,7 @@ Passing a range to `#in` is deprecated. Call `#between`, instead.
           eowarn
         end
         between(other)
-      when Array
+      when Enumerable
         Nodes::In.new self, quoted_array(other)
       else
         Nodes::In.new self, quoted_node(other)
@@ -103,7 +103,7 @@ Passing a range to `#not_in` is deprecated. Call `#not_between`, instead.
           eowarn
         end
         not_between(other)
-      when Array
+      when Enumerable
         Nodes::NotIn.new self, quoted_array(other)
       else
         Nodes::NotIn.new self, quoted_node(other)

data/lib/arel/visitors/depth_first.rb

@@ -173,6 +173,12 @@ module Arel
       def visit_Hash o
         o.each { |k,v| visit(k); visit(v) }
       end
+
+      DISPATCH = dispatch_cache
+
+      def get_dispatch_cache
+        DISPATCH
+      end
     end
   end
 end

data/lib/arel/visitors/oracle.rb

@@ -132,6 +132,10 @@ module Arel
         array
       end
 
+      def visit_Arel_Nodes_BindParam o, collector
+        collector.add_bind(o) { |i| ":a#{i}" }
+      end
+
     end
   end
 end

data/lib/arel/visitors/postgresql.rb

@@ -23,6 +23,10 @@ module Arel
         collector << "DISTINCT ON ( "
         visit(o.expr, collector) << " )"
       end
+
+      def visit_Arel_Nodes_BindParam o, collector
+        collector.add_bind(o) { |i| "$#{i}" }
+      end
     end
   end
 end

data/lib/arel/visitors/reduce.rb

@@ -10,14 +10,14 @@ module Arel
       private
 
       def visit object, collector
-        send dispatch[object.class.name], object, collector
+        send dispatch[object.class], object, collector
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class.name], true)
+        raise e if respond_to?(dispatch[object.class], true)
         superklass = object.class.ancestors.find { |klass|
-          respond_to?(dispatch[klass.name], true)
+          respond_to?(dispatch[klass], true)
         }
         raise(TypeError, "Cannot visit #{object.class}") unless superklass
-        dispatch[object.class.name] = dispatch[superklass.name]
+        dispatch[object.class] = dispatch[superklass]
         retry
       end
     end

data/lib/arel/visitors/to_sql.rb

@@ -186,7 +186,8 @@ module Arel
 
         len = o.expressions.length - 1
         o.expressions.zip(o.columns).each_with_index { |(value, attr), i|
-          if Nodes::SqlLiteral === value
+          case value
+          when Nodes::SqlLiteral, Nodes::BindParam
             collector = visit value, collector
           else
             collector << quote(value, attr && column_for(attr)).to_s
@@ -713,7 +714,7 @@ module Arel
       def literal o, collector; collector << o.to_s; end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind o
+        collector.add_bind(o) { "?" }
       end
 
       alias :visit_Arel_Nodes_SqlLiteral :literal

data/lib/arel/visitors/visitor.rb

@@ -2,17 +2,7 @@ module Arel
   module Visitors
     class Visitor
       def initialize
-        @dispatch = Hash.new do |hash, class_name|
-          raise if class_name == 'Arel::Nodes::Union'
-           hash[class_name] = "visit_#{(class_name || '').gsub('::', '_')}"
-        end
-
-        # pre-populate cache. FIXME: this should be passed in to each
-        # instance, but we can do that later.
-        self.class.private_instance_methods.sort.each do |name|
-          next unless name =~ /^visit_(.*)$/
-          @dispatch[$1.gsub('_', '::')] = name
-        end
+        @dispatch = get_dispatch_cache
       end
 
       def accept object
@@ -21,19 +11,29 @@ module Arel
 
       private
 
+      def self.dispatch_cache
+        Hash.new do |hash, klass|
+          hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+        end
+      end
+
+      def get_dispatch_cache
+        self.class.dispatch_cache
+      end
+
       def dispatch
         @dispatch
       end
 
       def visit object
-        send dispatch[object.class.name], object
+        send dispatch[object.class], object
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class.name], true)
+        raise e if respond_to?(dispatch[object.class], true)
         superklass = object.class.ancestors.find { |klass|
-          respond_to?(dispatch[klass.name], true)
+          respond_to?(dispatch[klass], true)
         }
         raise(TypeError, "Cannot visit #{object.class}") unless superklass
-        dispatch[object.class.name] = dispatch[superklass.name]
+        dispatch[object.class] = dispatch[superklass]
         retry
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta2
+  version: 6.0.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,36 +11,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Arel Really Exasperates Logicians
 
@@ -63,14 +77,9 @@ extra_rdoc_files:
 - MIT-LICENSE.txt
 - README.markdown
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
 - History.txt
 - MIT-LICENSE.txt
 - README.markdown
-- Rakefile
-- arel.gemspec
 - lib/arel.rb
 - lib/arel/alias_predication.rb
 - lib/arel/attributes.rb
@@ -89,6 +98,7 @@ files:
 - lib/arel/nodes/and.rb
 - lib/arel/nodes/ascending.rb
 - lib/arel/nodes/binary.rb
+- lib/arel/nodes/bind_param.rb
 - lib/arel/nodes/count.rb
 - lib/arel/nodes/delete_statement.rb
 - lib/arel/nodes/descending.rb
@@ -145,82 +155,29 @@ files:
 - lib/arel/visitors/visitor.rb
 - lib/arel/visitors/where_sql.rb
 - lib/arel/window_predications.rb
-- test/attributes/test_attribute.rb
-- test/collectors/test_bind_collector.rb
-- test/collectors/test_sql_string.rb
-- test/helper.rb
-- test/nodes/test_and.rb
-- test/nodes/test_as.rb
-- test/nodes/test_ascending.rb
-- test/nodes/test_bin.rb
-- test/nodes/test_binary.rb
-- test/nodes/test_count.rb
-- test/nodes/test_delete_statement.rb
-- test/nodes/test_descending.rb
-- test/nodes/test_distinct.rb
-- test/nodes/test_equality.rb
-- test/nodes/test_extract.rb
-- test/nodes/test_false.rb
-- test/nodes/test_grouping.rb
-- test/nodes/test_infix_operation.rb
-- test/nodes/test_insert_statement.rb
-- test/nodes/test_named_function.rb
-- test/nodes/test_node.rb
-- test/nodes/test_not.rb
-- test/nodes/test_or.rb
-- test/nodes/test_over.rb
-- test/nodes/test_select_core.rb
-- test/nodes/test_select_statement.rb
-- test/nodes/test_sql_literal.rb
-- test/nodes/test_sum.rb
-- test/nodes/test_table_alias.rb
-- test/nodes/test_true.rb
-- test/nodes/test_update_statement.rb
-- test/nodes/test_window.rb
-- test/support/fake_record.rb
-- test/test_attributes.rb
-- test/test_crud.rb
-- test/test_delete_manager.rb
-- test/test_factory_methods.rb
-- test/test_insert_manager.rb
-- test/test_select_manager.rb
-- test/test_table.rb
-- test/test_update_manager.rb
-- test/visitors/test_bind_visitor.rb
-- test/visitors/test_depth_first.rb
-- test/visitors/test_dispatch_contamination.rb
-- test/visitors/test_dot.rb
-- test/visitors/test_ibm_db.rb
-- test/visitors/test_informix.rb
-- test/visitors/test_mssql.rb
-- test/visitors/test_mysql.rb
-- test/visitors/test_oracle.rb
-- test/visitors/test_postgres.rb
-- test/visitors/test_sqlite.rb
-- test/visitors/test_to_sql.rb
 homepage: https://github.com/rails/arel
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby