dbd4 1.0.6 → 1.0.7

data/bin/dbd4

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #--
 
-DBD4VERSION = '1.0.6'
+DBD4VERSION = '1.0.7'
 
 require 'getoptlong'
 require 'dbd4/dbd4_model_file'
@@ -33,16 +33,48 @@ require 'dbd4/dbd4_model_file'
 class DBD4Import
 
   OPTIONS = [
-    ['--validate-only',  '-n', GetoptLong::NO_ARGUMENT,
-      "Do a dry run without executing actions, only validate the model."],
-    ['--help',     '-H', GetoptLong::NO_ARGUMENT,
-      "Display this help message."],
-    ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
-      "Do not log messages to standard output."],
-    ['--usage',    '-h', GetoptLong::NO_ARGUMENT,
-      "Display usage."],
-    ['--version',  '-V', GetoptLong::NO_ARGUMENT,
-      "Display the program version."],
+    [
+    	'--validate-only',  
+    	'-n', 
+    	GetoptLong::NO_ARGUMENT,
+      	"Do a dry run without executing actions, only validate the model."
+    ],
+    [
+    	'--help',
+    	'-H', 
+    	GetoptLong::NO_ARGUMENT,
+      	"Display this help message."
+    ],
+    [
+    	'--quiet',
+    	'-q',
+    	GetoptLong::NO_ARGUMENT,
+      	"Do not log messages to standard output."
+    ],
+    [
+    	'--usage',
+    	'-h',
+    	GetoptLong::NO_ARGUMENT,
+      	"Display usage."
+    ],
+    [
+    	'--version',
+    	'-V',
+    	GetoptLong::NO_ARGUMENT,
+      	"Display the program version."
+    ],
+    [
+    	'--force-migrations',
+    	'-f',
+    	GetoptLong::NO_ARGUMENT,
+      	"Force the creation of migration files when they are not present"
+    ],
+    [
+    	'--save-migration-data',
+    	'-s',
+    	GetoptLong::NO_ARGUMENT,
+      	"Save migration data in yaml files when migrating downwards, needs migration_data_dumper plugin"
+    ],
   ]
 
   # Create a DBModelApp object.
@@ -94,6 +126,10 @@ class DBD4Import
     when '--version'
       puts "dbmodel, version #{DBD4VERSION}"
       exit
+    when '--force-migrations'
+      $force_migrations = true
+    when '--save-migration-data'
+      $save_migration_data = true
     else
       fail "Unknown option: #{opt}"
     end

data/lib/dbd4/rails_migration_file.rb

@@ -44,7 +44,7 @@ module DBD4
         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
-          if @virtual == true
+          if @virtual == true or $force_migrations == true
             cmdline = ['migration', "create_" + Inflector.underscore(Inflector.camelize(@tablename)) ]            
             puts "Calling generator: #{cmdline.join(' ')}"
             Rails::Generator::Scripts::Generate.new.run(cmdline)
@@ -114,15 +114,23 @@ module DBD4
     def update(table)
       raise "MigrationFile : migration file name not given" if ! @migrationfile 
       c = Inflector.camelize(@tablename)
+      
+      if $save_migration_data
+        extra_up_options = "restore_table_from_fixture(\"#{@tablename}\")"
+        extra_down_options = "save_table_to_fixture(\"#{@tablename}\")"
+      end
+      
       new_migration_file_content = <<"MIGRATIONFILE"
 class Create#{c} < ActiveRecord::Migration
   def self.up
     create_table :#{@tablename} do |t|
 #{columnsToString(table)}
     end
+    #{extra_up_options}
   end
   
   def self.down
+    #{extra_down_options}
     drop_table :#{@tablename}
   end
 end
@@ -139,16 +147,25 @@ MIGRATIONFILE
     def update_implicit_join_table(relation)
       raise "MigrationFile : migration file name not given" if ! @migrationfile 
       c = Inflector.camelize(@tablename)
+      
+      if $save_migration_data
+        extra_up_options = "restore_table_from_fixture(\"#{@tablename}\")"
+        extra_down_options = "save_table_to_fixture(\"#{@tablename}\")"
+      end
+      
       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
+      t.column :position, :integer, :default => nil
     end
+    #{extra_up_options}
   end
-  
+
   def self.down
+    #{extra_down_options}
     drop_table :#{@tablename}
   end
 end
@@ -165,19 +182,27 @@ MIGRATIONFILE
     def update_acts_as_graph_table(relation)
       raise "MigrationFile : migration file name not given" if ! @migrationfile 
       c = Inflector.camelize(@tablename)
+      
+      if $save_migration_data
+        extra_up_options = "restore_table_from_fixture(\"#{@tablename}\")"
+        extra_down_options = "save_table_to_fixture(\"#{@tablename}\")"
+      end
+      
       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
+      t.column :parent_id, :integer, :default => 0, :null => false
+      t.column :child_id, :integer, :default => 0, :null => false
     end
+    #{extra_up_options}
   end
-  
+
   def self.down
+    #{extra_down_options}
     drop_table :#{@tablename}
   end
-end       
+end
 MIGRATIONFILE
 
       old_migration_file_content = IO.readlines(@migrationfile).join("")

data/lib/dbd4/rails_model_file.rb

@@ -112,14 +112,26 @@ module DBD4
           else
             @elements['table_name'] = { :start => i, :name => $~[1] }
           end
-        elsif l.match(/^\s*acts_as_graph\s+\{\}\s+$/)
+        elsif l.match(/^\s*acts_as_graph\(\{\}\)\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
+          if @elements['acts_as_graph'][""]
+            @warnings << "Warning in file #{@modelfile} at line #{i + 1}:"
+            @warnings << "  Duplicate acts_as_graph declaration, it is already defined at line #{@elements['acts_as_graph'][table_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|belongs_to|def|end|acts_as)/)
+              @lines[i] = "#" + @lines[i] if @lines[i] !~ /^\s*#/
+              i += 1
+            end
+          else
+            r = @elements['acts_as_graph'][""] = { :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
           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]
@@ -140,7 +152,7 @@ module DBD4
             r[:foreign_key] = $~ if l.match(/:foreign_key\s*=>\s*["']([a-zA-Z_0-9]+)/)
             r[:polymorphic] = $~ if l.match(/:polymorphic\s*=>\s*true/)
             r[:join_table] = $~ if l.match(/:join_table\s*=>\s*["']([a-zA-Z_0-9]+)/)
-            r[:as] = $~ if l.match(/:as\s*=>\s*([a-zA-Z_0-9]+)/)
+            r[:as] = $~ if l.match(/:as\s*=>\s*:([a-zA-Z_0-9]+)/)
             r[:association_foreign_key] = $~ if l.match(/:association_foreign_key\s*=>\s*["']([a-zA-Z_0-9]+)/)
   
             i += 1
@@ -149,7 +161,7 @@ module DBD4
               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]+)/)
+              r[:as] = $~ if l2.match(/:as\s*=>\s*:([a-zA-Z_0-9]+)/)
               r[:join_table] = $~ if l2.match(/:join_table\s*=>\s*["']([a-zA-Z_0-9]+)/)
               r[:association_foreign_key] = $~ if l2.match(/:association_foreign_key\s*=>\s*["']([a-zA-Z_0-9]+)/)
               r[:end] = i
@@ -188,7 +200,9 @@ module DBD4
       
       table.relation_starts.each_value do |r|
         dname = ""
-        if r.type == :one2one
+        if r.type == :acts_as_graph
+          dname = ""
+        elsif r.type == :one2one
           dname = r.destination_table.modelname
         else
           dname = r.destination_table.name
@@ -207,11 +221,11 @@ module DBD4
           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}")
+                @lines[i].sub!(/(:as\s*=>\s*:)[a-zA-Z_0-9]+/, "\\1#{r.destination_column.polymorphic}")
               end
             else
               for i in (element[:start] .. element[:end])
-                @lines[i].sub!(/,\s*:as\s*=>\s*["']?[a-zA-Z_0-9]+["']?/, "")
+                @lines[i].sub!(/,\s*:as\s*=>\s*:[a-zA-Z_0-9]+/, "")
               end
             end
           else
@@ -222,12 +236,12 @@ module DBD4
           left_over[etype].delete(dname)  
         else
           if r.type == :acts_as_graph
-            @lines[@elements['class'][:start]] += "  #{etype} {}"
+            @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}"
+            @lines[@elements['class'][:start]] += ", :as => :#{r.destination_column.polymorphic}"
           end
           @lines[@elements['class'][:start]] += "\n"
         end

metadata

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