alexrothenberg-legacy_data 0.0.9 → 0.0.10

data/README.rdoc

@@ -24,7 +24,7 @@ Examples:
 * Configure your application to connect to your existing Oracle database.  Get the connect connect string from your dba (something like: user/password@server.example.com:1541/sid.world) and edit your config/database.yml
 development:
   adapter: oracle_enhanced
-  database: server.example.com:1541/sid.world
+  database: server.example.com:1541/my_database.world
   username: user
   password: password
 * Generate models for all existing tables

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/generators/models_from_tables/templates/model.rb

@@ -3,13 +3,13 @@ class <%= class_name -%> < ActiveRecord::Base
   <%= "set_primary_key #{primary_key.to_sym.inspect}" if primary_key %>
   
   # Relationships
-  <%- relations[:has_some               ].each do |table_name, foreign_key| 
-  -%>  has_many                <%= LegacyData::TableClassNameMapper.class_name_for(table_name).underscore.pluralize.to_sym.inspect %>, :foreign_key => <%= foreign_key.inspect %>
+  <%- relations[:has_some               ].each do |table_name, options| 
+  -%>  has_many                <%= LegacyData::TableClassNameMapper.class_name_for(table_name).underscore.pluralize.to_sym.inspect %><% options.each {|key, value| %>, <%="#{key.inspect} => #{value.inspect} "%> <%} %>
   <%- end -%>
   <%- relations[:belongs_to             ].each do |table_name, foreign_key| 
   -%>  belongs_to              <%= LegacyData::TableClassNameMapper.class_name_for(table_name).underscore.to_sym.inspect           %>, :foreign_key => <%= foreign_key.inspect %>
   <%- end -%>
-  <%- relations[:has_and_belongs_to_many].each do |table_name, options|  
+  <%- relations[:has_and_belongs_to_many].each do |table_name, opts|  
   -%>  has_and_belongs_to_many <%= LegacyData::TableClassNameMapper.class_name_for(table_name).underscore.pluralize.to_sym.inspect %>, :foreign_key => <%= options[:foreign_key].inspect%>, :association_foreign_key => <%= options[:association_foreign_key].inspect%>, :join_table => <%= options[:join_table].inspect %>
   <%- end -%>
 

data/legacy_data.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{legacy_data}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Rothenberg"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-24}
   s.description = %q{Create ActiveRecord models from an existing database}
   s.email = %q{alex@alexrothenberg.com}
   s.extra_rdoc_files = [

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -20,7 +20,7 @@ module OracleEnhancedAdapterConstraintsMethods
 
     # RSI: changed select from all_constraints to user_constraints - much faster in large data dictionaries
     fks = select_rows(<<-SQL, 'Remote Foriegn Keys')
-      select c.table_name, cc.column_name
+      select c.table_name, cc.column_name, c.delete_rule 
         from user_constraints c, user_constraints parent_c, user_cons_columns cc
       where c.owner = '#{owner}'
         and parent_c.table_name = '#{table_name}'
@@ -29,6 +29,17 @@ module OracleEnhancedAdapterConstraintsMethods
         and cc.owner = c.owner
         and cc.constraint_name = c.constraint_name
     SQL
+    fks.map do |row| 
+      dependent = case row[3] 
+        when 'CASCADE'
+          :destroy
+        when 'SET NULL'
+          :nullify
+        end
+      options = {:to_table => row[0].downcase, :foreign_key =>row[1].downcase.to_sym }
+      options[:dependent] = dependent unless dependent.nil?
+      options
+    end
   end
 
   def constraints(table_name)

data/lib/legacy_data/schema.rb

@@ -105,7 +105,7 @@ module LegacyData
 
       has_some = {}
       connection.foreign_keys_of(table_name).each do |relation|
-        has_some[relation.first.downcase] = relation.second.downcase.to_sym
+        has_some[relation.delete(:to_table).downcase] = relation
       end
       has_some
     end

data/lib/legacy_data/table_definition.rb

@@ -34,7 +34,7 @@ module LegacyData
       other_table_name = join_table.belongs_to_tables.detect {|table_name| table_name != self.table_name}
       relations[:has_and_belongs_to_many][other_table_name] = { :foreign_key            =>join_table.belongs_to_relations[table_name], 
                                                                 :association_foreign_key=>join_table.belongs_to_relations[other_table_name],
-                                                                :join_table             =>join_table.table_name }
+                                                                :join_table             =>join_table.table_name.to_sym }
       relations[:has_some].delete(join_table.table_name)                                                          
     end
   end

data/spec/legacy_data/schema_spec.rb

@@ -91,8 +91,10 @@ describe LegacyData::Schema do
   
       it 'should get all "has_some" (has_many and has_one) relationships when my primary key is the foreign key in another table ' do
         @connection.should_receive(:respond_to?).with(:foreign_keys_of).and_return(true)
-        @connection.should_receive(:foreign_keys_of).and_return([['OTHER_TABLE', 'PK'], ['THE_TABLE', 'PK']])
-        @schema.has_some_relations.should == {'other_table' => :pk, 'the_table' => :pk}
+        @connection.should_receive(:foreign_keys_of).and_return([ {:to_table=>'other_table', :foreign_key=>:pk, :dependent=>:destroy}, 
+                                                                  {:to_table=>'the_table',   :foreign_key=>:pk, :dependent=>:destroy} ])
+        @schema.has_some_relations.should == {'other_table' => {:foreign_key=>:pk, :dependent=>:destroy}, 
+                                              'the_table' => {:foreign_key=>:pk, :dependent=>:destroy}}
       end
   
       it 'should give no "belongs_to" when the adapter does not support foreign keys' do

data/spec/legacy_data/table_definition_spec.rb

@@ -59,7 +59,7 @@ describe LegacyData::TableDefinition do
         @posts.convert_has_many_to_habtm(@tag_posts)
         
         @posts.relations[:has_some               ].should == {}
-        @posts.relations[:has_and_belongs_to_many].should == {'tags' => {:foreign_key=>:posts_id, :association_foreign_key=>:tags_id, :join_table=>"tag_posts"} }
+        @posts.relations[:has_and_belongs_to_many].should == {'tags' => {:foreign_key=>:posts_id, :association_foreign_key=>:tags_id, :join_table=>:tag_posts} }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexrothenberg-legacy_data
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Alex Rothenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency