fix-db-schema-conflicts 1.2.0 → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (76) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec +2 -0
  3. data/.rubocop_schema.yml +6 -0
  4. data/README.md +7 -0
  5. data/fix-db-schema-conflicts.gemspec +4 -1
  6. data/lib/fix_db_schema_conflicts/schema_dumper.rb +22 -7
  7. data/lib/fix_db_schema_conflicts/version.rb +1 -1
  8. data/spec/integration/integration_spec.rb +62 -0
  9. data/spec/spec_helper.rb +96 -0
  10. data/spec/test-app/.gitignore +17 -0
  11. data/spec/test-app/Gemfile +8 -0
  12. data/spec/test-app/Gemfile.lock +125 -0
  13. data/spec/test-app/README.rdoc +28 -0
  14. data/spec/test-app/Rakefile +6 -0
  15. data/spec/test-app/app/assets/images/.keep +0 -0
  16. data/spec/test-app/app/assets/javascripts/application.js +16 -0
  17. data/spec/test-app/app/assets/stylesheets/application.css +15 -0
  18. data/spec/test-app/app/controllers/application_controller.rb +5 -0
  19. data/spec/test-app/app/controllers/concerns/.keep +0 -0
  20. data/spec/test-app/app/helpers/application_helper.rb +2 -0
  21. data/spec/test-app/app/mailers/.keep +0 -0
  22. data/spec/test-app/app/models/.keep +0 -0
  23. data/spec/test-app/app/models/company.rb +2 -0
  24. data/spec/test-app/app/models/concerns/.keep +0 -0
  25. data/spec/test-app/app/models/person.rb +2 -0
  26. data/spec/test-app/app/views/layouts/application.html.erb +14 -0
  27. data/spec/test-app/bin/bundle +3 -0
  28. data/spec/test-app/bin/rails +9 -0
  29. data/spec/test-app/bin/rake +9 -0
  30. data/spec/test-app/bin/setup +29 -0
  31. data/spec/test-app/bin/spring +15 -0
  32. data/spec/test-app/config.ru +4 -0
  33. data/spec/test-app/config/application.rb +26 -0
  34. data/spec/test-app/config/boot.rb +3 -0
  35. data/spec/test-app/config/database.yml +25 -0
  36. data/spec/test-app/config/environment.rb +5 -0
  37. data/spec/test-app/config/environments/development.rb +41 -0
  38. data/spec/test-app/config/environments/production.rb +79 -0
  39. data/spec/test-app/config/environments/test.rb +42 -0
  40. data/spec/test-app/config/initializers/assets.rb +11 -0
  41. data/spec/test-app/config/initializers/backtrace_silencers.rb +7 -0
  42. data/spec/test-app/config/initializers/cookies_serializer.rb +3 -0
  43. data/spec/test-app/config/initializers/filter_parameter_logging.rb +4 -0
  44. data/spec/test-app/config/initializers/inflections.rb +16 -0
  45. data/spec/test-app/config/initializers/mime_types.rb +4 -0
  46. data/spec/test-app/config/initializers/session_store.rb +3 -0
  47. data/spec/test-app/config/initializers/wrap_parameters.rb +14 -0
  48. data/spec/test-app/config/locales/en.yml +23 -0
  49. data/spec/test-app/config/routes.rb +56 -0
  50. data/spec/test-app/config/secrets.yml +22 -0
  51. data/spec/test-app/db/migrate/20160322223225_create_people.rb +12 -0
  52. data/spec/test-app/db/migrate/20160322223258_create_companies.rb +19 -0
  53. data/spec/test-app/db/schema.rb +39 -0
  54. data/spec/test-app/db/seeds.rb +7 -0
  55. data/spec/test-app/lib/assets/.keep +0 -0
  56. data/spec/test-app/lib/tasks/.keep +0 -0
  57. data/spec/test-app/log/.keep +0 -0
  58. data/spec/test-app/public/404.html +67 -0
  59. data/spec/test-app/public/422.html +67 -0
  60. data/spec/test-app/public/500.html +66 -0
  61. data/spec/test-app/public/favicon.ico +0 -0
  62. data/spec/test-app/public/robots.txt +5 -0
  63. data/spec/test-app/test/controllers/.keep +0 -0
  64. data/spec/test-app/test/fixtures/.keep +0 -0
  65. data/spec/test-app/test/fixtures/companies.yml +19 -0
  66. data/spec/test-app/test/fixtures/people.yml +13 -0
  67. data/spec/test-app/test/helpers/.keep +0 -0
  68. data/spec/test-app/test/integration/.keep +0 -0
  69. data/spec/test-app/test/mailers/.keep +0 -0
  70. data/spec/test-app/test/models/.keep +0 -0
  71. data/spec/test-app/test/models/company_test.rb +7 -0
  72. data/spec/test-app/test/models/person_test.rb +7 -0
  73. data/spec/test-app/test/test_helper.rb +10 -0
  74. data/spec/test-app/vendor/assets/javascripts/.keep +0 -0
  75. data/spec/test-app/vendor/assets/stylesheets/.keep +0 -0
  76. metadata +184 -5
