From 84bb92832058147447068bc9c65f2a13e9b8b5c1 Mon Sep 17 00:00:00 2001 From: Adam Waselnuk Date: Thu, 15 Jun 2017 15:27:39 -0400 Subject: [PATCH] Added Rails version to create_shops generator template --- .../shopify_app/shop_model/shop_model_generator.rb | 10 +++------- .../db/migrate/{create_shops.rb => create_shops.erb} | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) rename lib/generators/shopify_app/shop_model/templates/db/migrate/{create_shops.rb => create_shops.erb} (77%) diff --git a/lib/generators/shopify_app/shop_model/shop_model_generator.rb b/lib/generators/shopify_app/shop_model/shop_model_generator.rb index 15c769106..75d5109c7 100644 --- a/lib/generators/shopify_app/shop_model/shop_model_generator.rb +++ b/lib/generators/shopify_app/shop_model/shop_model_generator.rb @@ -12,7 +12,7 @@ def create_shop_model end def create_shop_migration - copy_migration 'create_shops.rb' + migration_template "db/migrate/create_shops.erb", "db/migrate/create_shops.rb" end def create_session_storage_initializer @@ -25,12 +25,8 @@ def create_shop_fixtures private - def copy_migration(migration_name, config = {}) - migration_template( - "db/migrate/#{migration_name}", - "db/migrate/#{migration_name}", - config - ) + def rails_migration_version + Rails.version.match(/\d\.\d/)[0] end # for generating a timestamp when using `create_migration` diff --git a/lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.rb b/lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.erb similarity index 77% rename from lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.rb rename to lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.erb index c7450b714..45d22cb6a 100644 --- a/lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.rb +++ b/lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.erb @@ -1,4 +1,4 @@ -class CreateShops < ActiveRecord::Migration +class CreateShops < ActiveRecord::Migration[<%= rails_migration_version %>] def self.up create_table :shops do |t| t.string :shopify_domain, null: false