diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-12 23:21:07 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 23:21:07 +0930 |
| commit | 58f10a31b37e9bb6e975a71aa63744f318ee043d (patch) | |
| tree | 0c1fae69495ddfc24e4ad8fede784b4b5f4947fb /railties/lib/rails | |
| parent | 21344061dc17151fe749b9dc76a127d597ec43ef (diff) | |
| parent | 52e050ed00b023968fecda82f19a858876a7c435 (diff) | |
| download | rails-58f10a31b37e9bb6e975a71aa63744f318ee043d.tar.gz rails-58f10a31b37e9bb6e975a71aa63744f318ee043d.tar.bz2 rails-58f10a31b37e9bb6e975a71aa63744f318ee043d.zip | |
Merge pull request #29699 from lugray/represent_boolean_as_integer
Change sqlite3 boolean serialization to use 1 and 0
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index d403c4fa7c..4797223380 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -86,6 +86,10 @@ module Rails if respond_to?(:active_record) active_record.cache_versioning = true + # Remove the temporary load hook from SQLite3Adapter when this is removed + ActiveSupport.on_load(:active_record_sqlite3adapter) do + ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer = true + end end if respond_to?(:action_dispatch) diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt index 900e18251c..f2df0d1e9f 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt @@ -21,3 +21,7 @@ # Add default protection from forgery to ActionController::Base instead of in # ApplicationController. # Rails.application.config.action_controller.default_protect_from_forgery = true + +# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and +# 'f' after migrating old data. +# ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer = true |