firebird_adapter 1.0.11 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9ed25619cd3c099b40ffd5f26e0dd04a65d04371b0d2f2e150140fb2818e97
-  data.tar.gz: 41f5d2662dfbcbb34ca5d460ad915085529b13c243aa7c19aa16c4a6b31a4155
+  metadata.gz: d16fdcec64294ee89e80963f70014774ca1e4ebe1689c567fd8797e2aed941e4
+  data.tar.gz: fd636ff0a5c785e5f72cfc7feb03b84204c8528b1b87cc63b7bdff6f6fb5c140
 SHA512:
-  metadata.gz: 1ca09c67c4b0f0f4a4db1a2b66095effed0ddf8543cee472deebfc34e036c3c26ff2d351702edb145045d4754b54489f17eaa9f116d433f4883b9db943802355
-  data.tar.gz: 783a146494f9f2bba1d4d7fa0d027443ce1a4e53636a21e5c3c4245f351e64ffc7e3c3012360172c9eac2173ef70fd53364c122b618aa5d093c8fb12154ec3e5
+  metadata.gz: 513b0ecade7b01947daca7d843abbcdda4a69adc636dae2666b3a17755df083a578500e502949f94d9acfa4c04b3e7a312dea28c65f18e96c0db0f15cf7d1625
+  data.tar.gz: 93c436220c68e31ef6b06c11132fa1bfb7975fe3f5d34aa95aa6ba0e1970f535e3a8129d2c4acd22c49589e332daa145765b322f9bda7c94a5ff1071d6886f8c

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

@@ -47,13 +47,14 @@ module ActiveRecord::ConnectionAdapters::Firebird::DatabaseStatements
 
             result.close
             ActiveRecord::Result.new(fields, rows)
-          elsif name.ends_with?(' Destroy')
+          elsif name.end_with?(' Destroy')
             result
           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)

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/strip'
+
 module ActiveRecord::ConnectionAdapters::Firebird::SchemaStatements
 
   def tables(_name = nil)
@@ -42,8 +44,8 @@ module ActiveRecord::ConnectionAdapters::Firebird::SchemaStatements
     end
   end
 
-  def remove_index(table_name, options = {})
-    index_name = index_name_for_remove(table_name, options)
+  def remove_index(table_name, column, options = {})
+    index_name = index_name_for_remove(table_name, column, options)
     execute "DROP INDEX #{quote_column_name(index_name)}"
   end
 

data/lib/arel/visitors/firebird.rb

@@ -1,63 +1,87 @@
-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 = collect_optimizer_hints(o, collector)
+      collector = maybe_visit o.set_quantifier, collector
 
-    collect_nodes_for o.projections, collector, SPACE
+      collect_nodes_for o.projections, collector, ' '
 
-    if o.source && !o.source.empty?
-      collector << ' FROM '
-      collector = visit o.source, collector
-    end
+      if o.source && !o.source.empty?
+        collector << ' FROM '
+        collector = visit o.source, 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 '
 
-    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
+      collector
     end
-    collect_nodes_for o.windows, collector, WINDOW
 
-    collector
-  end
+    def visit_Arel_Nodes_SelectStatement o, collector
+      if o.with
+        collector = visit o.with, collector
+        collector << ' '
+      end
+
+      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 << ', ' unless len == i
+        }
+      end
 
-  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_Limit(o, collector)
+      collector << 'FIRST '
+      visit o.expr, collector
+    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
-      }
+    def visit_Arel_Nodes_Offset(o, collector)
+      collector << 'SKIP '
+      visit o.expr, collector
     end
 
-    collector
-  end
+    def visit_Arel_SelectManager o, collector
+      return visit(o.ast, collector) if o.parentheses_ignored
 
-  def visit_Arel_Nodes_Limit(o, collector)
-    collector << 'FIRST '
-    visit o.expr, collector
-  end
+      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.11
+  version: 6.0.0
 platform: ruby
 authors:
 - Fábio Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: fb
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -146,5 +146,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: ActiveRecord Firebird Adapter for Rails 5.
+summary: ActiveRecord Firebird Adapter for Rails 6.
 test_files: []