arel 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d63929355e39f8b80a24e91781752eb2b152ff56
-  data.tar.gz: 5c67efb970c72f38f5d43619c52492f77af5f107
+  metadata.gz: dc3719172683caa3fb2bd15ce6ef3ed477a8b2ef
+  data.tar.gz: 74b4f1d7d44871db56c62907ed1c4ba51040bf6e
 SHA512:
-  metadata.gz: 690294ba02d8416fa6204ec94a2a35d822aa3533d7767e5477da68572ca233cda12eae57eb6d1b4d619afc08e0ff29fc4f09b93a79fae8b83d4778cb351fbc3e
-  data.tar.gz: 6bb11f371d17dfc7ffb400e98b49ddad92b80f7095d8e4ff7e72a9c8555c0335f3da6ae08df96cc3641cd8784ea2fea11daaf5fc4b1c860df43eb011023ef18f
+  metadata.gz: bedb8b1701ee99fca067c4a52f92d096648d25d67d4809408ede3eeb40298b3fc83a9fdccf1f4195c32f871ee430eba29f11dedd19b12032639a8b03bc7ec54c
+  data.tar.gz: 97a3b3155db8b0c57ca4616598d45d8aad7592c56a6882e0e7f5369eeac221802cae5cd60b4d72a92d755eb13be4b39aedc9ea967e1c6faac28953a3414d1f39

data/History.txt

@@ -1,3 +1,9 @@
+=== 9.0.0 / 2017-11-14
+
+* Enhancements
+  * `InsertManager#insert` is now chainable
+  * Support multiple inserts
+
 === 8.0.0 / 2017-02-21
 
 * Enhancements

data/README.md

@@ -150,7 +150,14 @@ The `OR` operator works like this:
 users.where(users[:name].eq('bob').or(users[:age].lt(25)))
 ```
 
-The `AND` operator behaves similarly.
+The `AND` operator behaves similarly. Here is an example of the `DISTINCT` operator:
+
+```ruby
+posts = Arel::Table.new(:posts)
+posts.project(posts[:title])
+posts.distinct
+posts.to_sql # => 'SELECT DISTINCT "posts"."title" FROM "posts"'
+```
 
 Aggregate functions `AVG`, `SUM`, `COUNT`, `MIN`, `MAX`, `HAVING`:
 
@@ -181,7 +188,7 @@ users.project(users[:age].average.as("mean_age"))
 # => SELECT AVG(users.age) AS mean_age FROM users
 ```
 
-### The Crazy Features
+### The Advanced Features
 
 The examples above are fairly simple and other libraries match or come close to matching the expressiveness of Arel (e.g. `Sequel` in Ruby).
 
@@ -208,6 +215,7 @@ products.
 
 #### Complex Joins
 
+##### Alias
 Where Arel really shines is in its ability to handle complex joins and aggregations. As a first example, let's consider an "adjacency list", a tree represented in a table. Suppose we have a table `comments`, representing a threaded discussion:
 
 ```ruby
@@ -233,6 +241,7 @@ comments_with_replies = \
 
 This will return the reply for the first comment.
 
+##### CTE
 [Common Table Expressions (CTE)](https://en.wikipedia.org/wiki/Common_table_expressions#Common_table_expression) support via:
 
 Create a `CTE`
@@ -255,6 +264,7 @@ users.
 #    FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
 ```
 
