firebird_adapter 1.0.10 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d7f3227fb4a26812cbe00d9c47d44bea19d2caa03daf642dc60e67c7631ae0d
-  data.tar.gz: 2777822ce8942a4d97b571b91d67634c5d6bc08f75a5897b0566023077eef62a
+  metadata.gz: 95410fc2940735fd9605ce6a8c04acc5df874f65b0df2c8cf016c37752a82b34
+  data.tar.gz: c397930b77355619f7cced7b00385cae894f8e47177c5f5adaa9bc704fb8cea7
 SHA512:
-  metadata.gz: 9848ed2b8a1f1f63de8cc207f84eb63b4692b40c50be05ead992744c74934a24c3f7bcbf75e0501c237e1102038aec32f744caa15e934cbe7db51c29d37ed763
-  data.tar.gz: c499122c6ef4f803fc4cd43777cd11d130533fc4e44c94db472ffe215e8dc696e065e4e31df11771f426da3c146af5e162db2babd950579ad617e836286a1ff5
+  metadata.gz: dc30e4ccf3636681be4eb0d1f3b17095f832ae324eab53ea077f4ed4c278bf7278534ceb6e53cffdcf76be7702bf3d5f78c145a64c078f6b221e9d98457cef4d
+  data.tar.gz: 981a5d13280242cc2a7c8b21aa1ce46e2af6291d9874745179079930c82a9989488d12eddde27f6fad7797a9a9718bf62594a1dc36c6b7d75d4bd76a8b2bd723

data/lib/active_record/connection_adapters/firebird/database_statements.rb

@@ -52,9 +52,11 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
           else
             ActiveRecord::Result.new([], [])
           end
-        rescue RangeError
-          ActiveRecord::Result.new([], [])
+        rescue RangeError => e
+          return ActiveRecord::Result.new([], []) if sql.downcase.start_with? 'select'
+          raise e
         rescue Exception => e
+          result.close if result.is_a?(Fb::Cursor)
           raise e.message.encode('UTF-8', @connection.encoding)
         end
       end

data/lib/arel/visitors/firebird.rb

@@ -1,63 +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_SelectManager o, collector
+      return visit(o.ast, collector) if o.parentheses_ignored
+
+      collector << '('
+      visit(o.ast, collector) << ')'
+    end
+
+    def visit_Arel_Nodes_Union o, collector
+      infix_value(o, collector, ' UNION ')
+    end
 
-  def visit_Arel_Nodes_Offset(o, collector)
-    collector << 'SKIP '
-    visit o.expr, collector
+    def visit_Arel_Nodes_UnionAll o, collector
+      infix_value(o, collector, ' UNION ALL ')
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebird_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 5.0.0
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails