makumba_import 0.0.3 → 0.0.4

data/lib/makumba_import/importer.rb

@@ -216,7 +216,6 @@ module MakumbaImport
         txt << "class "+tablename.classify+" < ActiveRecord::Base\n"
         txt << "  set_table_name \""+tablename+"_\"\n"
         txt << "  set_primary_key \""+lastpart+"_\"\n"
-        txt << "  fix_makumba_columns\n\n"
         
         table.each do |name, field|
           if name == 'ref'
@@ -230,8 +229,9 @@ module MakumbaImport
               #puts "  belongs_to :"+name.downcase+", :foreign_key => '"+name+"_', :class_name => '"+field['ptr'].gsub(".", "_").classify+"'\n"
             end
           end
-          
         end
+
+        txt << "  fix_makumba_columns\n\n"
         
         txt << "end\n\n"
 

data/lib/makumba_import/legacy.rb

@@ -8,8 +8,10 @@ module LegacyMakumba
       column_names.each do |old_name|
         if old_name.match(/_$/)
           new_name = old_name[0...-1]
-          self.send(:define_method, new_name) { self.send(old_name) }
-          self.send(:define_method, "#{new_name}=") { |value| self.send("#{old_name}=", value) }
+          unless self.method_defined? new_name
+            self.send(:define_method, new_name) { self.send(old_name) }
+            self.send(:define_method, "#{new_name}=") { |value| self.send("#{old_name}=", value) }
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makumba_import
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: