drysql 0.1.3 → 0.1.4

data/lib/associations.rb

@@ -16,6 +16,11 @@ module ActiveRecord
         end
       end
       
+      def clear_cached_associations
+        @associations = nil
+        logger.info("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

data/lib/base.rb

@@ -48,8 +48,10 @@ 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
         primary_name = primary.column_name
         set_primary_key(primary_name)
+        logger.info("Identified PRIMARY KEY for #{self}: #{primary_name}")
         primary_name
       end
 
@@ -91,12 +93,23 @@ module ActiveRecord
       end
       
       def table_exists?(table_name=nil)
-         if connection.respond_to?(:tables)
-          connection.tables.include? construct_table_name_from_class_name(table_name)
+        if connection.respond_to?(:tables)
+          connection.tables.include? table_name
         else
           false
         end
       end
+      
+      def regenerate_cached_schema
+        clear_cached_associations
+        clear_cached_validations
+        @constraints = nil
+        @columns = nil
+        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}")
+      end
      
       
       private
@@ -121,10 +134,6 @@ module ActiveRecord
         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
       
     end  #end class << self  (Class Methods)
 

data/lib/connection_adapters/abstract_adapter.rb

@@ -6,10 +6,10 @@ module ActiveRecord
     # databases compatible with the ISO SQL:2003 information schema standard
     class AbstractTableConstraint
     
-      @@PRIMARY_KEY_TYPE = "PRIMARY KEY"
-      @@FOREIGN_KEY_TYPE = "FOREIGN KEY"
-      @@UNIQUE_KEY_TYPE = "UNIQUE"
-      @@CHECK_CONSTRAINT_TYPE = "CHECK"
+      PRIMARY_KEY_TYPE = "PRIMARY KEY"
+      FOREIGN_KEY_TYPE = "FOREIGN KEY"
+      UNIQUE_KEY_TYPE = "UNIQUE"
+      CHECK_CONSTRAINT_TYPE = "CHECK"
         
       attr_reader :constraint_catalog, :constraint_schema, :constraint_name, :constraint_type, 
         :table_catalog, :table_schema, :table_name, :column_name,
@@ -24,15 +24,15 @@ module ActiveRecord
       alias :initialize :raise_subclass_responsibility_error
       
       def primary_key?
-        constraint_type == @@PRIMARY_KEY_TYPE
+        constraint_type == PRIMARY_KEY_TYPE
       end
         
       def foreign_key?
-        constraint_type == @@FOREIGN_KEY_TYPE
+        constraint_type == FOREIGN_KEY_TYPE
       end
         
       def component_of_unique_key?
-        constraint_type == @@UNIQUE_KEY_TYPE
+        constraint_type == UNIQUE_KEY_TYPE
       end
       
       def unique_key?

data/lib/connection_adapters/oracle_adapter.rb

@@ -0,0 +1,120 @@
+module ActiveRecord
+
+  module ConnectionAdapters
+  
+    class OracleColumn < Column
+    
+      attr_accessor :primary_key
+    
+      def default_specified?
+        !default.nil?
+      end
+      
+      # The only means that Oracle currently provides for auto-generating a column
+      # is to define a sequence and a trigger on insert that inserts sequence.nextval
+      # 
+      # As a result of this, there is no reliable way to determine whether a particular
+      # column is generated by the DB.
+      # 
+      # DrySQL currently makes the assumption that a column is auto-generated 
+      # if the column is of type integer and is the primary key for the table
+      # 
+      # Ideally a future release of Oracle will support declaring a default value 
+      # of sequence.nextval for a column, which will eliminate this problem.
+      def generated?
+        @type == :integer && @primary_key == true
+      end
+    
+    end
+  
+    class OracleConstraint < AbstractTableConstraint
+    
+      PRIMARY_KEY_TYPE = "P"
+      FOREIGN_KEY_TYPE = "R"
+      UNIQUE_KEY_TYPE = "U"
+      CHECK_CONSTRAINT_TYPE = "C"
+    
+      def initialize(constraint_catalog, constraint_schema, constraint_name, table_schema, table_name, constraint_type,
+        column_name, referenced_table_schema, referenced_table_name, referenced_column_name)
+        @constraint_catalog = constraint_catalog
+        @constraint_schema = constraint_schema
+        @constraint_name = constraint_name
+        @table_schema = table_schema
+        @table_name = table_name
+        @constraint_type = constraint_type
+        @column_name = column_name
+        @referenced_table_schema = referenced_table_schema
+        @referenced_table_name = referenced_table_name
+        @referenced_column_name = referenced_column_name
+      end
+      
+      def primary_key?
+        constraint_type == PRIMARY_KEY_TYPE
+      end
+        
+      def foreign_key?
+        constraint_type == FOREIGN_KEY_TYPE
+      end
+        
+      def component_of_unique_key?
+        constraint_type == UNIQUE_KEY_TYPE
+      end
+    
+    end
+  
+    class OracleAdapter < AbstractAdapter
+    
+      alias :base_columns :columns
+      def columns(table_name, name = nil) #:nodoc:
+        columns = base_columns(table_name)
+        
+        # This is a hack. Once Oracle offers a better means of auto-generating IDs,
+        # this will be fixed
+        # FIXME must be fixed once composite primary keys are supported
+        sql = "select t1.column_name from all_cons_columns t1 inner join all_constraints t2 on \
+        (t1.owner = t2.owner AND t1.constraint_name = t2.constraint_name) where t1.table_name='#{table_name}' and t2.constraint_type='P'"
+        primary_key_column_name = select_one(sql, "Primary Key")['column_name']
+
+        columns.each do |column|
+          column.primary_key=(oracle_downcase(primary_key_column_name) == column.name)
+        end
+      end
+    
+      def constraints(table_name, name = nil)#:nodoc:
+        constraints = []       
+        sql = "select t1.owner, t1.constraint_name, t1.constraint_type, t1.table_name, t1.r_owner, t1.r_constraint_name, \
+          t1.delete_rule, t2.column_name, t3.table_name as r_table_name, t3.column_name as r_column_name from all_constraints t1 \
+          inner join all_cons_columns t2 on ( t1.owner = t2.owner AND t1.constraint_name = t2.constraint_name) left outer join \
+          all_cons_columns t3 on (t1.r_owner = t3.owner AND t1.r_constraint_name = t3.constraint_name) where \
+          t1.table_name='#{table_name}' or t3.table_name='#{table_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
+          # so that model objects could look up their data values using the generated column accessor methods
+          row['column_name'] = oracle_downcase(row['column_name'])
+          unless row['r_column_name'].nil? then row['r_column_name'] = oracle_downcase(row['r_column_name']) end
+          
+          constraints << OracleConstraint.new(nil, row['owner'], row['constraint_name'], row['owner'], row['table_name'], 
+            row['constraint_type'], row['column_name'], row['r_owner'], row['r_table_name'], row['r_column_name'])
+          comparable_constraint_name = row['constraint_name'].upcase
+          constraint_name_count = constraint_name_hash[comparable_constraint_name]
+          constraint_name_count ? 
+            constraint_name_hash[comparable_constraint_name] = constraint_name_count + 1 :
+            constraint_name_hash[comparable_constraint_name] = 1
+        end
+        
+        constraints.each do | constraint|
+          constraint.member_of_composite=(constraint_name_hash[constraint.constraint_name.upcase] > 1)
+        end
+        constraints       
+      end
+         
+    end
+    
+  end
+  
+end

data/lib/connection_adapters/postgresql_adapter.rb

@@ -38,6 +38,9 @@ module ActiveRecord
     
     class PostgreSQLAdapter < AbstractAdapter
     
+      # FIXME
+      # patch postgresql_adapter so I don't need to re-define columns here in order
+      # to get sufficient column metadata
       def columns(table_name, name = nil) #:nodoc:
         columns = []
         column_definitions(table_name).each do |name, type, default, notnull, typmod|

data/lib/drysql.rb

@@ -7,6 +7,7 @@ require 'connection_adapters/abstract_adapter'
 require 'connection_adapters/mysql_adapter'
 require 'connection_adapters/postgresql_adapter'
 require 'connection_adapters/sqlserver_adapter'
+require 'connection_adapters/oracle_adapter'
 require 'connection_adapters/abstract/schema_definitions'
 require 'associations'
 require 'validations'

data/lib/validations.rb

@@ -99,7 +99,11 @@ module ActiveRecord
         @validations=true
       end
       
-        
+      def clear_cached_validations
+        @validations = nil
+        logger.info("Cleared cached validations for: #{self}")
+      end
+            
     end    # end of class methods
     
   end   # end of class Base

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: drysql
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-11-16 00:00:00 -05:00
+  version: 0.1.4
+date: 2006-11-26 00:00:00 -05:00
 summary: Dynamic, Reflective, Invisible Object-Relational Mapping for Ruby
 require_paths: 
 - lib
@@ -28,16 +28,17 @@ 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/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/abstract/schema_definitions.rb
 - README
 test_files: []