From 9d08027432effa23927e1a186dc598d9f85d8615 Mon Sep 17 00:00:00 2001 From: Mike Griffin Date: Mon, 9 Jun 2025 12:49:26 +0100 Subject: [PATCH 1/3] Rename template file to have .tt extension --- lib/generators/github/ds/active_record_generator.rb | 2 +- .../github/ds/templates/{migration.rb => migration.rb.tt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/generators/github/ds/templates/{migration.rb => migration.rb.tt} (100%) diff --git a/lib/generators/github/ds/active_record_generator.rb b/lib/generators/github/ds/active_record_generator.rb index 45e86e7..1d631fb 100644 --- a/lib/generators/github/ds/active_record_generator.rb +++ b/lib/generators/github/ds/active_record_generator.rb @@ -10,7 +10,7 @@ class ActiveRecordGenerator < ::Rails::Generators::Base source_paths << File.join(File.dirname(__FILE__), "templates") def create_migration_file - migration_template "migration.rb", "db/migrate/create_key_values_table.rb", migration_version: migration_version + migration_template "migration.rb.tt", "db/migrate/create_key_values_table.rb", migration_version: migration_version end def self.next_migration_number(dirname) diff --git a/lib/generators/github/ds/templates/migration.rb b/lib/generators/github/ds/templates/migration.rb.tt similarity index 100% rename from lib/generators/github/ds/templates/migration.rb rename to lib/generators/github/ds/templates/migration.rb.tt From 8c383ae1a01748cd29ce20557d048ff5fe08ff75 Mon Sep 17 00:00:00 2001 From: Mike Griffin Date: Mon, 9 Jun 2025 15:23:28 +0100 Subject: [PATCH 2/3] ID columns are bigint by default now --- lib/generators/github/ds/templates/migration.rb.tt | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/generators/github/ds/templates/migration.rb.tt b/lib/generators/github/ds/templates/migration.rb.tt index 079e95c..e1dc634 100644 --- a/lib/generators/github/ds/templates/migration.rb.tt +++ b/lib/generators/github/ds/templates/migration.rb.tt @@ -9,8 +9,6 @@ class CreateKeyValuesTable < ActiveRecord::Migration<%= migration_version %> add_index <%= table_name %>, :key, :unique => true add_index <%= table_name %>, :expires_at - - change_column <%= table_name %>, :id, "bigint(20) NOT NULL AUTO_INCREMENT" end def self.down From 4864889c73de44e528240d906d512d4597885cd4 Mon Sep 17 00:00:00 2001 From: Mike Griffin Date: Mon, 9 Jun 2025 15:27:48 +0100 Subject: [PATCH 3/3] Modify test to match expected output --- lib/generators/github/ds/templates/migration.rb.tt | 2 +- test/generators/github/store/active_record_generator_test.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/generators/github/ds/templates/migration.rb.tt b/lib/generators/github/ds/templates/migration.rb.tt index e1dc634..aa30840 100644 --- a/lib/generators/github/ds/templates/migration.rb.tt +++ b/lib/generators/github/ds/templates/migration.rb.tt @@ -12,6 +12,6 @@ class CreateKeyValuesTable < ActiveRecord::Migration<%= migration_version %> end def self.down - drop_table <%= table_name %> + drop_table <%= table_name %> end end diff --git a/test/generators/github/store/active_record_generator_test.rb b/test/generators/github/store/active_record_generator_test.rb index de4d64b..bf7efe3 100644 --- a/test/generators/github/store/active_record_generator_test.rb +++ b/test/generators/github/store/active_record_generator_test.rb @@ -29,12 +29,10 @@ def self.up add_index :#{table_name}, :key, :unique => true add_index :#{table_name}, :expires_at - - change_column :#{table_name}, :id, "bigint(20) NOT NULL AUTO_INCREMENT" end def self.down - drop_table :#{table_name} + drop_table :#{table_name} end end EOM