dbd4 1.0.4 → 1.0.5

data/bin/dbd4

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #--
 
-DBD4VERSION = '1.0.4'
+DBD4VERSION = '1.0.5'
 
 require 'getoptlong'
 require 'dbd4/dbd4_model_file'
@@ -141,10 +141,10 @@ class DBD4Import
         dbmf.generateModelFiles unless $validate_only == true
         puts "Done!"
       end
-    rescue Exception => ex
-      puts "dbmodel aborted!"
-      puts ex
-      exit(1)
+    #rescue Exception => ex
+    #  puts "dbmodel aborted!"
+    #  puts ex
+    #  exit(1)
     end    
   end
 end

data/lib/dbd4/dbd4_model_file.rb

@@ -92,7 +92,7 @@ module DBD4
       @comments = table.attributes['Comments']
       @name = table.attributes['Tablename']
       @modelname = Inflector.singularize(@name)
-      @nm_table = false;
+      @nm_table = table.attributes['nmTable'];
       @primary_key = nil;
       
       @relation_starts = Array.new
@@ -100,7 +100,15 @@ module DBD4
       @columns = Columns.new(self)
       @non_standard_name = false
     end
-    
+
+    def self.createJoinTableName(t1, t2)
+      if t1.name < t2.name
+        "#{t1.name}_#{t2.name}"
+      else
+        "#{t2.name}_#{t1.name}"
+      end
+    end
+        
     def addColumnFromXml(column_xml)
       column = Column.new(column_xml, self)
       @primary_key = column if column.primary_key? and ! @primary_key
@@ -116,20 +124,25 @@ module DBD4
     end
     
     def validate(messages)
-      if @nm_table
-        t1 = @relation_ends.values[0].source_table
-        t2 = @relation_ends.values[1].source_table
-        expected_name = nil;
-        if t1.name < t2.name
-          expected_name = "#{t1.name}_#{t2.name}"
+      if @nm_table == '1'
+        if @relation_ends.size != 2
+          messages[:warnings] << "Warning : join table #{name} must have only 2 foreign keys with one2many types."
+        elsif @relation_ends.values[0].type != :many2many or relation_ends.values[1].type != :many2many
+          messages[:warnings] << "Warning : join table #{name} has a relation that is not many2many"
         else
-          expected_name = "#{t2.name}_#{t1.name}"
-        end
-        if @name != expected_name then
-          messages[:warnings] << "Warning : join table #{name} differs from expected #{expected_name}"
-          @non_standard_name = true
+          t1 = @relation_ends.values[0].source_table
+          t2 = @relation_ends.values[1].source_table
+          expected_name = Table.createJoinTableName(t1, t2)
+          if @name != expected_name then
+            messages[:warnings] << "Warning : join table #{name} differs from expected #{expected_name}"
+            @non_standard_name = true
+          end
         end
       else
+        if @columns.size == 2 and @columns.foreign_keys.size == 2 and @relation_ends.values.size == 2 and @relation_ends.values[0].type == :one2many and @relation_ends.values[1].type == :one2many
+          messages[:warnings] << "Warning : table name #{name} seems to be a join table (many2many) please specify 'is nm_table' in DBDesigner"
+        end
+        
         if @modelname == @name
           messages[:warnings] << "Warning : table name #{name} is not in a valid plural form, should be #{Inflector.pluralize(name)}"
           @non_standard_name = true
@@ -152,28 +165,28 @@ module DBD4
       tmp = Relations.new
       @relation_ends.each { |r| tmp<<allObjects[:relations][r.id] }
       @relation_ends = tmp
-      if @columns.size == 3
-        if @columns.foreign_keys.size == 2
-          if @relation_ends.values.size == 2
-            if @relation_ends.values[0].type == :one2many and @relation_ends.values[1].type == :one2many
-              @nm_table = true
-              @relation_ends.values[0].destination_table = @relation_ends.values[1].source_table
-              @relation_ends.values[0].join_table = self
-              @relation_ends.values[1].destination_table = @relation_ends.values[0].source_table
-              @relation_ends.values[1].join_table = self
-              @relation_ends.values[0].type = :many2many
-              @relation_ends.values[1].type = :many2many
-            end
-          end
-        end
+      if @relation_ends.values.size == 2 and @nm_table == '1' then
+        @relation_ends.values[0].destination_table = @relation_ends.values[1].source_table
+        @relation_ends.values[0].join_table = self
+        @relation_ends.values[1].destination_table = @relation_ends.values[0].source_table
+        @relation_ends.values[1].join_table = self
+        @relation_ends.values[0].type = :many2many
+        @relation_ends.values[1].type = :many2many
       end
     end
     
     def generateModelFile 
       m = RailsModelFile.new({:modelname => @modelname})
-      m.update(self) unless @nm_table
+      m.update(self) unless @nm_table == '1'
       m = RailsMigrationFile.new({:tablename => @name})
       m.update(self)
+      
+      @relation_starts.each_value do |rs|
+        if rs.type == :many2many and rs.join_table == nil
+          m = RailsMigrationFile.new({:virtual => true, :tablename => Table.createJoinTableName(self, rs.destination_table)})
+          m.update_implicit_join_table(rs)
+        end
+      end
     end
     
     def to_str
@@ -273,33 +286,61 @@ module DBD4
         when '5'
           @type = :one2one
         when '2'
-          @type = :one2many
+          @type = :one2many  
+        when '3'
+          @type = :many2many 
       end
       @source_table = relation.attributes['SrcTable']
       @destination_table = relation.attributes['DestTable']
     end
-     
+
     def resolve(allObjects)
       @source_table = allObjects[:tables][@source_table] 
       @destination_table = allObjects[:tables][@destination_table]
-      @source_column = @source_table.columns.primary_keys[@fk_fields[0].source_field]
-      @destination_column = @destination_table.columns.foreign_keys[@fk_fields[0].destination_field]
+      if @type != :many2many
+        @source_column = @source_table.columns.primary_keys[@fk_fields[0].source_field]
+        @destination_column = @destination_table.columns.foreign_keys[@fk_fields[0].destination_field]      
+      end
     end
     
     def validate(messages)
+      if @type == nil
+        messages[:warnings] << "Warning : between table #{@destination_table.name} and table #{@source_table.name}, type #{@kind} is invalid"
+      end
+      
       if @fk_fields.size > 1
-        messages[:warnings] << "Warning : between table #{@destination_column.table.name} and table #{@source_column.table.name}, relation #{name} targets more than 1 foreign_key" 
+        messages[:warnings] << "Warning : between table #{@destination_table.name} and table #{@source_table.name}, relation #{name} targets more than 1 foreign_key" 
       end
       
-      expected_fkey_name = Inflector.singularize(@source_table.name) + "_id"
-      if @destination_column.name != expected_fkey_name and @destination_column.polymorphic == nil then
-        messages[:warnings] << "Warning : table #{@destination_column.table.name}, foreign key #{@destination_column.name} does not match expected name #{expected_fkey_name}"
-        @destination_column.non_standard_name = true
+      if !( @type != nil and @type == :many2many and @join_table == nil )
+        expected_fkey_name = Inflector.singularize(@source_table.name) + "_id"
+        if @destination_column.name != expected_fkey_name and @destination_column.polymorphic == nil then
+          messages[:warnings] << "Warning : table #{@destination_column.table.name}, foreign key #{@destination_column.name} does not match expected name #{expected_fkey_name}"
+          @destination_column.non_standard_name = true
+        end
       end
     end
   
     def to_str
-      "Relation(id=#{id}, name=#{name}, type=#{type}, src=#{source_table.name}, dst=#{destination_table.name}, fk=#{fk_fields.to_str})"
+      result = "Relation(id=#{id}, name=#{name}, type=#{type},"
+      if source_column != nil
+        result += " src_col=#{source_column.name},"
+      else
+        result += " src_col=nil,"
+      end
+      if destination_column != nil
+        result += " dst_col=#{destination_column.name},"
+      else
+        result += " dst_col=nil,"
+      end
+      result += " src=#{source_table.name}, dst=#{destination_table.name}, fk=#{fk_fields.to_str},"
+      if join_table != nil
+        result += " join_table=#{join_table.name}"
+      else
+        result += " join_table=nil"
+      end
+      result += ")"
+      result
     end
   end
   
@@ -444,8 +485,9 @@ module DBD4
       
     def <<(column)
       column.table = @table
-      @primary_key = column unless @primary_key
+      
       if column.primary_key?
+        @primary_key = column
         @primary_keys[column.name] = column
       end
       if column.foreign_key?
@@ -464,16 +506,22 @@ module DBD4
     end
     
     def validate(messages)
-      if @primary_key == nil then
-        messages[:errors] << "Error : table #{@table.name} has no primary keys, you need at least 1"
-      else    
-        if @primary_keys.size > 1 then
-          messages[:warnings] << "Warning : table #{@table.name} has more than 1 primary key, only the first one will be considered"
+      if @table.nm_table == '0'
+        if @primary_key == nil then
+          messages[:errors] << "Error : table #{@table.name} has no primary keys, you need at least 1"
+        else    
+          if @primary_keys.size > 1 then
+            messages[:warnings] << "Warning : table #{@table.name} has more than 1 primary key, only the first one will be considered"
+          end
+          
+          if @primary_key.name != 'id'
+            messages[:warnings] << "Warning : table #{@table.name} primary key #{@primary_key.name} differs from expected name id"
+            @primary_key.non_standard_name = true
+          end
         end
-        
-        if @primary_key.name != 'id'
-          messages[:warnings] << "Warning : table #{@table.name} primary key #{@primary_key.name} differs from expected name id"
-          @primary_key.non_standard_name = true
+      else
+        if @primary_key != nil then
+          messages[:warnings] << "Warning : table #{@table.name} is a many2many join table, it cannot have a primary key"
         end
       end
       each_value { |v| v.validate(messages) }

data/lib/dbd4/rails_migration_file.rb

@@ -32,15 +32,29 @@ module DBD4
       @warnings = Array.new
       @infos = Array.new      
       @tablename = options[:tablename]
+      @virtual = options[:virtual]
       
       if options[:tablename]
         if Inflector.singularize(@tablename) == @tablename
           raise RailsModelFileError, "MigrationModelFile : tablename #{@tablename} is not valid, it must be plural, not singular"
         end
-        partial_name = "_create_" + Inflector.underscore(Inflector.camelize(@tablename)) + ".rb"
-        fileList = Dir.new(File.join('db', 'migrate')).entries.delete_if { |e| e !~ /#{partial_name}/ }
+        partial_name = "_create_" + Inflector.underscore(Inflector.camelize(@tablename)) + ".rb" 
+        fileList = Array.new(Dir.new(File.join('db', 'migrate')).entries).delete_if { |e| e !~ /#{partial_name}/ }
         if fileList.size == 0
-          raise "Could not find migration file starting with #{partial_name} in dir db/migrate"
+          if @virtual == true
+            cmdline = ['migration', "create_" + Inflector.underscore(Inflector.camelize(@tablename)) ]            
+            puts "Calling generator: #{cmdline.join(' ')}"
+            Rails::Generator::Scripts::Generate.new.run(cmdline)
+            fileList = Array.new(Dir.new(File.join('db', 'migrate')).entries).delete_if { |e| e !~ /#{partial_name}/ }
+            if fileList.size == 0
+              raise "Could not find generated migration file starting with #{partial_name} in dir db/migrate"
+            end
+            if fileList.size > 1
+              raise "Found more than 1 migration file starting with #{partial_name} in dir db/migrate"
+            end
+          else
+            raise "Could not find migration file starting with #{partial_name} in dir db/migrate"
+          end
         end
         if fileList.size > 1
           raise "Found more than 1 migration file starting with #{partial_name} in dir db/migrate"
@@ -100,7 +114,7 @@ module DBD4
       new_migration_file_content = <<"MIGRATIONFILE"
 class Create#{c} < ActiveRecord::Migration
   def self.up
-    create_table :#{table.name} do |t|
+    create_table :#{@tablename} do |t|
 #{columnsToString(table)}
     end
   end
@@ -119,6 +133,32 @@ MIGRATIONFILE
       end
     end
       
+    def update_implicit_join_table(relation)
+      raise "MigrationFile : migration file name not given" if ! @migrationfile 
+      c = Inflector.camelize(@tablename)
+      new_migration_file_content = <<"MIGRATIONFILE"
+class Create#{c} < ActiveRecord::Migration
+  def self.up
+    create_table :#{@tablename}, :id => false do |t|
+      t.column :#{relation.source_table.modelname}_id, :integer
+      t.column :#{relation.destination_table.modelname}_id, :integer
+    end
+  end
+  
+  def self.down
+    drop_table :#{@tablename}
+  end
+end       
+MIGRATIONFILE
+
+      old_migration_file_content = IO.readlines(@migrationfile).join("")
+      if (old_migration_file_content != new_migration_file_content)  
+        puts "Updating migration file for table #{@tablename} (file : #{@migrationfile})..."
+        newFile = File.open(@migrationfile, "w")
+        newFile.puts new_migration_file_content
+      end
+    end
+    
     def to_str
       @lines.join("")
     end

data/lib/dbd4/rails_model_file.rb

@@ -39,7 +39,6 @@ module DBD4
         'has_one' => {},
         'has_many' => {},
         'belongs_to' => {},
-        'habtm' => {},
         'has_and_belongs_to_many' => {},
         'class' => {},
         'primary_key' => {},
@@ -112,21 +111,17 @@ module DBD4
           else
             @elements['table_name'] = { :start => i, :name => $~[1] }
           end
-        elsif l.match(/^\s*(has_one|has_many|has_and_belongs_to_many|habtm|belongs_to)\s+:([a-zA-Z_0-9]+)/)
+        elsif l.match(/^\s*(has_one|has_many|has_and_belongs_to_many|belongs_to)\s+:([a-zA-Z_0-9]+)/)
           r_type = $~[1]
           t_name = $~[2]
           
-          if r_type == 'has_and_belongs_to_many'
-            r_type = 'habtm'
-          end        
-          
           if @elements[r_type][t_name]
             @warnings << "Warning in file #{@modelfile} at line #{i + 1}:"
             @warnings << "  Duplicate declaration #{r_type}, it is already defined at line #{@elements[r_type][t_name][:start] + 1}"
             @lines[i] = "#" + @lines[i]
             i += 1
             while i < @lines.size
-              break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|habtm|belongs_to|def|end)/)
+              break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|belongs_to|def|end)/)
               @lines[i] = "#" + @lines[i] if @lines[i] !~ /^\s*#/
               i += 1
             end
@@ -141,7 +136,7 @@ module DBD4
             i += 1
             while i < @lines.size
               l2 = @lines[i]
