firebird_adapter 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64b50500e572ad4579292238a39d89d643f7bb64b1c7fe3bc9577483641d9db
-  data.tar.gz: f5c329f45aea5a63a413740a40f29251db3bb60d90e65aa3fe5af4b63c03678c
+  metadata.gz: cb66958157a431cd148c0aa2cd2ba65777b9f06a5633b3c1f5563d0e84781a7a
+  data.tar.gz: 1b3c4516575e3a92f99f408716601679c858fd5171bb7d74adf690bb42411623
 SHA512:
-  metadata.gz: d83b97ae2293a1c9c54a2fc69222f62b9f8e5e128a742bb00a2d2d98cb1ff823f237961013f7839b0d3dcb25e76c17c1e23c997d3ee98de765d6cf1456c06fe0
-  data.tar.gz: 7c7fca6aacd8151bfe52c6ebbfc76fc085465b39a9f84d57ac81e600f2bbf8dfdca949d37c9e690dfb64246adb6ccd4cde906ca36944c46096649ee4cecf674b
+  metadata.gz: 584dcb307fca59eb5ec70335722cc68ebd3de81cdec1c8a69046ea52617b37705f846c409964ca13bbcd1e9708950d7393b0772710a30f6bb525f85ca21b3693
+  data.tar.gz: 51876a3878f23b94d786b361751aaebc2369ed5b48a3db314fe1d83add41f114cfc2aa2e9b6cdfba58f8809bc81535bbef8418a676615c2d9e87e6ea6bb88ca7

data/lib/arel/visitors/firebird.rb

@@ -1,71 +1,88 @@
-class Arel::Visitors::Firebird < Arel::Visitors::ToSql
+module Arel
+  class SelectManager
+    attr_reader :parentheses_ignored
 
-  private
+    def ignore_parentheses
+      @parentheses_ignored = true
+      self
+    end
+  end
 
-  def visit_Arel_Nodes_SelectCore(o, collector, select_statement)
-    collector << 'SELECT'
+  class Visitors::Firebird < Arel::Visitors::ToSql
+    private
 
-    visit_Arel_Nodes_SelectOptions(select_statement, collector)
+    def visit_Arel_Nodes_SelectCore(o, collector, select_statement)
+      collector << 'SELECT'
 
-    collector = maybe_visit o.top, collector
+      visit_Arel_Nodes_SelectOptions(select_statement, collector)
 
-    collector = maybe_visit o.set_quantifier, collector
+      collector = maybe_visit o.top, collector
 
-    collect_nodes_for o.projections, collector, SPACE
+      collector = maybe_visit o.set_quantifier, collector
 
-    if o.source && !o.source.empty?
-      collector << ' FROM '
-      collector = visit o.source, collector
-    end
+      collect_nodes_for o.projections, collector, SPACE
 
-    collect_nodes_for o.wheres, collector, WHERE, AND
-    collect_nodes_for o.groups, collector, GROUP_BY
-    unless o.havings.empty?
-      collector << ' HAVING '
-      inject_join o.havings, collector, AND
-    end
-    collect_nodes_for o.windows, collector, WINDOW
+      if o.source && !o.source.empty?
+        collector << ' FROM '
+        collector = visit o.source, collector
+      end
 
-    collector
-  end
+      collect_nodes_for o.wheres, collector, WHERE, AND
+      collect_nodes_for o.groups, collector, GROUP_BY
+      unless o.havings.empty?
+        collector << ' HAVING '
+        inject_join o.havings, collector, AND
+      end
+      collect_nodes_for o.windows, collector, WINDOW
 
-  def visit_Arel_Nodes_SelectStatement o, collector
-    if o.with
-      collector = visit o.with, collector
-      collector << SPACE
+      collector
     end
 
-    collector = o.cores.inject(collector) { |c,x|
-      visit_Arel_Nodes_SelectCore(x, c, o)
-    }
+    def visit_Arel_Nodes_SelectStatement o, collector
+      if o.with
+        collector = visit o.with, collector
+        collector << SPACE
+      end
 
-    unless o.orders.empty?
-      collector << ORDER_BY
-      len = o.orders.length - 1
-      o.orders.each_with_index { |x, i|
-        collector = visit(x, collector)
-        collector << COMMA unless len == i
+      collector = o.cores.inject(collector) { |c,x|
+        visit_Arel_Nodes_SelectCore(x, c, o)
       }
+
+      unless o.orders.empty?
+        collector << ORDER_BY
+        len = o.orders.length - 1
+        o.orders.each_with_index { |x, i|
+          collector = visit(x, collector)
+          collector << COMMA unless len == i
+        }
+      end
+
+      collector
     end
 
-    collector
-  end
+    def visit_Arel_Nodes_Limit(o, collector)
+      collector << 'FIRST '
+      visit o.expr, collector
+    end
 
-  def visit_Arel_Nodes_Limit(o, collector)
-    collector << 'FIRST '
-    visit o.expr, collector
-  end
+    def visit_Arel_Nodes_Offset(o, collector)
+      collector << 'SKIP '
+      visit o.expr, collector
+    end
 
-  def visit_Arel_Nodes_Offset(o, collector)
-    collector << 'SKIP '
-    visit o.expr, collector
-  end
+    def visit_Arel_SelectManager o, collector
+      return visit(o.ast, collector) if o.parentheses_ignored
 
-  def visit_Arel_Nodes_Union o, collector
-    infix_value(o, collector, ' UNION ')
-  end
+      collector << '('
+      visit(o.ast, collector) << ')'
+    end
+
+    def visit_Arel_Nodes_Union o, collector
+      infix_value(o, collector, ' UNION ')
+    end
 
-  def visit_Arel_Nodes_UnionAll o, collector
-    infix_value(o, collector, ' UNION ALL ')
+    def visit_Arel_Nodes_UnionAll o, collector
+      infix_value(o, collector, ' UNION ALL ')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Firebird Adapter for Rails 5.