8000 Fix migration generator against Rails master · activeadmin/activeadmin@01647ac · GitHub
[go: up one dir, main page]

Skip to content

Commit 01647ac

Browse files
Fix migration generator against Rails master
Current Rails master (6.1.0.alpha) adds a new --timestamps option to the migration generator that it's true by default. So to get migrations running under Rails master, we need to make sure we don't generate duplicate timestamp columns by using both explicit columns and the new (default) option at the same time.
1 parent 8a7aff0 commit 01647ac

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

spec/support/rails_template.rb

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,42 @@
44
create_file 'app/assets/javascripts/some-random-js.js'
55
create_file 'app/assets/images/a/favicon.ico'
66

7+
require 'active_admin/dependency'
8+
9+
timestamps = ActiveAdmin::Dependency.rails?('>= 6.1.0.a') ? '--timestamps' : 'created_at:datetime updated_at:datetime'
10+
711
generate :migration, 'create_posts title:string body:text published_date:date author_id:integer ' +
8-
'position:integer custom_category_id:integer starred:boolean foo_id:integer created_at:datetime updated_at:datetime'
12+
"position:integer custom_category_id:integer starred:boolean foo_id:integer #{timestamps}"
913

1014
copy_file File.expand_path('templates/models/post.rb', __dir__), 'app/models/post.rb'
1115
copy_file File.expand_path('templates/post_decorator.rb', __dir__), 'app/models/post_decorator.rb'
1216

1317
generate :migration, 'create_blog_posts title:string body:text published_date:date author_id:integer ' +
14-
'position:integer custom_category_id:integer starred:boolean foo_id:integer created_at:datetime updated_at:datetime'
18+
"position:integer custom_category_id:integer starred:boolean foo_id:integer #{timestamps}"
1519

1620
copy_file File.expand_path('templates/models/blog/post.rb', __dir__), 'app/models/blog/post.rb'
1721

18-
generate :migration, 'create_profiles user_id:integer bio:text created_at:datetime updated_at:datetime'
22+
generate :migration, "create_profiles user_id:integer bio:text #{timestamps}"
1923

2024
copy_file File.expand_path('templates/models/user.rb', __dir__), 'app/models/user.rb'
2125

22-
generate :migration, 'create_users type:string first_name:string last_name:string username:string age:integer encrypted_password:string created_at:datetime updated_at:datetime'
26+
generate :migration, "create_users type:string first_name:string last_name:string username:string age:integer encrypted_password:string #{timestamps}"
2327

2428
copy_file File.expand_path('templates/models/profile.rb', __dir__), 'app/models/profile.rb'
2529

2630
generate :model, 'publisher --migration=false --parent=User'
2731

28-
generate :migration, 'create_categories name:string description:text created_at:datetime updated_at:datetime'
32+
generate :migration, "create_categories name:string description:text #{timestamps}"
2933

3034
copy_file File.expand_path('templates/models/category.rb', __dir__), 'app/models/category.rb'
3135

3236
generate :model, 'store name:string user_id:integer'
3337

34-
generate :migration, 'create_tags name:string created_at:datetime updated_at:datetime'
38+
generate :migration, "create_tags name:string #{timestamps}"
3539

3640
copy_file File.expand_path('templates/models/tag.rb', __dir__), 'app/models/tag.rb'
3741

38-
generate :migration, 'create_taggings post_id:integer tag_id:integer position:integer created_at:datetime updated_at:datetime'
42+
generate :migration, "create_taggings post_id:integer tag_id:integer position:integer #{timestamps}"
3943

4044
copy_file File.expand_path('templates/models/tagging.rb', __dir__), 'app/models/tagging.rb'
4145

0 commit comments

Comments
 (0)
0