-              break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|habtm|belongs_to|def|end)/)
+              break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|belongs_to|def|end)/)
               r[:foreign_key] = $~ if l2.match(/:foreign_key\s*=>\s*["']([a-zA-Z_0-9]+)/)
               r[:polymorphic] = $~ if l2.match(/:polymorphic\s*=>\s*true/)
               r[:as] = $~ if l2.match(/:as\s*=>\s*([a-zA-Z_0-9]+)/)
@@ -191,13 +186,13 @@ module DBD4
         
         etype = 'has_one' if r.type == :one2one
         etype = 'has_many' if r.type == :one2many
-        etype = 'habtm' if r.type == :many2many
+        etype = 'has_and_belongs_to_many' if r.type == :many2many
         element = @elements[etype][dname]
           
         #If the line exists
         if element
           if element[:as]
-            if r.destination_column.polymorphic
+            if r.destination_column and r.destination_column.polymorphic
               for i in (element[:start] .. element[:end])
                 @lines[i].sub!(/(:as\s*=>\s*["']?)[a-zA-Z_0-9]+/, "\\1#{r.destination_column.polymorphic}")
               end
@@ -207,12 +202,14 @@ module DBD4
               end
             end
           else
-            @lines[element[:start]].sub!(/(#{etype}[^,]+)/, "\\1, :as => '#{r.destination_column.polymorphic}'")
+            if r.destination_column and r.destination_column.polymorphic
+              @lines[element[:start]].sub!(/(#{etype}[^,]+)/, "\\1, :as => '#{r.destination_column.polymorphic}'")
+            end
           end
           left_over[etype].delete(dname)  
         else
           @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
-          if r.destination_column.polymorphic
+          if r.destination_column and r.destination_column.polymorphic
             @lines[@elements['class'][:start]] += ", :as => #{r.destination_column.polymorphic}"
           end
           @lines[@elements['class'][:start]] += "\n"
@@ -232,19 +229,19 @@ module DBD4
         end
         
         etype = 'belongs_to' if r.type == :one2one or r.type == :one2many
-        etype = 'habtm' if r.type == :many2many
+        etype = 'has_and_belongs_to_many' if r.type == :many2many
         element = @elements[etype][dname]
           
         #If the line exists
         if element
           if element[:polymorphic]
-            if ! r.destination_column.polymorphic
+            if r.destination_column and ! r.destination_column.polymorphic
               for i in (element[:start] .. element[:end])
                 @lines[i].sub!(/,\s*:polymorphic\s*=>\s*["']?[a-zA-Z_0-9]+["']?/, "")
               end
             end
           else
-            if r.destination_column.polymorphic
+            if r.destination_column and r.destination_column.polymorphic
               @lines[element[:start]].sub!(/(#{etype}[^,\n]+)/, "\\1, :polymorphic => true")
             else
               # do nothing
@@ -253,7 +250,7 @@ module DBD4
           left_over[etype].delete(dname)  
         else
           @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
-          if r.destination_column.polymorphic
+          if r.destination_column and r.destination_column.polymorphic
             @elements[etype] = { dname => { :polymorphic => true, :added => true } }
             @lines[@elements['class'][:start]] += ", :polymorphic => true"
           end

data/tests/unit/test_dbd4.rb

@@ -22,6 +22,7 @@ $files = {
   'app/models/dog.rb' => "class Dog < ActiveRecord::Base\nend\n",
   'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
   'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+  'app/models/car.rb' => "class Car < ActiveRecord::Base\nend\n",
   'db/migrate/001_create_cats.rb' => "",
   'db/migrate/001_create_cats.rb' => "",
   'db/migrate/001_create_cats.rb' => "",
@@ -37,18 +38,14 @@ $files = {
   'db/migrate/011_create_wives.rb' => "",
   'db/migrate/012_create_dogs.rb' => "",
   'db/migrate/013_create_kids.rb' => "",
-  'db/migrate/014_create_houses.rb' => ""
+  'db/migrate/014_create_houses.rb' => "",
+  'db/migrate/015_create_cars.rb' => "",
+  'db/migrate/104_create_cars_people.rb' => ""
 }
 
-$files_written_to = Array.new
+$new_migration_numbers = ['100', '101', '102', '103', '104']
 
-class Dir
-  def initialize(dirname)
-    raise "Cannot open directory : #{dirname}" if dirname != File.join("db", "migrate")
-  end
-  
-  def entries
-    [
+$dir_entries = [
       '001_create_cats.rb', 
       '002_create_computers_users.rb', 
       '003_create_computers.rb',
@@ -62,8 +59,19 @@ class Dir
       '011_create_wives.rb',
       '012_create_dogs.rb',
       '013_create_kids.rb',
-      '014_create_houses.rb'
+      '014_create_houses.rb',
+      '015_create_cars.rb'
     ]
+
+$files_written_to = Array.new
+
+class Dir
+  def initialize(dirname)
+    raise "Cannot open directory : #{dirname}" if dirname != File.join("db", "migrate")
+  end
+  
+  def entries
+    $dir_entries
   end
 end
 
@@ -207,6 +215,7 @@ INPUT
       'app/models/dog.rb' => "class Dog < ActiveRecord::Base\nend\n",
       'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
       'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+      'app/models/car.rb' => "class Car < ActiveRecord::Base\nend\n",
       'db/migrate/001_create_cats.rb' => "",
       'db/migrate/002_create_computers_users.rb' => "",
       'db/migrate/003_create_computers.rb' => "",
@@ -220,12 +229,14 @@ INPUT
       'db/migrate/011_create_wives.rb' => "",
       'db/migrate/012_create_dogs.rb' => "",
       'db/migrate/013_create_kids.rb' => "",
-      'db/migrate/014_create_houses.rb' => ""    
+      'db/migrate/014_create_houses.rb' => "",
+      'db/migrate/104_create_cars_people.rb' => "",
+      'db/migrate/015_create_cars.rb' => ""
     }
     @b.generateModelFiles
-    #puts $files_written_to
+    
     run_info = Rails::Generator::Scripts::Generate.new.run_info
-    assert_equal(14, run_info.size)
+    assert_equal(16, run_info.size)
     assert_equal(1, run_info['model computer'])
     assert_equal(1, run_info['model wife'])
     assert_equal(1, run_info['model shoe'])
@@ -240,6 +251,8 @@ INPUT
     assert_equal(1, run_info['model house'])
     assert_equal(1, run_info['model dog'])
     assert_equal(1, run_info['model job'])
+    assert_equal(1, run_info['migration create_cars_people'])
+    assert_equal(1, run_info['model car'])
   end
 
   def _test_comment
@@ -258,6 +271,7 @@ INPUT
       'app/models/dog.rb' => "class Dog < ActiveRecord::Base\n  has_many :generic_animals, :as => gogole\nend\n",
       'app/models/kid.rb' => "class Kid < ActiveRecord::Base\nend\n",
       'app/models/house.rb' => "class House < ActiveRecord::Base\nend\n",
+      'app/models/car.rb' => "class Car < ActiveRecord::Base\nend\n",
       'db/migrate/001_create_cats.rb' => "",
       'db/migrate/001_create_cats.rb' => "",
       'db/migrate/002_create_computers_users.rb' => "",
@@ -272,7 +286,9 @@ INPUT
       'db/migrate/011_create_wives.rb' => "",
       'db/migrate/012_create_dogs.rb' => "",
       'db/migrate/013_create_kids.rb' => "",
-      'db/migrate/014_create_houses.rb' => ""
+      'db/migrate/014_create_houses.rb' => "",
+      'db/migrate/104_create_cars_people.rb' => "",
+      'db/migrate/015_create_cars.rb' => ""
     }
 
     $files_written_to = Array.new

data/tests/unit/test_dbd4_model_file.rb

@@ -34,6 +34,7 @@ class Dbd4Test < Test::Unit::TestCase
   
   def _test_with_all_errors_corrected
     b = DBD4::DBD4ModelFile.new(File.join(File.dirname(__FILE__), '..', 'data', 'good_example.xml'))
+    puts b.messages[:warnings]
     assert_equal(0, b.messages[:errors].size)
     assert_equal(0, b.messages[:warnings].size)
     a = b.to_str.readlines.zip(IO.readlines(File.join(File.dirname(__FILE__), '..', 'data', 'good_example.output')))

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: dbd4
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2006-08-24 00:00:00 -04:00
+  version: 1.0.5
+date: 2006-08-26 00:00:00 -04:00
 summary: A package for importing DB Designer 4 xml models in rails.
 require_paths: 
 - lib