drysql 0.1.6 → 0.1.7

data/lib/associations.rb

@@ -18,7 +18,7 @@ module ActiveRecord
       
       def clear_cached_associations
         @associations = nil
-        logger.info("Cleared cached schema for: #{self}")
+        logger.info("DRYSQL >> Cleared cached schema for: #{self}")
       end
       
       def is_associated_with(class_name_symbol)
@@ -31,9 +31,9 @@ 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.upcase)).downcaseFirstLetter
+            belongs_to_class_name = (class_name(foreign_key.referenced_table_name)).downcaseFirstLetter
             self.send(:belongs_to, :"#{belongs_to_class_name}", :foreign_key=>foreign_key.column_name)
-            logger.info("GENERATED ASSOCIATION: #{self.name} belongs_to :#{belongs_to_class_name}, :foreign_key=>#{foreign_key.column_name}")
+            logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} belongs_to :#{belongs_to_class_name}, :foreign_key=>#{foreign_key.column_name}")
           end
         end
         
@@ -42,19 +42,19 @@ 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.upcase)).downcaseFirstLetter
+              has_one_class_name = (class_name(foreign_constraint.table_name)).downcaseFirstLetter
               self.send(:has_one, :"#{has_one_class_name}", :foreign_key=>foreign_constraint.referenced_column_name)
-              logger.info("GENERATED ASSOCIATION: #{self.name} has_one :#{has_one_class_name}, :foreign_key=>#{foreign_constraint.referenced_column_name}")
+              logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_one :#{has_one_class_name}, :foreign_key=>#{foreign_constraint.referenced_column_name}")
             else
-              has_many_class_name = (class_name(foreign_constraint.table_name.upcase)).downcaseFirstLetter.pluralize
+              has_many_class_name = (class_name(foreign_constraint.table_name)).downcaseFirstLetter.pluralize
               self.send(:has_many, :"#{has_many_class_name}", :foreign_key=>foreign_constraint.referenced_column_name)
-              logger.info("GENERATED ASSOCIATION: #{self.name} has_many :#{has_many_class_name}, :foreign_key=>#{foreign_constraint.referenced_column_name}")
+              logger.info("DRYSQL >> GENERATED ASSOCIATION: #{self.name} has_many :#{has_many_class_name}, :foreign_key=>#{foreign_constraint.referenced_column_name}")
             end
           end
         end
         
         def foreign_constraint_column_is_unique?(constraint)
-          class_name = class_name(constraint.table_name.upcase)
+          class_name = class_name(constraint.table_name)
           klass = instance_eval(class_name)
           constraints_on_given_column = klass.table_constraints.select {|current| current.column_name == constraint.column_name}
           constraints_on_given_column.any? {|current| current.unique_key?}
