Merge pull request #7 from instacart/laith/rails-6

Rails 6 support
instacart · Jan 21, 2022 · dd95d76 · dd95d76
2 parents 85ecea7 + 60ecb47
commit dd95d76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/odbc_adapter/adapters/null_odbc_adapter.rb b/lib/odbc_adapter/adapters/null_odbc_adapter.rb
@@ -4,9 +4,7 @@ module Adapters
     # registry. This allows for minimal support for DBMSs for which we don't
     # have an explicit adapter.
     class NullODBCAdapter < ActiveRecord::ConnectionAdapters::ODBCAdapter
-      class BindSubstitution < Arel::Visitors::ToSql
-        # BindVisitor was removed in Arel 9, or Rails 5.2
-        include Arel::Visitors::BindVisitor if Arel::VERSION.to_i < 9
+      class BindSubstitution < Arel::Visitors::ToSql  
       end
 
       # Using a BindVisitor so that the SQL string gets substituted before it is

diff --git a/odbc_adapter.gemspec b/odbc_adapter.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '~> 5.0'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7'
   spec.add_dependency 'ruby-odbc', '~> 0.9'
 
   spec.add_development_dependency 'bundler',   '>= 1.14'