drysql 0.2.0 → 0.2.1

data/lib/associations.rb

@@ -21,9 +21,7 @@ module ActiveRecord
         logger.info("DRYSQL >> Cleared cached schema for: #{self}")
       end
       
-      def is_associated_with(class_name_symbol)
-        !(reflections.detect {|key, reflection| key.to_s.singularize == class_name_symbol.to_s.singularize}).nil?
-      end
+
       
       private
       
@@ -31,7 +29,7 @@ module ActiveRecord
         def generate_belongs_to_associations
           foreign_keys = table_constraints.select {|constraint| constraint.foreign_key?}
           foreign_keys.each do |foreign_key| 
-            belongs_to_class_name = (class_name(foreign_key.referenced_table_name)).downcaseFirstLetter
+            belongs_to_class_name = association_class_name_from_table_name(class_name(foreign_key.referenced_table_name))
             self.send(:belongs_to, :"#{belongs_to_class_name}", :foreign_key=>foreign_key.column_name.to_a[0])
             logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} belongs_to :#{belongs_to_class_name}, :foreign_key=>#{foreign_key.column_name.to_a[0]}")
           end
@@ -42,11 +40,11 @@ module ActiveRecord
         def generate_has_many_associations
           foreign_constraints.each do |foreign_constraint|
             if foreign_constraint_column_is_unique?(foreign_constraint)
-              has_one_class_name = (class_name(foreign_constraint.table_name)).downcaseFirstLetter
+              has_one_class_name = association_class_name_from_table_name(class_name(foreign_constraint.table_name))
               self.send(:has_one, :"#{has_one_class_name}", :foreign_key=>foreign_constraint.column_name.to_a[0])
               logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_one :#{has_one_class_name}, :foreign_key=>#{foreign_constraint.column_name.to_a[0]}")
             else
-              has_many_class_name = (class_name(foreign_constraint.table_name)).downcaseFirstLetter.pluralize
+              has_many_class_name = association_class_name_from_table_name(class_name(foreign_constraint.table_name)).pluralize
               self.send(:has_many, :"#{has_many_class_name}", :foreign_key=>foreign_constraint.column_name.to_a[0])
               logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_many :#{has_many_class_name}, :foreign_key=>#{foreign_constraint.column_name.to_a[0]}")
             end
@@ -80,15 +78,25 @@ module ActiveRecord
           has_many_associations.each do |association|
             # FIXME the singularization is a hack. We should be able to figure the exact class name without relying
             #            on naming conventions
-            foreign_class = instance_eval(association[0].to_s.camelize.singularize)
+            foreign_class = instance_eval(association[0].to_s.camelize.singularize)            
             eligible_foreign_keys = foreign_class.table_constraints.select {|c| c.foreign_key? && c.referenced_table_name.upcase != table_name.upcase}
-            eligible_foreign_keys.select {|key| !self.is_associated_with(symbolized_class_name_from_table_name(key.referenced_table_name))}.each do |fk|
-              has_many_class_name = pluralized_symbolized_class_name_from_table_name(fk.referenced_table_name)
-              self.send(:has_many, has_many_class_name, :through=>association[0])
-              logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_many #{has_many_class_name}, :through=>#{association[0]}")             
+            eligible_foreign_keys.select {|key| !is_associated_with(association_class_name_from_table_name(key.referenced_table_name))}.each do |fk|
+              has_many_class_name = association_class_name_from_table_name(class_name(fk.referenced_table_name)).pluralize
+              self.send(:has_many, :"#{has_many_class_name}", :through=>association[0])
+              logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_many :#{has_many_class_name}, :through=>:#{association[0]}")             
             end
           end
         end
+        
+        
+        def is_associated_with(class_name_symbol)
+          !(reflections.detect {|key, reflection| key.to_s.singularize == class_name_symbol.to_s.singularize}).nil?
+        end
+        
+        
+        def association_class_name_from_table_name(table_name)
+          Inflector.underscore(Inflector.demodulize(class_name(table_name)))
+        end
       
     end  # end of class methods
   

data/lib/base.rb

@@ -156,14 +156,6 @@ module ActiveRecord
           reflections.select {|key, reflection| reflection.macro == :has_many}
         end
         
-        def symbolized_class_name_from_table_name(table_name)
-          (class_name(table_name)).downcaseFirstLetter.to_sym
-        end
-      
-        def pluralized_symbolized_class_name_from_table_name(table_name)
-          (class_name(table_name)).downcaseFirstLetter.pluralize.to_sym
-        end
-        
         def construct_table_name_from_class_name(class_name)
           name = "#{table_name_prefix}#{undecorated_table_name(class_name)}#{table_name_suffix}"
         end

data/lib/connection_adapters/oracle_adapter.rb

@@ -93,25 +93,28 @@ module ActiveRecord
       end
     
       def constraints(table_name, name = nil)#:nodoc:
-        constraints = []       
+        constraints = []    
+        upcase_table_name = table_name.upcase   
         sql = "select UC.constraint_name, UC.constraint_type, UC.table_name, COL.column_name, \
           REF.r_constraint_name as referenced_constraint_name, REF.constraint_name as foreign_constraint_name, \
           REF.delete_rule as foreign_delete_rule, COLREF.table_name as foreign_table_name, COLREF.column_name as foreign_column_name from \
           (select owner, constraint_name, constraint_type, table_name, r_owner, r_constraint_name \
-          from all_constraints where table_name='#{table_name}') UC inner join \
-          (select constraint_name, table_name, column_name from all_cons_columns where table_name='#{table_name}') COL on \
+          from all_constraints where table_name='#{upcase_table_name}') UC inner join \
+          (select constraint_name, table_name, column_name from all_cons_columns where table_name='#{upcase_table_name}') COL on \
           (COL.constraint_name = UC.constraint_name) left join all_constraints REF on \
           (UC.constraint_name=REF.constraint_name OR UC.constraint_name=REF.r_constraint_name) left join all_cons_columns COLREF on \
-          (not COLREF.table_name='#{table_name}' AND (REF.constraint_name=COLREF.constraint_name OR REF.r_constraint_name=COLREF.constraint_name))"
+          (not COLREF.table_name='#{upcase_table_name}' AND (REF.constraint_name=COLREF.constraint_name OR REF.r_constraint_name=COLREF.constraint_name))"
           
         results = select_all(sql, name)     
         constraint_name_hash = {}
         results.each do |row| 
           # The author(s) of the Oracle adapter chose to selectively downcase column names for
-          # "cleanliness" within our Rails code. I had to follow suit with constraint column names
+          # "cleanliness" within our Rails code. I had to follow suit with constraint column & table names
           # so that model objects could look up their data values using the generated column accessor methods
           column_name = oracle_downcase(row['column_name'])
           unless row['foreign_column_name'].nil? then row['foreign_column_name'] = oracle_downcase(row['foreign_column_name']) end
+          unless row['table_name'].nil? then row['table_name'] = oracle_downcase(row['table_name']) end
+          unless row['foreign_table_name'].nil? then row['foreign_table_name'] = oracle_downcase(row['foreign_table_name']) end
           constraint_name = row['constraint_name']
           foreign_constraint_name = row['foreign_constraint_name']
           

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: drysql
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-01-29 00:00:00 -05:00
+  version: 0.2.1
+date: 2007-02-08 00:00:00 -05:00
 summary: Dynamic, Reflective, Invisible Object-Relational Mapping for Ruby
 require_paths: 
 - lib
@@ -28,18 +28,18 @@ cert_chain:
 authors: 
 - Bryan Evans
 files: 
-- lib/validations.rb
-- lib/dependencies.rb
 - lib/associations.rb
-- lib/drysql.rb
 - lib/base.rb
+- lib/dependencies.rb
+- lib/drysql.rb
+- lib/validations.rb
 - lib/helpers/string.rb
-- lib/connection_adapters/postgresql_adapter.rb
+- lib/connection_adapters/abstract_adapter.rb
+- lib/connection_adapters/ibm_db2_adapter.rb
 - lib/connection_adapters/mysql_adapter.rb
 - lib/connection_adapters/oracle_adapter.rb
+- lib/connection_adapters/postgresql_adapter.rb
 - lib/connection_adapters/sqlserver_adapter.rb
-- lib/connection_adapters/abstract_adapter.rb
-- lib/connection_adapters/ibm_db2_adapter.rb
 - lib/connection_adapters/abstract/schema_definitions.rb
 - README
 test_files: []