lib/activefacts/persistence/columns.rb in activefacts-0.7.3 vs lib/activefacts/persistence/columns.rb in activefacts-0.8.5

@@ -90,10 +90,11 @@
               last_names.size.times { a.pop }   # Remove the last names added
             elsif last_names.last && last_names.last == names[0][0...last_names.last.size] 
               # When Xyz is followed by XyzID, truncate that to just ID
               debug :columns, "truncating repeated #{last_names.last} in #{names[0]}"
               names[0] = names[0][last_names.last.size..-1]
+              names.shift if names[0] == ''
             elsif last_names.last == names[0]
               # Same, but where an underscore split up the words
               debug :columns, "truncating repeated name in #{names.inspect}"
               names.shift
             end
@@ -356,31 +357,31 @@
     # This section shows the features relevant to relational Persistence.
     class Vocabulary
       # Make schema transformations like adding ValueType self-value columns (and later, Rails-friendly ID fields).
       # Override this method to change the transformations
       def finish_schema
-        all_feature.each do |feature|
-          feature.self_value_reference if feature.is_a?(ActiveFacts::Metamodel::ValueType) && feature.is_table
+        all_concept.each do |concept|
+          concept.self_value_reference if concept.is_a?(ActiveFacts::Metamodel::ValueType) && concept.is_table
         end
       end
 
       def populate_all_columns  #:nodoc:
         # REVISIT: Is now a good time to apply schema transforms or should this be more explicit?
         finish_schema
 
         debug :columns, "Populating all columns" do
-          all_feature.each do |feature|
-            next if !feature.is_a?(ActiveFacts::Metamodel::Concept) || !feature.is_table
-            debug :columns, "Populating columns for table #{feature.name}" do
-              feature.populate_columns
+          all_concept.each do |concept|
+            next if !concept.is_table
+            debug :columns, "Populating columns for table #{concept.name}" do
+              concept.populate_columns
             end
           end
         end
         debug :columns, "Finished columns" do
-          all_feature.each do |feature|
-            next if !feature.is_a?(ActiveFacts::Metamodel::Concept) || !feature.is_table
-            debug :columns, "Finished columns for table #{feature.name}" do
-              feature.columns.each do |column|
+          all_concept.each do |concept|
+            next if !concept.is_table
+            debug :columns, "Finished columns for table #{concept.name}" do
+              concept.columns.each do |column|
                 debug :columns, "#{column}"
               end
             end
           end
         end