firebird_adapter 1.0.9 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82fb9831dd85c7ba0a06ec4a0a1504f14ad1042bf51cf88a388f4a63569791d8
-  data.tar.gz: 439f24fcafffd31cc82c3c66f00487772112a0678c144d505404e79c77c18153
+  metadata.gz: b883397149a00311a5ec04e597e2ae4305564be4163a1474cd657b97138f5fb1
+  data.tar.gz: bb47ae1a74848ffac5c1d496a19bd2bc58c957b2aec6d95852136efb0a419365
 SHA512:
-  metadata.gz: 261bb49a997025cd1728e79c576d969575a6b4e859839a0201face10fe6f0b36a634afbd6e8a38f419fafe9bc2bdeff87b53d0b24743ebfb6d729d0ee0c40410
-  data.tar.gz: 24456483ecdd0b0f30c9f480e2faaabdb40223a5474d57e854bdbc2c56d1fad86a6bb30e8176d02c8ec8467bb9f81dd41d69ef29e0ab1a63becca03a40f59e3a
+  metadata.gz: bbcc9993628a18def8bd607746d0dba75ec04ff43a4e741a31772d063b7032813724ef4bb4d0e306d576e377e17d24f75e4cfc8847daf63ded2d669eebbca95a
+  data.tar.gz: b86601ebd799a76f3506b9455ca1c4ac75c8db220504ae37dbf6967f00ee64a8d253aeaa5afaad3f597b8b1b56000c5232087634c8da073d7ff059ad403beb24

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/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.9
+  version: 1.0.14
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Firebird Adapter for Rails 5.