+#### Write SQL strings
 When your query is too complex for `Arel`, you can use `Arel::SqlLiteral`:
 
 ```ruby

data/lib/arel.rb

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

data/lib/arel/collectors/bind.rb

@@ -1,36 +1,23 @@
 # frozen_string_literal: true
+
 module Arel
   module Collectors
     class Bind
       def initialize
-        @parts = []
+        @binds = []
       end
 
       def << str
-        @parts << str
         self
       end
 
       def add_bind bind
-        @parts << bind
+        @binds << bind
         self
       end
 
-      def value; @parts; end
-
-      def substitute_binds bvs
-        bvs = bvs.dup
-        @parts.map do |val|
-          if Arel::Nodes::BindParam === val
-            bvs.shift
-          else
-            val
-          end
-        end
-      end
-
-      def compile bvs
-        substitute_binds(bvs).join
+      def value
+        @binds
       end
     end
   end

data/lib/arel/collectors/composite.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Arel
+  module Collectors
+    class Composite
+      def initialize(left, right)
+        @left = left
+        @right = right
+      end
+
+      def << str
+        left << str
+        right << str
+        self
+      end
+
+      def add_bind bind, &block
+        left.add_bind bind, &block
+        right.add_bind bind, &block
+        self
+      end
+
+      def value
+        [left.value, right.value]
+      end
+
+      protected
+
+      attr_reader :left, :right
+    end
+  end
+end

data/lib/arel/collectors/sql_string.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'arel/collectors/plain_string'

data/lib/arel/collectors/substitute_binds.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Arel
+  module Collectors
+    class SubstituteBinds
+      def initialize(quoter, delegate_collector)
+        @quoter = quoter
+        @delegate = delegate_collector
+      end
+
+      def << str
+        delegate << str
+        self
+      end
+
+      def add_bind bind
+        self << quoter.quote(bind)
+      end
+
+      def value
+        delegate.value
+      end
+
+      protected
+
+      attr_reader :quoter, :delegate
+    end
+  end
+end

data/lib/arel/insert_manager.rb

@@ -34,10 +34,15 @@ module Arel
         end
         @ast.values = create_values values, @ast.columns
       end
+      self
     end
 
     def create_values values, columns
       Nodes::Values.new values, columns
     end
+
+    def create_values_list(rows)
+      Nodes::ValuesList.new(rows)
+    end
   end
 end

data/lib/arel/nodes.rb

@@ -44,6 +44,7 @@ require 'arel/nodes/function'
 require 'arel/nodes/count'
 require 'arel/nodes/extract'
 require 'arel/nodes/values'
+require 'arel/nodes/values_list'
 require 'arel/nodes/named_function'
 
 # windows

data/lib/arel/nodes/bind_param.rb

@@ -2,8 +2,25 @@
 module Arel
   module Nodes
     class BindParam < Node
-      def ==(other)
-        other.is_a?(BindParam)
+      attr_accessor :value
+
+      def initialize(value)
+        @value = value
+        super()
+      end
+
+      def hash
+        [self.class, self.value].hash
+      end
+
+      def eql?(other)
+        other.is_a?(BindParam) &&
+          value == other.value
+      end
+      alias :== :eql?
+
+      def nil?
+        value.nil?
       end
     end
   end

data/lib/arel/nodes/casted.rb

@@ -30,7 +30,7 @@ module Arel
 
     def self.build_quoted other, attribute = nil
       case other
-        when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager, Arel::Nodes::Quoted
+        when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager, Arel::Nodes::Quoted, Arel::Nodes::SqlLiteral
           other
         else
           case attribute

data/lib/arel/nodes/count.rb

@@ -2,6 +2,8 @@
 module Arel
   module Nodes
     class Count < Arel::Nodes::Function
+      include Math
+
       def initialize expr, distinct = false, aliaz = nil
         super(expr, aliaz)
         @distinct = distinct

data/lib/arel/nodes/false.rb

@@ -9,6 +9,7 @@ module Arel
       def eql? other
         self.class == other.class
       end
+      alias :== :eql?
     end
   end
 end

data/lib/arel/nodes/function.rb

@@ -29,6 +29,8 @@ module Arel
           self.alias == other.alias &&
           self.distinct == other.distinct
       end
+      alias :== :eql?
+
     end
 
     %w{

data/lib/arel/nodes/terminal.rb

@@ -9,6 +9,7 @@ module Arel
       def eql? other
         self.class == other.class
       end
+      alias :== :eql?
     end
   end
 end

data/lib/arel/nodes/true.rb

@@ -9,6 +9,7 @@ module Arel
       def eql? other
         self.class == other.class
       end
+      alias :== :eql?
     end
   end
 end

data/lib/arel/nodes/values_list.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Arel
+  module Nodes
+    class ValuesList < Node
+      attr_reader :rows
+
+      def initialize(rows)
+        @rows = rows
+        super()
+      end
+
+      def hash
+        @rows.hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+          self.rows == other.rows
+      end
+      alias :== :eql?
+    end
+  end
+end

data/lib/arel/nodes/window.rb

@@ -107,6 +107,7 @@ module Arel
       def eql? other
         self.class == other.class
       end
+      alias :== :eql?
     end
 
     class Preceding < Unary

data/lib/arel/tree_manager.rb

@@ -5,13 +5,10 @@ module Arel
   class TreeManager
     include Arel::FactoryMethods
 
-    attr_reader :ast, :engine
-
-    attr_accessor :bind_values
+    attr_reader :ast
 
     def initialize
-      @ctx    = nil
-      @bind_values = []
+      @ctx = nil
     end
 
     def to_dot

data/lib/arel/visitors/informix.rb

@@ -18,9 +18,7 @@ module Arel
       end
       def visit_Arel_Nodes_SelectCore o, collector
         collector = inject_join o.projections, collector, ", "
-        froms = false
         if o.source && !o.source.empty?
-          froms = true
           collector << " FROM "
           collector = visit o.source, collector
         end

data/lib/arel/visitors/oracle.rb

@@ -29,12 +29,12 @@ module Arel
           collector = super(o, collector)
 
           if offset.expr.is_a? Nodes::BindParam
-            offset_bind = nil
             collector << ') raw_sql_ WHERE rownum <= ('
-            collector.add_bind(offset.expr) { |i| offset_bind = ":a#{i}" }
+            collector = visit offset.expr, collector
             collector << ' + '
-            collector.add_bind(limit) { |i| ":a#{i}" }
-            collector << ") ) WHERE raw_rnum_ > #{offset_bind}"
+            collector = visit limit, collector
+            collector << ") ) WHERE raw_rnum_ > "
+            collector = visit offset.expr, collector
             return collector
           else
             collector << ") raw_sql_
@@ -145,7 +145,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| ":a#{i}" }
+        collector.add_bind(o.value) { |i| ":a#{i}" }
       end
 
     end

data/lib/arel/visitors/oracle12.rb

@@ -53,7 +53,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| ":a#{i}" }
+        collector.add_bind(o.value) { |i| ":a#{i}" }
       end
     end
   end

data/lib/arel/visitors/postgresql.rb

@@ -46,7 +46,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| "$#{i}" }
+        collector.add_bind(o.value) { |i| "$#{i}" }
       end
 
       def visit_Arel_Nodes_GroupingElement o, collector

data/lib/arel/visitors/reduce.rb

@@ -11,9 +11,10 @@ module Arel
       private
 
       def visit object, collector
-        send dispatch[object.class], object, collector
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object, collector
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class], true)
+        raise e if respond_to?(dispatch_method, true)
         superklass = object.class.ancestors.find { |klass|
           respond_to?(dispatch[klass], true)
         }

data/lib/arel/visitors/to_sql.rb

@@ -166,6 +166,28 @@ module Arel
         collector << "FALSE"
       end
 
+      def visit_Arel_Nodes_ValuesList o, collector
+        collector << "VALUES "
+
+        len = o.rows.length - 1
+        o.rows.each_with_index { |row, i|
+          collector << '('
+          row_len = row.length - 1
+          row.each_with_index do |value, k|
+            case value
+            when Nodes::SqlLiteral, Nodes::BindParam
+              collector = visit(value, collector)
+            else
+              collector << quote(value)
+            end
+            collector << COMMA unless k == row_len
+          end
+          collector << ')'
+          collector << COMMA unless i == len
+        }
+        collector
+      end
+
       def visit_Arel_Nodes_Values o, collector
         collector << "VALUES ("
 
@@ -405,7 +427,8 @@ module Arel
       end
 
       def visit_Arel_SelectManager o, collector
-        collector << "(#{o.to_sql.rstrip})"
+        collector << '('
+        visit(o.ast, collector) << ')'
       end
 
       def visit_Arel_Nodes_Ascending o, collector
@@ -715,7 +738,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.value) { "?" }
       end
 
       alias :visit_Arel_Nodes_SqlLiteral :literal

data/lib/arel/visitors/visitor.rb

@@ -27,9 +27,10 @@ module Arel
       end
 
       def visit object
-        send dispatch[object.class], object
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class], true)
+        raise e if respond_to?(dispatch_method, true)
         superklass = object.class.ancestors.find { |klass|
           respond_to?(dispatch[klass], true)
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -55,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |-
   Arel Really Exasperates Logicians
 
@@ -85,8 +99,10 @@ files:
 - lib/arel/attributes.rb
 - lib/arel/attributes/attribute.rb
 - lib/arel/collectors/bind.rb
+- lib/arel/collectors/composite.rb
 - lib/arel/collectors/plain_string.rb
 - lib/arel/collectors/sql_string.rb
+- lib/arel/collectors/substitute_binds.rb
 - lib/arel/compatibility/wheres.rb
 - lib/arel/crud.rb
 - lib/arel/delete_manager.rb
@@ -135,6 +151,7 @@ files:
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
 - lib/arel/nodes/values.rb
+- lib/arel/nodes/values_list.rb
 - lib/arel/nodes/window.rb
 - lib/arel/nodes/with.rb
 - lib/arel/order_predications.rb
@@ -144,8 +161,6 @@ files:
 - lib/arel/tree_manager.rb
 - lib/arel/update_manager.rb
 - lib/arel/visitors.rb
-- lib/arel/visitors/bind_substitute.rb
-- lib/arel/visitors/bind_visitor.rb
 - lib/arel/visitors/depth_first.rb
 - lib/arel/visitors/dot.rb
 - lib/arel/visitors/ibm_db.rb
@@ -175,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -183,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby

data/lib/arel/visitors/bind_substitute.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-module Arel
-  module Visitors
-    class BindSubstitute
-      def initialize delegate
-        @delegate = delegate
-      end
-    end
-  end
-end

data/lib/arel/visitors/bind_visitor.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-module Arel
-  module Visitors
-    module BindVisitor
-      def initialize target
-        @block = nil
-        super
-      end
-
-      def accept node, collector, &block
-        @block = block if block_given?
-        super
-      end
-
-      private
-
-      def visit_Arel_Nodes_Assignment o, collector
-        if o.right.is_a? Arel::Nodes::BindParam
-          collector = visit o.left, collector
-          collector << " = "
-          visit o.right, collector
-        else
-          super
-        end
-      end
-
-      def visit_Arel_Nodes_BindParam o, collector
-        if @block
-          val = @block.call
-          if String === val
-            collector << val
-          end
-        else
-          super
-        end
-      end
-
-    end
-  end
-end