Fix namespaced models in Model migration and foreign key migrations (#399)

Fixes
crmne/ruby_llm#397 (comment) and
continues work from #398

Author: willcosgrove

lib/generators/ruby_llm/install/install_generator.rb

@@ -57,6 +57,10 @@ def parse_model_mappings
         @model_names ||= parse_model_mappings
         @model_names[type]
       end
+
+      define_method("#{type}_table_name") do
+        table_name_for(send("#{type}_model_name"))
+      end
     end
 
     def acts_as_chat_declaration
@@ -145,22 +149,22 @@ def create_migration_files
       # Create migrations with timestamps to ensure proper order
       # First create chats table
       migration_template 'create_chats_migration.rb.tt',
-                         "db/migrate/create_#{chat_model_name.tableize}.rb"
+                         "db/migrate/create_#{chat_table_name}.rb"
 
       # Then create messages table (must come before tool_calls due to foreign key)
       sleep 1 # Ensure different timestamp
       migration_template 'create_messages_migration.rb.tt',
-                         "db/migrate/create_#{message_model_name.tableize}.rb"
+                         "db/migrate/create_#{message_table_name}.rb"
 
       # Then create tool_calls table (references messages)
       sleep 1 # Ensure different timestamp
       migration_template 'create_tool_calls_migration.rb.tt',
-                         "db/migrate/create_#{tool_call_model_name.tableize}.rb"
+                         "db/migrate/create_#{tool_call_table_name}.rb"
 
       # Create models table
       sleep 1 # Ensure different timestamp
       migration_template 'create_models_migration.rb.tt',
-                         "db/migrate/create_#{model_model_name.tableize}.rb"
+                         "db/migrate/create_#{model_table_name}.rb"
     end
 
     def create_model_files
@@ -182,6 +186,12 @@ def install_active_storage
       rails_command 'active_storage:install'
     end
 
+    def table_name_for(model_name)
+      # Convert namespaced model names to proper table names
+      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
+      model_name.underscore.pluralize.tr('/', '_')
+    end
+
     def show_install_info
       say "\n  ✅ RubyLLM installed!", :green
 

lib/generators/ruby_llm/install/templates/create_chats_migration.rb.tt

@@ -1,7 +1,7 @@
-class Create<%= chat_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= chat_model_name.gsub('::', '').pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= chat_model_name.tableize %> do |t|
-      t.references :<%= model_model_name.tableize.singularize %>, foreign_key: true
+    create_table :<%= chat_table_name %> do |t|
+      t.references :<%= model_table_name.singularize %>, foreign_key: true
       t.timestamps
     end
   end

lib/generators/ruby_llm/install/templates/create_messages_migration.rb.tt

@@ -1,16 +1,16 @@
-class Create<%= message_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= message_model_name.gsub('::', '').pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= message_model_name.tableize %> do |t|
-      t.references :<%= chat_model_name.tableize.singularize %>, null: false, foreign_key: true
+    create_table :<%= message_table_name %> do |t|
+      t.references :<%= chat_table_name.singularize %>, null: false, foreign_key: true
       t.string :role, null: false
       t.text :content
-      t.references :<%= model_model_name.tableize.singularize %>, foreign_key: true
+      t.references :<%= model_table_name.singularize %>, foreign_key: true
       t.integer :input_tokens
       t.integer :output_tokens
-      t.references :<%= tool_call_model_name.tableize.singularize %>, foreign_key: true
+      t.references :<%= tool_call_table_name.singularize %>, foreign_key: true
       t.timestamps
     end
 
-    add_index :<%= message_model_name.tableize %>, :role
+    add_index :<%= message_table_name %>, :role
   end
 end

lib/generators/ruby_llm/install/templates/create_models_migration.rb.tt

@@ -1,6 +1,6 @@
-class Create<%= model_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= model_model_name.gsub('::', '').pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= model_model_name.tableize %> do |t|
+    create_table :<%= model_table_name %> do |t|
       t.string :model_id, null: false
       t.string :name, null: false
       t.string :provider, null: false

lib/generators/ruby_llm/install/templates/create_tool_calls_migration.rb.tt

@@ -1,15 +1,15 @@
 <%#- # Migration for creating tool_calls table with database-specific JSON handling -%>
-class Create<%= tool_call_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= tool_call_model_name.gsub('::', '').pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= tool_call_model_name.tableize %> do |t|
-      t.references :<%= message_model_name.tableize.singularize %>, null: false, foreign_key: true
+    create_table :<%= tool_call_table_name %> do |t|
+      t.references :<%= message_table_name.singularize %>, null: false, foreign_key: true
       t.string :tool_call_id, null: false
       t.string :name, null: false
       t.<%= postgresql? ? 'jsonb' : 'json' %> :arguments, default: {}
       t.timestamps
     end
 
-    add_index :<%= tool_call_model_name.tableize %>, :tool_call_id, unique: true
-    add_index :<%= tool_call_model_name.tableize %>, :name
+    add_index :<%= tool_call_table_name %>, :tool_call_id, unique: true
+    add_index :<%= tool_call_table_name %>, :name
   end
 end

lib/generators/ruby_llm/upgrade_to_v1_7/templates/migration.rb.tt

@@ -12,18 +12,18 @@ class MigrateToRubyLLMModelReferences < ActiveRecord::Migration<%= migration_ver
     end
 
     # Migrate foreign keys
-    migrate_foreign_key(:<%= chat_table_name %>, chat_class, model_class, :<%= model_model_name.underscore %>)
-    migrate_foreign_key(:<%= message_table_name %>, message_class, model_class, :<%= model_model_name.underscore %>)
+    migrate_foreign_key(:<%= chat_table_name %>, chat_class, model_class, :<%= model_table_name.singularize %>)
+    migrate_foreign_key(:<%= message_table_name %>, message_class, model_class, :<%= model_table_name.singularize %>)
   end
 
   def down
     # Remove foreign key references
-    if column_exists?(:<%= message_table_name %>, :<%= model_model_name.underscore %>_id)
-      remove_reference :<%= message_table_name %>, :<%= model_model_name.underscore %>, foreign_key: true
+    if column_exists?(:<%= message_table_name %>, :<%= model_table_name.singularize %>_id)
+      remove_reference :<%= message_table_name %>, :<%= model_table_name.singularize %>, foreign_key: true
     end
 
-    if column_exists?(:<%= chat_table_name %>, :<%= model_model_name.underscore %>_id)
-      remove_reference :<%= chat_table_name %>, :<%= model_model_name.underscore %>, foreign_key: true
+    if column_exists?(:<%= chat_table_name %>, :<%= model_table_name.singularize %>_id)
+      remove_reference :<%= chat_table_name %>, :<%= model_table_name.singularize %>, foreign_key: true
     end
 
     # Restore original model_id string columns

spec/lib/generators/ruby_llm/install_generator_spec.rb

@@ -29,23 +29,23 @@
       let(:chat_migration) { File.read(File.join(template_dir, 'create_chats_migration.rb.tt')) }
 
       it 'defines chats table' do
-        expect(chat_migration).to include('create_table :<%= chat_model_name.tableize %>')
+        expect(chat_migration).to include('create_table :<%= chat_table_name %>')
       end
 
       it 'includes model reference' do
-        expect(chat_migration).to include('t.references :<%= model_model_name.tableize.singularize %>')
+        expect(chat_migration).to include('t.references :<%= model_table_name.singularize %>')
       end
     end
 
     describe 'messages migration' do
       let(:message_migration) { File.read(File.join(template_dir, 'create_messages_migration.rb.tt')) }
 
       it 'defines messages table' do
-        expect(message_migration).to include('create_table :<%= message_model_name.tableize %>')
+        expect(message_migration).to include('create_table :<%= message_table_name %>')
       end
 
       it 'includes chat reference' do
-        expect(message_migration).to include('t.references :<%= chat_model_name.tableize.singularize %>, null: false, foreign_key: true') # rubocop:disable Layout/LineLength
+        expect(message_migration).to include('t.references :<%= chat_table_name.singularize %>, null: false, foreign_key: true') # rubocop:disable Layout/LineLength
       end
 
       it 'includes role field' do
@@ -61,7 +61,7 @@
       let(:tool_call_migration) { File.read(File.join(template_dir, 'create_tool_calls_migration.rb.tt')) }
 
       it 'defines tool_calls table' do
-        expect(tool_call_migration).to include('create_table :<%= tool_call_model_name.tableize %>')
+        expect(tool_call_migration).to include('create_table :<%= tool_call_table_name %>')
       end
 
       it 'includes tool_call_id field' do
@@ -125,7 +125,7 @@
     let(:models_migration) { File.read(File.join(template_dir, 'create_models_migration.rb.tt')) }
 
     it 'defines models table' do
-      expect(models_migration).to include('create_table :<%= model_model_name.tableize %>')
+      expect(models_migration).to include('create_table :<%= model_table_name %>')
     end
 
     it 'includes model_id field' do
@@ -240,11 +240,11 @@
     it 'creates migrations in correct order' do
       migration_section = generator_content[/def create_migration_files.*?\n    end/m]
 
-      # Look for the model name references which are in the migration paths
-      chats_position = migration_section.index('chat_model_name')
-      messages_position = migration_section.index('message_model_name')
-      tool_calls_position = migration_section.index('tool_call_model_name')
-      models_position = migration_section.index('model_model_name')
+      # Look for the table name references which are in the migration paths
+      chats_position = migration_section.index('chat_table_name')
+      messages_position = migration_section.index('message_table_name')
+      tool_calls_position = migration_section.index('tool_call_table_name')
+      models_position = migration_section.index('model_table_name')
 
       expect(chats_position).not_to be_nil
       expect(messages_position).not_to be_nil