dbd4 1.0.5 → 1.0.6

data/bin/dbd4

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #--
 
-DBD4VERSION = '1.0.5'
+DBD4VERSION = '1.0.6'
 
 require 'getoptlong'
 require 'dbd4/dbd4_model_file'

data/lib/dbd4/dbd4_model_file.rb

@@ -176,8 +176,10 @@ module DBD4
     end
     
     def generateModelFile 
-      m = RailsModelFile.new({:modelname => @modelname})
-      m.update(self) unless @nm_table == '1'
+      if @nm_table == '0'
+        m = RailsModelFile.new({:modelname => @modelname})
+        m.update(self)
+      end
       m = RailsMigrationFile.new({:tablename => @name})
       m.update(self)
       
@@ -185,6 +187,9 @@ module DBD4
         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)
+        elsif rs.type == :acts_as_graph
+          m = RailsMigrationFile.new({:virtual => true, :tablename => "#{name}_edges"})
+          m.update_acts_as_graph_table(rs)
         end
       end
     end
@@ -301,6 +306,10 @@ module DBD4
         @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
+      
+      if @type == :many2many and @name =~ /acts_as_graph/
+        @type = :acts_as_graph
+      end
     end
     
     def validate(messages)
@@ -312,11 +321,15 @@ module DBD4
         messages[:warnings] << "Warning : between table #{@destination_table.name} and table #{@source_table.name}, relation #{name} targets more than 1 foreign_key" 
       end
       
-      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
+      if !( @type != nil and (@type == :many2many or @type == :acts_as_graph) and @join_table == nil )
+        if (@source_table.name == @destination_table.name) 
+          messages[:warnings] << "Warning : relation #{name} has same source and target table name : \"#{@source_table.name}\", dbd4 does not support this yet"
+        else
+          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
     end

data/lib/dbd4/rails_migration_file.rb

@@ -27,6 +27,9 @@ module DBD4
   class RailsMigrationFile
     attr_writer :tablename
     attr_reader :warnings, :tablename
+    
+    class RailsModelFileError < Exception
+    end
           
     def initialize(options = {})
       @warnings = Array.new
@@ -122,7 +125,7 @@ class Create#{c} < ActiveRecord::Migration
   def self.down
     drop_table :#{@tablename}
   end
-end 
+end
 MIGRATIONFILE
 
       old_migration_file_content = IO.readlines(@migrationfile).join("")
@@ -148,7 +151,7 @@ class Create#{c} < ActiveRecord::Migration
   def self.down
     drop_table :#{@tablename}
   end
-end       
+end
 MIGRATIONFILE
 
       old_migration_file_content = IO.readlines(@migrationfile).join("")
@@ -159,6 +162,31 @@ MIGRATIONFILE
       end
     end
     
+    def update_acts_as_graph_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, :force => true do |t|
+      t.column :#{relation.source_table.modelname}_id, :integer, :default => 0, :null => false
+      t.column :#{relation.destination_table.modelname}_id, :integer, :default => 0, :null => false
+    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

@@ -43,7 +43,8 @@ module DBD4
         'class' => {},
         'primary_key' => {},
         'table_name' => {},
-        'as' => {}
+        'as' => {},
+        'acts_as_graph' => {}
       }
     end
     
@@ -111,6 +112,15 @@ module DBD4
           else
             @elements['table_name'] = { :start => i, :name => $~[1] }
           end
+        elsif l.match(/^\s*acts_as_graph\s+\{\}\s+$/)
+          table_name = Inflector.pluralize(@modelname)
+          r = @elements['acts_as_graph'][table_name] = { :start => i, :end => i }
+          i += 1
+          while i < @lines.size
+            break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|belongs_to|def|end|acts_as)/)
+            r[:end] = i
+            i += 1
+          end
         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]
@@ -121,7 +131,7 @@ module DBD4
             @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|belongs_to|def|end)/)
+              break if @lines[i].match(/^\s*(?:has_one|has_many|has_and_belongs_to_many|belongs_to|def|end|acts_as)/)
               @lines[i] = "#" + @lines[i] if @lines[i] !~ /^\s*#/
               i += 1
             end
@@ -187,11 +197,14 @@ module DBD4
         etype = 'has_one' if r.type == :one2one
         etype = 'has_many' if r.type == :one2many
         etype = 'has_and_belongs_to_many' if r.type == :many2many
+        etype = 'acts_as_graph' if r.type == :acts_as_graph
         element = @elements[etype][dname]
           
         #If the line exists
         if element
-          if element[:as]
+          if r.type == :acts_as_graph
+            #do nothing, acts as graph can only be used with default parameters({})
+          elsif element[:as]
             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}")
@@ -208,7 +221,11 @@ module DBD4
           end
           left_over[etype].delete(dname)  
         else
-          @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
+          if r.type == :acts_as_graph
+            @lines[@elements['class'][:start]] += "  #{etype} {}"
+          else
+            @lines[@elements['class'][:start]] += "  #{etype} :#{dname}"
+          end
           if r.destination_column and r.destination_column.polymorphic
             @lines[@elements['class'][:start]] += ", :as => #{r.destination_column.polymorphic}"
           end
@@ -220,6 +237,8 @@ module DBD4
         dname = ""
         if r.type == :many2many
           dname = r.source_table.name
+        elsif r.type == :acts_as_graph
+          next
         else
           if r.destination_column.polymorphic
             dname = r.destination_column.polymorphic

data/tests/unit/test_dbd4.rb

@@ -40,6 +40,7 @@ $files = {
   'db/migrate/013_create_kids.rb' => "",
   'db/migrate/014_create_houses.rb' => "",
   'db/migrate/015_create_cars.rb' => "",
+  'db/migrate/103_create_cars_edges.rb' => "",
   'db/migrate/104_create_cars_people.rb' => ""
 }
 
@@ -230,6 +231,7 @@ INPUT
       'db/migrate/012_create_dogs.rb' => "",
       'db/migrate/013_create_kids.rb' => "",
       'db/migrate/014_create_houses.rb' => "",
+      'db/migrate/103_create_cars_edges.rb' => "",
       'db/migrate/104_create_cars_people.rb' => "",
       'db/migrate/015_create_cars.rb' => ""
     }
@@ -245,7 +247,6 @@ INPUT
     assert_equal(1, run_info['model person'])
     assert_equal(1, run_info['model security_number'])
     assert_equal(1, run_info['model user'])
-    assert_equal(1, run_info['model jobs_person'])
     assert_equal(1, run_info['model kid'])
     assert_equal(1, run_info['model generic_animal'])
     assert_equal(1, run_info['model house'])
@@ -253,6 +254,7 @@ INPUT
     assert_equal(1, run_info['model job'])
     assert_equal(1, run_info['migration create_cars_people'])
     assert_equal(1, run_info['model car'])
+    assert_equal(1, run_info['migration create_cars_edges'])
   end
 
   def _test_comment
@@ -287,6 +289,7 @@ INPUT
       'db/migrate/012_create_dogs.rb' => "",
       'db/migrate/013_create_kids.rb' => "",
       'db/migrate/014_create_houses.rb' => "",
+      'db/migrate/103_create_cars_edges.rb' => "",
       'db/migrate/104_create_cars_people.rb' => "",
       'db/migrate/015_create_cars.rb' => ""
     }

metadata

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