fix STI migrations. Fixes doctest, and hopefully ticket #397.

bryanlarsen · Apr 7, 2009 · 03c514b · tslocke · Apr 8, 2009 · tslocke
1 parent 2e28dbb
commit 03c514b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/hobofields/lib/hobo_fields/migration_generator.rb b/hobofields/lib/hobo_fields/migration_generator.rb
@@ -138,8 +138,13 @@ def always_ignore_tables
 
     def generate
       models, db_tables = models_and_tables
-      models_by_table_name = models.index_by {|m| m.table_name}
-      model_table_names = models.*.table_name
+      models_by_table_name = {}
+      models.each do |m|
+        if m.inheritance_base? or !models_by_table_name.has_key?(m.table_name)
+          models_by_table_name[m.table_name] = m
+        end
+      end
+      model_table_names = models_by_table_name.keys
 
       to_create = model_table_names - db_tables
       to_drop = db_tables - model_table_names - always_ignore_tables

diff --git a/hobofields/lib/hobo_fields/model_extensions.rb b/hobofields/lib/hobo_fields/model_extensions.rb
@@ -15,8 +15,13 @@ module HoboFields
     # and speeds things up a little.
     inheriting_cattr_reader :field_specs => HashWithIndifferentAccess.new
 
+    # is true if is the base for STI
+    def self.inheritance_base?
+      @is_inheritance_base
+    end
 
     def self.inherited(klass)
+      @is_inheritance_base = true
       fields do |f|
         f.field(inheritance_column, :string)
       end