@@ -0,0 +1,3 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ Rails.application.config.session_store :cookie_store, key: '_test-app_session'
@@ -0,0 +1,14 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # This file contains settings for ActionController::ParamsWrapper which
4
+ # is enabled by default.
5
+
6
+ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
+ ActiveSupport.on_load(:action_controller) do
8
+ wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
9
+ end
10
+
11
+ # To enable root element in JSON for ActiveRecord objects.
12
+ # ActiveSupport.on_load(:active_record) do
13
+ # self.include_root_in_json = true
14
+ # end
@@ -0,0 +1,23 @@
1
+ # Files in the config/locales directory are used for internationalization
2
+ # and are automatically loaded by Rails. If you want to use locales other
3
+ # than English, add the necessary files in this directory.
4
+ #
5
+ # To use the locales, use `I18n.t`:
6
+ #
7
+ # I18n.t 'hello'
8
+ #
9
+ # In views, this is aliased to just `t`:
10
+ #
11
+ # <%= t('hello') %>
12
+ #
13
+ # To use a different locale, set it with `I18n.locale`:
14
+ #
15
+ # I18n.locale = :es
16
+ #
17
+ # This would use the information in config/locales/es.yml.
18
+ #
19
+ # To learn more, please read the Rails Internationalization guide
20
+ # available at http://guides.rubyonrails.org/i18n.html.
21
+
22
+ en:
23
+ hello: "Hello world"
@@ -0,0 +1,56 @@
1
+ Rails.application.routes.draw do
2
+ # The priority is based upon order of creation: first created -> highest priority.
3
+ # See how all your routes lay out with "rake routes".
4
+
5
+ # You can have the root of your site routed with "root"
6
+ # root 'welcome#index'
7
+
8
+ # Example of regular route:
9
+ # get 'products/:id' => 'catalog#view'
10
+
11
+ # Example of named route that can be invoked with purchase_url(id: product.id)
12
+ # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
13
+
14
+ # Example resource route (maps HTTP verbs to controller actions automatically):
15
+ # resources :products
16
+
17
+ # Example resource route with options:
18
+ # resources :products do
19
+ # member do
20
+ # get 'short'
21
+ # post 'toggle'
22
+ # end
23
+ #
24
+ # collection do
25
+ # get 'sold'
26
+ # end
27
+ # end
28
+
29
+ # Example resource route with sub-resources:
30
+ # resources :products do
31
+ # resources :comments, :sales
32
+ # resource :seller
33
+ # end
34
+
35
+ # Example resource route with more complex sub-resources:
36
+ # resources :products do
37
+ # resources :comments
38
+ # resources :sales do
39
+ # get 'recent', on: :collection
40
+ # end
41
+ # end
42
+
43
+ # Example resource route with concerns:
44
+ # concern :toggleable do
45
+ # post 'toggle'
46
+ # end
47
+ # resources :posts, concerns: :toggleable
48
+ # resources :photos, concerns: :toggleable
49
+
50
+ # Example resource route within a namespace:
51
+ # namespace :admin do
52
+ # # Directs /admin/products/* to Admin::ProductsController
53
+ # # (app/controllers/admin/products_controller.rb)
54
+ # resources :products
55
+ # end
56
+ end
@@ -0,0 +1,22 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Your secret key is used for verifying the integrity of signed cookies.
4
+ # If you change this key, all old signed cookies will become invalid!
5
+
6
+ # Make sure the secret is at least 30 characters and all random,
7
+ # no regular words or you'll be exposed to dictionary attacks.
8
+ # You can use `rake secret` to generate a secure secret key.
9
+
10
+ # Make sure the secrets in this file are kept private
11
+ # if you're sharing your code publicly.
12
+
13
+ development:
14
+ secret_key_base: 42f1f3aadb7149074086ad031755d0cec758b41cf5cb06ea0494ff3be4c308769bfccf9a31bbdd27641630c10a48e4bb4cfffd8aacaf66dd7db0d8336f909721
15
+
16
+ test:
17
+ secret_key_base: b090287580ff0ffd7955f76626eea0a64a9e0d3a02352abfadf99e4fcfca5097fe3c7d28426bcf50bf73621ac24eec0bfc8268d61e0d6c3ff51f7ea19bd1f23b
18
+
19
+ # Do not keep production secrets in the repository,
20
+ # instead read values from the environment.
21
+ production:
22
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
@@ -0,0 +1,12 @@
1
+ class CreatePeople < ActiveRecord::Migration
2
+ def change
3
+ create_table :people do |t|
4
+ t.string :first_name
5
+ t.string :last_name
6
+ t.integer :age
7
+ t.date :birthdate
8
+
9
+ t.timestamps null: false
10
+ end
11
+ end
12
+ end
@@ -0,0 +1,19 @@
1
+ class CreateCompanies < ActiveRecord::Migration
2
+ def change
3
+ create_table :companies do |t|
4
+ t.string :name
5
+ t.string :addr1
6
+ t.string :addr2
7
+ t.string :city
8
+ t.string :state
9
+ t.string :zip
10
+ t.string :phone
11
+
12
+ t.timestamps null: false
13
+ end
14
+
15
+ add_index :companies, :name
16
+ add_index :companies, :city
17
+ add_index :companies, :state
18
+ end
19
+ end
@@ -0,0 +1,39 @@
1
+ # encoding: UTF-8
2
+ # This file is auto-generated from the current state of the database. Instead
3
+ # of editing this file, please use the migrations feature of Active Record to
4
+ # incrementally modify your database, and then regenerate this schema definition.
5
+ #
6
+ # Note that this schema.rb definition is the authoritative source for your
7
+ # database schema. If you need to create the application database on another
8
+ # system, you should be using db:schema:load, not running all the migrations
9
+ # from scratch. The latter is a flawed and unsustainable approach (the more migrations
10
+ # you'll amass, the slower it'll run and the greater likelihood for issues).
11
+ #
12
+ # It's strongly recommended that you check this file into your version control system.
13
+
14
+ ActiveRecord::Schema.define(version: 20160322223258) do
15
+ create_table "companies", force: :cascade do |t|
16
+ t.string "addr1"
17
+ t.string "addr2"
18
+ t.string "city"
19
+ t.datetime "created_at", null: false
20
+ t.string "name"
21
+ t.string "phone"
22
+ t.string "state"
23
+ t.datetime "updated_at", null: false
24
+ t.string "zip"
25
+ end
26
+
27
+ add_index "companies", ["city"], name: "index_companies_on_city"
28
+ add_index "companies", ["name"], name: "index_companies_on_name"
29
+ add_index "companies", ["state"], name: "index_companies_on_state"
30
+
31
+ create_table "people", force: :cascade do |t|
32
+ t.integer "age"
33
+ t.date "birthdate"
34
+ t.datetime "created_at", null: false
35
+ t.string "first_name"
36
+ t.string "last_name"
37
+ t.datetime "updated_at", null: false
38
+ end
39
+ end
@@ -0,0 +1,7 @@
1
+ # This file should contain all the record creation needed to seed the database with its default values.
2
+ # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
3
+ #
4
+ # Examples:
5
+ #
6
+ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
7
+ # Mayor.create(name: 'Emanuel', city: cities.first)
File without changes
File without changes
File without changes
@@ -0,0 +1,67 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>The page you were looking for doesn't exist (404)</title>
5
+ <meta name="viewport" content="width=device-width,initial-scale=1">
6
+ <style>
7
+ body {
8
+ background-color: #EFEFEF;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ font-family: arial, sans-serif;
12
+ margin: 0;
13
+ }
14
+
15
+ div.dialog {
16
+ width: 95%;
17
+ max-width: 33em;
18
+ margin: 4em auto 0;
19
+ }
20
+
21
+ div.dialog > div {
22
+ border: 1px solid #CCC;
23
+ border-right-color: #999;
24
+ border-left-color: #999;
25
+ border-bottom-color: #BBB;
26
+ border-top: #B00100 solid 4px;
27
+ border-top-left-radius: 9px;
28
+ border-top-right-radius: 9px;
29
+ background-color: white;
30
+ padding: 7px 12% 0;
31
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
+ }
33
+
34
+ h1 {
35
+ font-size: 100%;
36
+ color: #730E15;
37
+ line-height: 1.5em;
38
+ }
39
+
40
+ div.dialog > p {
41
+ margin: 0 0 1em;
42
+ padding: 1em;
43
+ background-color: #F7F7F7;
44
+ border: 1px solid #CCC;
45
+ border-right-color: #999;
46
+ border-left-color: #999;
47
+ border-bottom-color: #999;
48
+ border-bottom-left-radius: 4px;
49
+ border-bottom-right-radius: 4px;
50
+ border-top-color: #DADADA;
51
+ color: #666;
52
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
53
+ }
54
+ </style>
55
+ </head>
56
+
57
+ <body>
58
+ <!-- This file lives in public/404.html -->
59
+ <div class="dialog">
60
+ <div>
61
+ <h1>The page you were looking for doesn't exist.</h1>
62
+ <p>You may have mistyped the address or the page may have moved.</p>
63
+ </div>
64
+ <p>If you are the application owner check the logs for more information.</p>
65
+ </div>
66
+ </body>
67
+ </html>
@@ -0,0 +1,67 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>The change you wanted was rejected (422)</title>
5
+ <meta name="viewport" content="width=device-width,initial-scale=1">
6
+ <style>
7
+ body {
8
+ background-color: #EFEFEF;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ font-family: arial, sans-serif;
12
+ margin: 0;
13
+ }
14
+
15
+ div.dialog {
16
+ width: 95%;
17
+ max-width: 33em;
18
+ margin: 4em auto 0;
19
+ }
20
+
21
+ div.dialog > div {
22
+ border: 1px solid #CCC;
23
+ border-right-color: #999;
24
+ border-left-color: #999;
25
+ border-bottom-color: #BBB;
26
+ border-top: #B00100 solid 4px;
27
+ border-top-left-radius: 9px;
28
+ border-top-right-radius: 9px;
29
+ background-color: white;
30
+ padding: 7px 12% 0;
31
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
+ }
33
+
34
+ h1 {
35
+ font-size: 100%;
36
+ color: #730E15;
37
+ line-height: 1.5em;
38
+ }
39
+
40
+ div.dialog > p {
41
+ margin: 0 0 1em;
42
+ padding: 1em;
43
+ background-color: #F7F7F7;
44
+ border: 1px solid #CCC;
45
+ border-right-color: #999;
46
+ border-left-color: #999;
47
+ border-bottom-color: #999;
48
+ border-bottom-left-radius: 4px;
49
+ border-bottom-right-radius: 4px;
50
+ border-top-color: #DADADA;
51
+ color: #666;
52
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
53
+ }
54
+ </style>
55
+ </head>
56
+
57
+ <body>
58
+ <!-- This file lives in public/422.html -->
59
+ <div class="dialog">
60
+ <div>
61
+ <h1>The change you wanted was rejected.</h1>
62
+ <p>Maybe you tried to change something you didn't have access to.</p>
63
+ </div>
64
+ <p>If you are the application owner check the logs for more information.</p>
65
+ </div>
66
+ </body>
67
+ </html>
@@ -0,0 +1,66 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>We're sorry, but something went wrong (500)</title>
5
+ <meta name="viewport" content="width=device-width,initial-scale=1">
6
+ <style>
7
+ body {
8
+ background-color: #EFEFEF;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ font-family: arial, sans-serif;
12
+ margin: 0;
13
+ }
14
+
15
+ div.dialog {
16
+ width: 95%;
17
+ max-width: 33em;
18
+ margin: 4em auto 0;
19
+ }
20
+
21
+ div.dialog > div {
22
+ border: 1px solid #CCC;
23
+ border-right-color: #999;
24
+ border-left-color: #999;
25
+ border-bottom-color: #BBB;
26
+ border-top: #B00100 solid 4px;
27
+ border-top-left-radius: 9px;
28
+ border-top-right-radius: 9px;
29
+ background-color: white;
30
+ padding: 7px 12% 0;
31
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
+ }
33
+
34
+ h1 {
35
+ font-size: 100%;
36
+ color: #730E15;
37
+ line-height: 1.5em;
38
+ }
39
+
40
+ div.dialog > p {
41
+ margin: 0 0 1em;
42
+ padding: 1em;
43
+ background-color: #F7F7F7;
44
+ border: 1px solid #CCC;
45
+ border-right-color: #999;
46
+ border-left-color: #999;
47
+ border-bottom-color: #999;
48
+ border-bottom-left-radius: 4px;
49
+ border-bottom-right-radius: 4px;
50
+ border-top-color: #DADADA;
51
+ color: #666;
52
+ box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
53
+ }
54
+ </style>
55
+ </head>
56
+
57
+ <body>
58
+ <!-- This file lives in public/500.html -->
59
+ <div class="dialog">
60
+ <div>
61
+ <h1>We're sorry, but something went wrong.</h1>
62
+ </div>
63
+ <p>If you are the application owner check the logs for more information.</p>
64
+ </div>
65
+ </body>
66
+ </html>
File without changes
@@ -0,0 +1,5 @@
1
+ # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
2
+ #
3
+ # To ban all spiders from the entire site uncomment the next two lines:
4
+ # User-agent: *
5
+ # Disallow: /
File without changes
File without changes
@@ -0,0 +1,19 @@
1
+ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
2
+
3
+ one:
4
+ name: MyString
5
+ addr1: MyString
6
+ addr2: MyString
7
+ city: MyString
8
+ state: MyString
9
+ zip: MyString
10
+ phone: MyString
11
+
12
+ two:
13
+ name: MyString
14
+ addr1: MyString
15
+ addr2: MyString
16
+ city: MyString
17
+ state: MyString
18
+ zip: MyString
19
+ phone: MyString