Merge pull request #423 from Shopify/fix-shop-migration-generator

AWaselnuk · web-flow · commit 97a61106bb09 · 2017-06-15T17:01:33.000-04:00
Added Rails version to create_shops generator template
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+7.2.10
+-----
+* Fix an issue with the create_shops generator template
+  [[#423]](https://github.com/Shopify/shopify_app/pull/423)
+
 7.2.9
 -----
 * Remove support for Rails 4
diff --git 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.erb 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
diff --git a/lib/shopify_app/version.rb b/lib/shopify_app/version.rb
@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '7.2.9'
+  VERSION = '7.2.10'
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class CreateShops < ActiveRecord::Migration`
	`1`	`+class CreateShops < ActiveRecord::Migration[<%= rails_migration_version %>]`
`2`	`2`	`def self.up`
`3`	`3`	`create_table :shops do \|t\|`
`4`	`4`	`t.string :shopify_domain, null: false`