aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Ponomarev <me@sergey-ponomarev.ru>2019-02-05 11:56:32 -0500
committerSergey Ponomarev <me@sergey-ponomarev.ru>2019-02-05 11:56:32 -0500
commitd9601fd622a08b8ef5346c10f00fb13328d34d76 (patch)
treebeb8e8f5016df8cc04e6523eac803156205a4f1a
parent287920ca7d06c8f51198ec750d65ba703835b257 (diff)
downloadrails-d9601fd622a08b8ef5346c10f00fb13328d34d76.tar.gz
rails-d9601fd622a08b8ef5346c10f00fb13328d34d76.tar.bz2
rails-d9601fd622a08b8ef5346c10f00fb13328d34d76.zip
Set sqlite3 gem version explicitly in generated Gemfile
-rw-r--r--railties/lib/rails/generators/database.rb1
-rw-r--r--railties/test/generators/app_generator_test.rb2
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