firebird_adapter 1.0.8 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e152eafb3ac4ec3815a9db822e0af3f78ef8b2bebc6a9ab146c0d8d6f2db2a
-  data.tar.gz: 7be80a59b8b9783d5406f6c020fdcb6456d5d33bf60d3836bb92587d07baaf52
+  metadata.gz: cb66958157a431cd148c0aa2cd2ba65777b9f06a5633b3c1f5563d0e84781a7a
+  data.tar.gz: 1b3c4516575e3a92f99f408716601679c858fd5171bb7d74adf690bb42411623
 SHA512:
-  metadata.gz: bdb14f1266f7de57c93afe4e7efcbd37d4e2b0e46421e97061cdeaf8858fee054b2c0dc58ed03176c4374bddb06cf7d25b1bee04efe77d1fc37fef321c1f2839
-  data.tar.gz: 77f23df54f7a892117b9fe5976c95857db49dd3471c52a62bc9904aaf24bfc61c1e5ecb726c3b093a066a1b73d63875aa42f787676d7073e36f3b78b523c9bf7
+  metadata.gz: 584dcb307fca59eb5ec70335722cc68ebd3de81cdec1c8a69046ea52617b37705f846c409964ca13bbcd1e9708950d7393b0772710a30f6bb525f85ca21b3693
+  data.tar.gz: 51876a3878f23b94d786b361751aaebc2369ed5b48a3db314fe1d83add41f114cfc2aa2e9b6cdfba58f8809bc81535bbef8418a676615c2d9e87e6ea6bb88ca7

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

@@ -47,10 +47,15 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
 
             result.close
             ActiveRecord::Result.new(fields, rows)
-          else
+          elsif name.ends_with?(' Destroy')
             result
+          else
+            ActiveRecord::Result.new([], [])
           end
+        rescue RangeError
+          ActiveRecord::Result.new([], [])
         rescue Exception => e
+          result.close if result.is_a?(Fb::Cursor)
           raise e.message.encode('UTF-8', @connection.encoding)
         end
       end

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

@@ -109,6 +109,10 @@ module ActiveRecord::ConnectionAdapters::Firebird::SchemaStatements
 
 private
 
+  def remove_column_for_alter(table_name, column_name, type = nil, options = {})
+    "DROP #{quote_column_name(column_name)}"
+  end
+
   def column_definitions(table_name)
     @connection.columns(table_name)
   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.8
+  version: 1.0.13
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails