-
-
Save dsatoh/086bb43267606a5be875e65488629053 to your computer and use it in GitHub Desktop.
Differences between default rails template(rails_app_1/sample_app) and template generated with `--skip-active-record` option(rails_app_2/sample_app).
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -uprN rails_app_1/sample_app/.gitignore rails_app_2/sample_app/.gitignore | |
--- rails_app_1/sample_app/.gitignore 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/.gitignore 2018-02-03 20:16:18.000000000 +0900 | |
@@ -7,10 +7,6 @@ | |
# Ignore bundler config. | |
/.bundle | |
-# Ignore the default SQLite database. | |
-/db/*.sqlite3 | |
-/db/*.sqlite3-journal | |
- | |
# Ignore all logfiles and tempfiles. | |
/log/* | |
/tmp/* | |
diff -uprN rails_app_1/sample_app/Gemfile rails_app_2/sample_app/Gemfile | |
--- rails_app_1/sample_app/Gemfile 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/Gemfile 2018-02-03 20:16:18.000000000 +0900 | |
@@ -8,8 +8,6 @@ end | |
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | |
gem 'rails', '~> 5.1.4' | |
-# Use sqlite3 as the database for Active Record | |
-gem 'sqlite3' | |
# Use Puma as the app server | |
gem 'puma', '~> 3.7' | |
# Use SCSS for stylesheets | |
diff -uprN rails_app_1/sample_app/app/models/application_record.rb rails_app_2/sample_app/app/models/application_record.rb | |
--- rails_app_1/sample_app/app/models/application_record.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/app/models/application_record.rb 1970-01-01 09:00:00.000000000 +0900 | |
@@ -1,3 +0,0 @@ | |
-class ApplicationRecord < ActiveRecord::Base | |
- self.abstract_class = true | |
-end | |
diff -uprN rails_app_1/sample_app/bin/setup rails_app_2/sample_app/bin/setup | |
--- rails_app_1/sample_app/bin/setup 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/bin/setup 2018-02-03 20:16:18.000000000 +0900 | |
@@ -22,14 +22,6 @@ chdir APP_ROOT do | |
# system('bin/yarn') | |
- # puts "\n== Copying sample files ==" | |
- # unless File.exist?('config/database.yml') | |
- # cp 'config/database.yml.sample', 'config/database.yml' | |
- # end | |
- | |
- puts "\n== Preparing database ==" | |
- system! 'bin/rails db:setup' | |
- | |
puts "\n== Removing old logs and tempfiles ==" | |
system! 'bin/rails log:clear tmp:clear' | |
diff -uprN rails_app_1/sample_app/bin/update rails_app_2/sample_app/bin/update | |
--- rails_app_1/sample_app/bin/update 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/bin/update 2018-02-03 20:16:18.000000000 +0900 | |
@@ -18,9 +18,6 @@ chdir APP_ROOT do | |
system! 'gem install bundler --conservative' | |
system('bundle check') || system!('bundle install') | |
- puts "\n== Updating database ==" | |
- system! 'bin/rails db:migrate' | |
- | |
puts "\n== Removing old logs and tempfiles ==" | |
system! 'bin/rails log:clear tmp:clear' | |
diff -uprN rails_app_1/sample_app/config/application.rb rails_app_2/sample_app/config/application.rb | |
--- rails_app_1/sample_app/config/application.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/application.rb 2018-02-03 20:16:18.000000000 +0900 | |
@@ -1,6 +1,16 @@ | |
require_relative 'boot' | |
-require 'rails/all' | |
+require "rails" | |
+# Pick the frameworks you want: | |
+require "active_model/railtie" | |
+require "active_job/railtie" | |
+# require "active_record/railtie" | |
+require "action_controller/railtie" | |
+require "action_mailer/railtie" | |
+require "action_view/railtie" | |
+require "action_cable/engine" | |
+require "sprockets/railtie" | |
+require "rails/test_unit/railtie" | |
# Require the gems listed in Gemfile, including any gems | |
# you've limited to :test, :development, or :production. | |
diff -uprN rails_app_1/sample_app/config/database.yml rails_app_2/sample_app/config/database.yml | |
--- rails_app_1/sample_app/config/database.yml 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/database.yml 1970-01-01 09:00:00.000000000 +0900 | |
@@ -1,25 +0,0 @@ | |
-# SQLite version 3.x | |
-# gem install sqlite3 | |
-# | |
-# Ensure the SQLite 3 gem is defined in your Gemfile | |
-# gem 'sqlite3' | |
-# | |
-default: &default | |
- adapter: sqlite3 | |
- pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> | |
- timeout: 5000 | |
- | |
-development: | |
- <<: *default | |
- database: db/development.sqlite3 | |
- | |
-# Warning: The database defined as "test" will be erased and | |
-# re-generated from your development database when you run "rake". | |
-# Do not set this db to the same as development or production. | |
-test: | |
- <<: *default | |
- database: db/test.sqlite3 | |
- | |
-production: | |
- <<: *default | |
- database: db/production.sqlite3 | |
diff -uprN rails_app_1/sample_app/config/environments/development.rb rails_app_2/sample_app/config/environments/development.rb | |
--- rails_app_1/sample_app/config/environments/development.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/environments/development.rb 2018-02-03 20:16:19.000000000 +0900 | |
@@ -34,9 +34,6 @@ Rails.application.configure do | |
# Print deprecation notices to the Rails logger. | |
config.active_support.deprecation = :log | |
- # Raise an error on page load if there are pending migrations. | |
- config.active_record.migration_error = :page_load | |
- | |
# Debug mode disables concatenation and preprocessing of assets. | |
# This option may cause significant delays in view rendering with a large | |
# number of complex assets. | |
diff -uprN rails_app_1/sample_app/config/environments/production.rb rails_app_2/sample_app/config/environments/production.rb | |
--- rails_app_1/sample_app/config/environments/production.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/environments/production.rb 2018-02-03 20:16:19.000000000 +0900 | |
@@ -85,7 +85,4 @@ Rails.application.configure do | |
logger.formatter = config.log_formatter | |
config.logger = ActiveSupport::TaggedLogging.new(logger) | |
end | |
- | |
- # Do not dump schema after migrations. | |
- config.active_record.dump_schema_after_migration = false | |
end | |
diff -uprN rails_app_1/sample_app/config/initializers/wrap_parameters.rb rails_app_2/sample_app/config/initializers/wrap_parameters.rb | |
--- rails_app_1/sample_app/config/initializers/wrap_parameters.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/initializers/wrap_parameters.rb 2018-02-03 20:16:19.000000000 +0900 | |
@@ -7,8 +7,3 @@ | |
ActiveSupport.on_load(:action_controller) do | |
wrap_parameters format: [:json] | |
end | |
- | |
-# To enable root element in JSON for ActiveRecord objects. | |
-# ActiveSupport.on_load(:active_record) do | |
-# self.include_root_in_json = true | |
-# end | |
diff -uprN rails_app_1/sample_app/config/secrets.yml rails_app_2/sample_app/config/secrets.yml | |
--- rails_app_1/sample_app/config/secrets.yml 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/config/secrets.yml 2018-02-03 20:16:18.000000000 +0900 | |
@@ -18,10 +18,10 @@ | |
# Environmental secrets are only available for that specific environment. | |
development: | |
- secret_key_base: ea748aaf03cb9782ddbc62fceefaa3918d464416e8395a66668de51118b29067b2b5669fdb8194c0cf0b57101b82f1c2c52c99304ddc9f866fc4de5f70876879 | |
+ secret_key_base: e544da53eec2b50cbdc52d2a45bb793ef5fd26fd2c5b429cd69d9d4af01d77d70a9a909b3efe389acbac6d76dc14795fa6e9b48ee13a8ad33e912c2326442fce | |
test: | |
- secret_key_base: 4097f1a796b9dcb221df56f9859e9b222fa4c7fa2cc917263ae3121911fcf702dd92f4d4857f7ca71dfc14d5e5edd783f96b754189bafc010b71babafdb1a7f1 | |
+ secret_key_base: d991179d2e6885f38d9df3609c060a0caae1a4fa5d33b0b4dfd733e53d902b0684c852d93ddc19aadc08bfd9d31fa8b63a62cf81c91528178e260e87eb4062e3 | |
# Do not keep production secrets in the unencrypted secrets file. | |
# Instead, either read values from the environment. | |
diff -uprN rails_app_1/sample_app/db/seeds.rb rails_app_2/sample_app/db/seeds.rb | |
--- rails_app_1/sample_app/db/seeds.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/db/seeds.rb 1970-01-01 09:00:00.000000000 +0900 | |
@@ -1,7 +0,0 @@ | |
-# This file should contain all the record creation needed to seed the database with its default values. | |
-# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). | |
-# | |
-# Examples: | |
-# | |
-# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) | |
-# Character.create(name: 'Luke', movie: movies.first) | |
diff -uprN rails_app_1/sample_app/test/test_helper.rb rails_app_2/sample_app/test/test_helper.rb | |
--- rails_app_1/sample_app/test/test_helper.rb 2018-02-03 20:14:53.000000000 +0900 | |
+++ rails_app_2/sample_app/test/test_helper.rb 2018-02-03 20:16:19.000000000 +0900 | |
@@ -2,8 +2,5 @@ require File.expand_path('../../config/e | |
require 'rails/test_help' | |
class ActiveSupport::TestCase | |
- # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. | |
- fixtures :all | |
- | |
# Add more helper methods to be used by all tests here... | |
end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment