diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-02-05 09:50:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 09:50:29 -0800 |
| commit | b851763567463e8b03fe18632b641789dc14155b (patch) | |
| tree | 0d3114385617ee64d05d2cb516e41155fb896386 | |
| parent | 92c75c312f610c253692dd28d3f38381edbb318e (diff) | |
| parent | d9601fd622a08b8ef5346c10f00fb13328d34d76 (diff) | |
| download | rails-b851763567463e8b03fe18632b641789dc14155b.tar.gz rails-b851763567463e8b03fe18632b641789dc14155b.tar.bz2 rails-b851763567463e8b03fe18632b641789dc14155b.zip | |
Merge pull request #35169 from sponomarev/chore/specify-sqlite-in-gemfile
Set sqlite3 gem version explicitly in generated Gemfile
| -rw-r--r-- | railties/lib/rails/generators/database.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/database.rb b/railties/lib/rails/generators/database.rb index be3e61bde8..18fc7be3ff 100644 --- a/railties/lib/rails/generators/database.rb +++ b/railties/lib/rails/generators/database.rb @@ -15,6 +15,7 @@ module Rails case database when "mysql" then ["mysql2", [">= 0.4.4"]] when "postgresql" then ["pg", [">= 0.18", "< 2.0"]] + when "sqlite3" then ["sqlite3", ["~> 1.3", ">= 1.3.6"]] when "oracle" then ["activerecord-oracle_enhanced-adapter", nil] when "frontbase" then ["ruby-frontbase", nil] when "sqlserver" then ["activerecord-sqlserver-adapter", nil] diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 860e2bf63e..1ee9e43e89 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -526,7 +526,7 @@ class AppGeneratorTest < Rails::Generators::TestCase if defined?(JRUBY_VERSION) assert_gem "activerecord-jdbcsqlite3-adapter" else - assert_gem "sqlite3" + assert_gem "sqlite3", "'~> 1.3', '>= 1.3.6'" end end |