diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-02-04 13:31:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 13:31:44 -0800 |
| commit | 3cace9eac95fb4ec8d4b7045b60c5cc9b7b02d01 (patch) | |
| tree | b56ca1e655f534ca204e9af03e5889efd4726dd7 | |
| parent | 0fa0107d2d87f751c6768fa8a0991149134de2df (diff) | |
| parent | 2a29202288c2625a84993a8d0b94ea507988b557 (diff) | |
| download | rails-3cace9eac95fb4ec8d4b7045b60c5cc9b7b02d01.tar.gz rails-3cace9eac95fb4ec8d4b7045b60c5cc9b7b02d01.tar.bz2 rails-3cace9eac95fb4ec8d4b7045b60c5cc9b7b02d01.zip | |
Merge pull request #35154 from sponomarev/chore/sqlite1.4
Relax sqlite3 version dependency
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -118,7 +118,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do gem "racc", ">=1.4.6", require: false # Active Record. - gem "sqlite3", "~> 1.3.6" + gem "sqlite3", "~> 1.3", ">= 1.3.6" group :db do gem "pg", ">= 0.18.0" diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 14dbd20bcd..7b3630662b 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -9,7 +9,7 @@ require "active_record/connection_adapters/sqlite3/schema_definitions" require "active_record/connection_adapters/sqlite3/schema_dumper" require "active_record/connection_adapters/sqlite3/schema_statements" -gem "sqlite3", "~> 1.3.6" +gem "sqlite3", "~> 1.3", ">= 1.3.6" require "sqlite3" module ActiveRecord |