@@ -83,7 +83,7 @@ module ActiveRecord
             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("GENERATED ASSOCIATION: #{self.name} 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

data/lib/base.rb

@@ -48,17 +48,17 @@ module ActiveRecord
       # ---------------------------------------------------------------------------------------------------
       def primary_key
         primary = table_constraints.detect {|constraint| constraint.primary_key?}
-        if primary.nil? then logger.error("No primary key defined for table #{table_name}") end
+        if primary.nil? then logger.error("DRYSQL >> No primary key defined for table #{table_name}") end
         primary_name = primary.column_name
         set_primary_key(primary_name)
-        logger.info("Identified PRIMARY KEY for #{self}: #{primary_name}")
+        logger.info("DRYSQL >> Identified PRIMARY KEY for #{self}: #{primary_name}")
         primary_name
       end
 
    
       alias :base_class_name :class_name
       def class_name(table_name = table_name) # :nodoc:
-        #Attempt to retrieve class name from cache before attempting to generate it         
+        #Attempt to retrieve class name from cache before attempting to generate it       
         name = @@class_name_hash[table_name.upcase]
         if !name
           return base_class_name(table_name)
@@ -112,7 +112,7 @@ module ActiveRecord
         primary = table_constraints.detect {|constraint| constraint.primary_key?}
         primary_name = primary.column_name
         set_primary_key(primary_name)
-        logger.info("Reset PRIMARY KEY for #{self}: #{primary_name}")
+        logger.info("DRYSQL >> Reset PRIMARY KEY for #{self}: #{primary_name}")
       end
      
       

data/lib/dependencies.rb

@@ -19,9 +19,9 @@ class Module #:nodoc:
       end_class_def
       if ActiveRecord::Base.table_exists?(class_id)
         eval(class_def, TOPLEVEL_BINDING)     
-        ActiveRecord::Base.logger.info("GENERATED CLASS: #{class_id} < ActiveRecord::Base")     
+        ActiveRecord::Base.logger.info("DRYSQL >> GENERATED CLASS: #{class_id} < ActiveRecord::Base")     
       else 
-        ActiveRecord::Base.logger.error("No matching table could be found for class: #{class_id}")
+        ActiveRecord::Base.logger.error("DRYSQL >> No matching table could be found for class: #{class_id}")
         raise NameError     
       end      
     end

data/lib/validations.rb

@@ -77,21 +77,21 @@ module ActiveRecord
             
             if !(column.null || column.default_specified? || column.generated?)
               self.validates_nullability_of column.name
-              logger.info("GENERATED VALIDATION: #{self.name} validates_nullability_of #{column.name}")
+              logger.info("DRYSQL >> GENERATED VALIDATION: #{self.name} validates_nullability_of #{column.name}")
             end
             
             if column.type == :integer   
               self.validates_numericality_of column.name, :allow_nil => true, :only_integer => true
-              logger.info("GENERATED VALIDATION: #{self.name} validates_numericality_of #{column.name}, :allow_nil=>true, :only_integer=>true")
+              logger.info("DRYSQL >> GENERATED VALIDATION: #{self.name} validates_numericality_of #{column.name}, :allow_nil=>true, :only_integer=>true")
             elsif column.number?
               self.validates_numericality_of column.name, :allow_nil => true
-              logger.info("GENERATED VALIDATION: #{self.name} validates_numericality_of #{column.name}, :allow_nil=>true")
+              logger.info("DRYSQL >> GENERATED VALIDATION: #{self.name} validates_numericality_of #{column.name}, :allow_nil=>true")
             elsif column.text? && column.limit
               self.validates_length_of column.name, :allow_nil => true, :maximum => column.limit
-              logger.info("GENERATED VALIDATION: #{self.name} validates_length_of #{column.name}, :allow_nil=>true, :maximum=>#{column.limit}")
+              logger.info("DRYSQL >> GENERATED VALIDATION: #{self.name} validates_length_of #{column.name}, :allow_nil=>true, :maximum=>#{column.limit}")
             elsif column.type == :boolean
               self.validates_inclusion_of column.name, :in => [true, false], :allow_nil =>true, :message => ActiveRecord::Errors.default_error_messages[:inclusion]
-              logger.info("GENERATED VALIDATION: #{self.name} validates_inclusion_of #{column.name}, :in=>[true, false], \
+              logger.info("DRYSQL >> GENERATED VALIDATION: #{self.name} validates_inclusion_of #{column.name}, :in=>[true, false], \
                 :allow_nil=>true, :message=>ActiveRecord::Errors.default_error_messages[:inclusion]")
             end
           end         
@@ -101,7 +101,7 @@ module ActiveRecord
       
       def clear_cached_validations
         @validations = nil
-        logger.info("Cleared cached validations for: #{self}")
+        logger.info("DRYSQL >> Cleared cached validations for: #{self}")
       end
             
     end    # end of class methods

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: drysql
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 date: 2006-12-13 00:00:00 -05:00
 summary: Dynamic, Reflective, Invisible Object-Relational Mapping for Ruby
 require_paths: