drysql 0.1.8 → 0.2.0

data/README

@@ -113,7 +113,7 @@ by the DB.
 I did not publish the tests with the first release of DrySQL because they are built on a clone of a corporate database, and I need to obfuscate them first.
 I will publish tests with the next release
 
-Enjoy!
+Enjoy, and please give me your feedback!
 
 
 

data/lib/associations.rb

@@ -32,8 +32,8 @@ module ActiveRecord
           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
-            self.send(: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}")
+            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
         end
         
@@ -43,12 +43,12 @@ module ActiveRecord
           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
-              self.send(: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}")
+              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
-              self.send(: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}")
+              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
           end
         end
@@ -56,7 +56,9 @@ module ActiveRecord
         def foreign_constraint_column_is_unique?(constraint)
           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}
+          # FIXME Is there a more efficient way of doing this?
+          # The uniqueness check requires that all constraints for each table that references the current table must be retrieved
+          constraints_on_given_column = klass.table_constraints.select {|current| current.column_name.include?(constraint.column_name.to_a[0])}
           constraints_on_given_column.any? {|current| current.unique_key?}
         end
         
@@ -92,4 +94,26 @@ module ActiveRecord
   
   end   # end of class Base
 
+
+  module Associations
+  
+    module ClassMethods
+    
+      class JoinDependency # :nodoc:
+      
+        # Intercept initialization of JoinDependency objects
+        # in order to ensure that associations have been generated
+        # before we attempt to create joins for eager loading
+        alias :base_initialize :initialize
+        def initialize(base, associations, joins)
+          base.generate_associations
+          base_initialize(base, associations, joins)
+        end
+        
+      end
+      
+    end # end of class JoinDependency
+    
+  end # end of module Associations
+
 end   # end of module ActiveRecord

data/lib/base.rb

@@ -48,10 +48,13 @@ module ActiveRecord
       # ---------------------------------------------------------------------------------------------------
       def primary_key
         primary = table_constraints.detect {|constraint| constraint.primary_key?}
-        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("DRYSQL >> Identified PRIMARY KEY for #{self}: #{primary_name}")
+        if primary.nil?
+          logger.error("DRYSQL >> No primary key defined for table #{table_name}") 
+        else 
+          primary_name = primary.column_name.to_a[0]
+          set_primary_key(primary_name)
+          logger.info("DRYSQL >> Identified PRIMARY KEY for #{self}: #{primary_name}")
+        end
         primary_name
       end
 
@@ -76,16 +79,13 @@ module ActiveRecord
            
       # table_constraints are those constraints defined on this table
       def table_constraints
-        constraints.select {|constraint| constraint.referenced_table_name.nil? || constraint.table_name.upcase == table_name.upcase}
+        constraints.reject {|constraint| constraint.is_foreign_constraint?(table_name)}
       end
       
       # foreign_constraints are those constraints that are defined on other tables, but 
       # reference this table (i.e. FKs into this table)
-      def foreign_constraints      
-        constraints.select {|constraint| 
-            !constraint.referenced_table_name.nil? && 
-            constraint.referenced_table_name.upcase == table_name.upcase &&
-            constraint.table_name.upcase != table_name.upcase}
+      def foreign_constraints     
+        constraints.select {|constraint| constraint.is_foreign_constraint?(table_name)}
       end
       
       def associations
@@ -114,6 +114,31 @@ module ActiveRecord
         set_primary_key(primary_name)
         logger.info("DRYSQL >> Reset PRIMARY KEY for #{self}: #{primary_name}")
       end
+      
+      
+      # This method will generate associations and validations for all defined
+      # subclasses of ActiveRecord::Base.
+      # 
+      # If any of the constraints processed refer to undefined model classes,
+      # these classes will be defined as long as they conform to the ActiveRecord
+      # naming conventions.
+      # 
+      # This method swallows exceptions that occur during the generation of associations
+      # and validations, but logs these exceptions in detail to STDERR.  
+      def generate_orm
+        models = @@subclasses.to_a.flatten.uniq
+        models.each do |model|
+          begin
+            if model != Base
+              model.generate_associations
+              model.generate_validations
+            end
+          rescue Exception
+            logger.error("DRYSQL ERROR >> Could not generate ORM for #{model}")
+            logger.error($!.backtrace.join("\n"))
+          end
+        end
+      end
      
       
       private

data/lib/connection_adapters/abstract_adapter.rb

@@ -11,9 +11,8 @@ module ActiveRecord
       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,
-        :referenced_table_catalog, :referenced_table_schema, :referenced_table_name, :referenced_column_name
+      attr_reader :constraint_name, :constraint_type, :table_schema, :table_name, :column_name,
+        :referenced_table_name, :referenced_column_name
         
       attr_writer :member_of_composite
       
@@ -22,6 +21,7 @@ module ActiveRecord
       end  
       
       alias :initialize :raise_subclass_responsibility_error
+      alias :is_foreign_constraint? :raise_subclass_responsibility_error
       
       def primary_key?
         constraint_type == PRIMARY_KEY_TYPE
@@ -51,7 +51,7 @@ module ActiveRecord
       def constraints(table_name, name=nil)
         raise NotImplementedError, "AbstractAdapter subclass #{self.class} did not implement this method"
       end
-      
+
     end
   end
 end

data/lib/connection_adapters/ibm_db2_adapter.rb

@@ -0,0 +1,432 @@
+# Most of this code is borrowed from IBM's rails adapter,
+# which is authored by Antonio Cangiano
+# 
+# I have made modifications to the IBM adapter code to support DB2 iSeries
+# as well as to add features for DrySQL on DB2 LUW
+
+module ActiveRecord
+
+  # These extensions in ActiveRecord::Base are for iSeries support
+  class Base
+  
+    class << self
+    
+      alias_method :ibm_find_one, :find_one     
+      # Finds a record based on the +id+ value. The column associated with the primary key 
+      # can be of a numeric type however DB2 doesn't allow quoted numeric values (e.g WHERE id = '10'). 
+      # Therefore this overrides the default method to check for the column type,
+      # and leaves the value in the query unquoted in cases of numeric columns
+      def find_one(id, options)
+        # If the adapter in use is the IBM DB2 Adapter
+        if connection.kind_of?(ConnectionAdapters::IBM_DB2Adapter)
+          if !connection.iseries then return ibm_find_one(id, options) end
+          
+          conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
+          # Retrieves the sql type of the column associated to the primary key
+          cstmt = connection.execute("SELECT coltype FROM SYSCOLUMNS WHERE \
+          table_name ='#{table_name.upcase}' AND column_name ='#{primary_key.upcase}'")
+          DB2::fetch_row(cstmt)
+          primary_key_type = DB2::result(cstmt, 0)
+            
+          # Frees the results set associated with the statement
+          DB2::free_result(cstmt)
+            
+          # If the column is a numeric type
+          if primary_key_type =~ /int|double|real|decimal|numeric/i
+            # Assign the unquoted id value to san_id
+            san_id = sanitize_numeric(id)
+          else
+            # The column is not numeric, so +sanitize+ it
+            san_id = sanitize(id)
+          end 
+            
+          # Adds the options based on the san_id value
+          options.update :conditions => "#{table_name}.#{primary_key} = #{san_id}#{conditions}"
+            
+          if result = find_initial(options)
+              result
+          else
+              raise RecordNotFound, "Couldn't find #{name} with ID=#{id}#{conditions}"
+            end
+        else
+          # You're not using the IBM DB2 Adapter therefore the default method is recalled
+          default_find_one(id, options)      
+        end
+      end      
+
+        
+      alias_method :ibm_find_some, :find_some
+      # Finds a record based on a list of +ids+. The primary key column type could be numeric,
+      # and DB2 doesn't allow quoted numeric values. Therefore this version of the method 
+      # checks for the data type and if it's a numeric type the value in the query is unquoted.
+      # If the column datatype is not numeric, the value is properly quoted/sanitized
+      def find_some(ids, options)
+        # If the adapter in use is the IBM DB2 Adapter
+        if connection.kind_of?(ConnectionAdapters::IBM_DB2Adapter)
+          if !connection.iseries then return ibm_find_some(ids, options) end
+          
+          conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
+          # Retrieves the sql type of the column associated to the primary key
+          cstmt = connection.execute("SELECT typename FROM SYSCOLUMNS WHERE \
+          table_name ='#{table_name.upcase}' AND column_name ='#{primary_key.upcase}'")
+          DB2::fetch_row(cstmt)
+          primary_key_type = DB2::result(cstmt, 0)
+          
+          # Frees the results set associated with the statement
+          DB2::free_result(cstmt)
+          
+          # If the column is a numeric type
+          if primary_key_type =~ /int|double|real|decimal|numeric/i
+            # Generates a comma separated list of ids
+            ids_list   = ids.map {|id| sanitize_numeric(id) }.join(',')
+          else
+            # Generates a comma separated list of quoted/sanitized ids
+            ids_list   = ids.map { |id| sanitize(id) }.join(',')
+          end 
+          
+          # Adds the options to the query, based on the generated +ids_list+
+          options.update :conditions => "#{table_name}.#{primary_key} IN (#{ids_list})#{conditions}" 
+          
+          result = find_every(options)
+  
+          if result.size == ids.size
+            result
+          else
+            raise RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids_list})#{conditions}"
+          end
+        else
+          # You're not using the IBM DB2 Adapter therefore the default method is recalled
+          default_find_some(ids, options)
+        end
+      end
+    end  # class << self
+  end  # class Base
+
+
+  module ConnectionAdapters
+  
+    class IBM_DB2Column < Column
+      attr_accessor :generated, :default_specified
+      
+      def initialize(name, default, generated, sql_type = nil, null = true)
+        @name, @type, @null = name, simplified_type(sql_type), null
+        @text  = [:string, :text, :binary].include? @type
+        @sql_type = sql_type
+        # have to do this one separately because type_cast depends on #type
+        if !(default.nil? || default.blank?) then @default_specified = true end
+        @default = type_cast(default)
+        # Extracts the limit if it's a :string or :text type
+        @limit   = extract_limit(sql_type) if !sql_type.nil? && @text
+        @primary = nil
+        @number  = [:float, :integer].include? @type
+        @generated = generated
+      end
+    
+      def default_specified?
+        @default_specified
+      end
+      
+      def generated?
+        !(generated.nil? || generated.blank?)
+      end   
+    end
+    
+
+    class IBM_DB2Constraint < AbstractTableConstraint
+       
+      attr_reader :update_rule, :delete_rule, :referenced_constraint_name
+      
+      ISERIES_PRIMARY_KEY_TYPE = "P"
+      ISERIES_FOREIGN_KEY_TYPE = "F"
+      ISERIES_UNIQUE_KEY_TYPE = "U"
+      ISERIES_CHECK_CONSTRAINT_TYPE = "C"
+    
+      def initialize(constraint_schema, constraint_name, constraint_type, table_name, column_name,
+        referenced_constraint_name, referenced_table_name, referenced_column_name, delete_rule)
+        @constraint_schema = constraint_schema
+        @constraint_name = constraint_name
+        @table_name = table_name
+        @constraint_type = constraint_type
+        if !column_name.nil? then @column_name = Set.new [column_name.downcase] end
+        @referenced_table_name = referenced_table_name
+        @referenced_constraint_name = referenced_constraint_name
+        @delete_rule = delete_rule
+        if !referenced_column_name.nil? then @referenced_column_name = referenced_column_name.downcase end
+      end
+      
+      def primary_key?
+        constraint_type == PRIMARY_KEY_TYPE || constraint_type == ISERIES_PRIMARY_KEY_TYPE
+      end
+        
+      def foreign_key?
+        constraint_type == FOREIGN_KEY_TYPE || constraint_type == ISERIES_FOREIGN_KEY_TYPE
+      end
+        
+      def component_of_unique_key?
+        constraint_type == UNIQUE_KEY_TYPE || constraint_type == ISERIES_UNIQUE_KEY_TYPE
+      end
+      
+      def is_member_of_composite?
+        @column_name.size > 1
+      end
+      
+      def is_foreign_constraint?(table_name)
+        @table_name.upcase != table_name.upcase
+      end
+    
+    end
+    
+    
+    class IBM_DB2Adapter < AbstractAdapter
+      attr_reader :iseries
+    
+      alias :base_initialize :initialize
+	  def initialize(connection, logger, config)
+	    if (config[:platform] == "iseries")
+	       @iseries = true
+	       logger.info("DRYSQL >> iSeries platform detected")
+	    end
+	    base_initialize(connection, logger, config)
+	  end
+	  
+    
+      alias :base_columns :columns
+      # Returns an array of Column objects for the table specified by +table_name+
+      # This method re-definition is valid only for iSeries
+      def columns(table_name, name = nil)
+        # to_s required because it may be a symbol.
+        table_name = table_name.to_s.upcase
+        # Checks if a blank table name has been given. 
+        # If so it returns an empty array
+        return [] if table_name.strip.empty?
+        # +columns+ will contain the resulting array
+        columns = []
+        if @iseries
+          sql = "SELECT column_name, dftvalue as column_default, coltype as type, length, nulls, generated FROM SYSCOLUMNS WHERE TBNAME = '#{table_name}' AND DBNAME = '#{@schema.upcase}' ORDER BY colno"
+        else
+          sql = "SELECT colname as column_name, default as column_default, typename as type, length, nulls, generated FROM SYSCAT.COLUMNS WHERE TABNAME = '#{table_name}' AND TABSCHEMA = '#{@schema.upcase}' ORDER BY colno"
+        end
+        # Statement required to access all the columns information
+        stmt = execute(sql, name)
+          # Fetches all the columns and assigns them to col.
+          # +col+ is an hash with keys/value pairs for a column
+          while col = DB2::fetch_assoc(stmt)
+              column_name = col["column_name"].downcase
+              # Assigns the column default value.
+              column_default_value = col["column_default"]
+              # If there is no default value, it assigns NIL
+              column_default_value = nil if (column_default_value && column_default_value.upcase == 'NULL')
+              # Removes single quotes from the default value
+              column_default_value.gsub!(/^'(.*)'$/, '\1') unless column_default_value.nil?
+              # Assigns the column type
+              column_type = col["type"].downcase
+              # Assigns the field length (size) for the column
+              column_length = col["length"]
+              # The initializer of the class Column, requires the +column_length+ to be declared between brackets after
+              # the datatype(e.g VARCHAR(50)) for :string and :text types. If it's a "for bit data" field it does a subsitution in place, if not
+              # it appends the (column_length) string on the supported data types
+              unless column_length.nil? || column_length == '' || column_type.sub!(/ \(\) for bit data/i,"(#{column_length}) FOR BIT DATA") || !column_type =~ /char|lob|graphic/i
+                column_type << "(#{column_length})"
+              end
+              # col["NULLABLE"] is 1 if the field is nullable, 0 if not.
+              column_nullable = col["nulls"] == 'Y' ? true : false
+              generated = col["generated"]
+              # Pushes into the array the *IBM_DB2Column* object, created by passing to the initializer
+              # +column_name+, +default_value+, +column_type+ and +column_nullable+.
+              columns << IBM_DB2Column.new(column_name, column_default_value, generated, column_type, column_nullable)
+          end
+        # Returns the columns array
+        columns
+      end
+      
+      alias :base_indexes :indexes
+      # Returns an array of indexes for the given table, skipping the primary key.
+      # The current implementation accesses SYSINDEXES and QSYS2.SYSKEYS.
+      # This method is valid only for iSeries
+      def indexes(table_name, name = nil)
+        if !@iseries then return base_indexes(table_name, name) end
+        
+        # to_s required because +table_name+ may be a symbol.
+        table_name = table_name.to_s
+        # Checks if a blank table name has been given. 
+        # If so it returns an empty array of columns.
+        return [] if table_name.strip.empty?
+        # +indexes+ will contain the resulting array
+        indexes = []
+        # Query used to retrieve all the indexes from the given table
+        sql = "select * from ((SELECT index_name, is_unique FROM SYSINDEXES WHERE table_name = '#{table_name.upcase}' AND table_schema = '#{@schema.upcase}') \
+          as IND inner join (select index_name, column_name from QSYS2.SYSKEYS where index_schema='#{@schema.upcase}') as KEYS on (IND.index_name=KEYS.index_name))"
+        stmt = execute(sql, name)
+        klass = instance_eval(ActiveRecord::Base.class_name(table_name))
+        primary_key = klass.primary_key
+        index_hash = {}
+        # Fetches all the records available
+        while table_index = DB2::fetch_assoc(stmt)
+          # Gets the lowercased index name
+          index_name = table_index["index_name"].downcase
+          # Is the index a primary key?
+          unless index_name.upcase == primary_key.upcase
+            # Is the index unique?
+            index_unique = table_index["is_unique"] == 'U'
+            if index_hash[index_name].nil?
+              index_hash[index_name] = [index_unique, [column_name]]
+            else
+              index_hash[index_name][1] << column_name
+            end
+          end
+        end
+        # Creates IndexDefinition objects and adds them to the indexes array
+        index_hash.keys.each do |key|
+          current_index = index_hash[key]
+          indexes << IndexDefinition.new(table_name, key, current_index[0], current_index[1])
+        end
+                
+        # Returns the indexes array
+        return indexes      
+        # Ensures to free the resources associated with the statement     
+        ensure
+          DB2::free_result(stmt) if stmt
+      end
+    
+    
+      # DrySQL queries the current schema's System Catalog Views, which contain metadata
+      # only for those constraints that are defined in the current schema.
+      # 
+      # If you have inter-schema referential constraints, and I'm not sure why you would or whether
+      # DB2 even supports this, DrySQL will not detect them and will raise an error.
+      def constraints(table_name, name = nil)#:nodoc:
+        constraints = []  
+        if @iseries
+          return iseries_constraints(table_name, name)
+        else
+          sql = "select CST.tabschema, CST.constname, CST.tabname, CST.type, COL.colname, \
+            REF.constname as foreign_constraint_name, REF.tabname as foreign_table_name, \
+            REF.refkeyname, REF.reftabname, REF.deleterule, REF.fk_colnames as foreign_columns, \
+            REF.pk_colnames as referenced_columns from \
+            ((select * from SYSCAT.TABCONST where tabname='#{table_name}') as CST \
+            inner join (select colname, constname from SYSCAT.KEYCOLUSE where tabname='#{table_name}') \
+            as COL on (CST.constname=COL.constname)) left outer join SYSCAT.REFERENCES REF on \
+            (CST.constname=REF.refkeyname or CST.constname=REF.constname)"
+        end       
+        results = execute(sql, name)
+        constraint_name_hash = {}
+          
+        # Note that column names in constraint objects are downcased in order to
+        # be comparable with the column names produced by IBM_DB2Adapter.columns  
+        while row = DB2::fetch_assoc(results)
+          constraint_name = row['constname']
+          foreign_constraint_name = row['foreign_constraint_name']
+
+          # Process constraints local to this table
+          if !constraint_name_hash.has_key?(constraint_name)
+            current_constraint = IBM_DB2Constraint.new(row['tabschema'], constraint_name, row['type'], 
+              row['tabname'], row['colname'], row['refkeyname'], row['reftabname'], 
+              row['referenced_columns'], row['deleterule'])
+            constraints << current_constraint
+            constraint_name_hash[constraint_name] = current_constraint
+          # This key is a composite
+          else
+            current_constraint = constraint_name_hash[constraint_name]
+            # Unique Keys are currently the only type of composite keys supported
+            if current_constraint.component_of_unique_key? 
+              current_constraint.column_name.add(row['colname']) 
+            end
+          end
+          
+          # Process constraints that reference this table's local constraints
+          if !foreign_constraint_name.nil? && !constraint_name_hash.has_key?(foreign_constraint_name)
+            current_foreign_constraint = IBM_DB2Constraint.new(row['tabschema'], foreign_constraint_name, IBM_DB2Constraint::FOREIGN_KEY_TYPE,
+              row['foreign_table_name'], row['foreign_columns'], constraint_name, row['tabname'], row['colname'],
+              row['deleterule'])
+              constraints << current_foreign_constraint
+              constraint_name_hash[foreign_constraint_name] = current_foreign_constraint
+          # Composite FKs are currently not supported 
+          # else
+          #  constraint_name_hash[foreign_constraint_name].column_name.add(row['foreign_column_name'])
+          end        
+        end
+        constraints
+      end
+      
+      # This method retrieves constraint information from the iSeries
+      # information schema views, which DB2 generates automatically
+      # for a schema when it (the schema) is created.
+      # 
+      # Note that the old-style iSeries "libraries" that some people consider to
+      # by synonymous with "schemas" do not get the benefit of the information
+      # schema views (or journaling, for that matter). DrySQL will not
+      # play nicely with iSeries libraries unless you create the information
+      # schema views.
+      def iseries_constraints(table_name, name = nil)#:nodoc:
+        constraints = []  
+        sql = "select CST.constraint_schema, CST.constraint_name, CST.table_name, CST.constraint_type, COL.column_name, \
+          REF.constraint_name as foreign_constraint_name, REF.unique_constraint_name as referenced_constraint_name, \
+          REF.delete_rule, COLREF.table_name as foreign_table_name, COLREF.column_name as foreign_column_name from \
+          ((select * from SYSCST where table_name='#{table_name}') as CST \
+	      inner join (select column_name, constraint_name from SYSCSTCOL where table_name='#{table_name}') \
+	      as COL on (CST.constraint_name=COL.constraint_name) left outer join SYSREFCST REF on \
+	      (CST.constraint_name=REF.unique_constraint_name or CST.constraint_name=REF.constraint_name) \
+	      left join SYSCSTCOL AS COLREF on (NOT COLREF.table_name='#{table_name}' AND \
+	      (REF.unique_constraint_name=COLREF.constraint_name or REF.constraint_name=COLREF.constraint_name)))"     
+        results = execute(sql, name)
+        constraint_name_hash = {}
+          
+        # Note that column names in constraint objects are downcased in order to
+        # be comparable with the column names produced by IBM_DB2Adapter.columns  
+        while row = DB2::fetch_assoc(results)
+          constraint_name = row['constraint_name']
+          foreign_constraint_name = row['foreign_constraint_name']
+
+          # Process constraints local to this table
+          if !constraint_name_hash.has_key?(constraint_name)
+            current_constraint = IBM_DB2Constraint.new(row['constraint_schema'], constraint_name, row['constraint_type'], 
+              row['table_name'], row['column_name'], row['referenced_constraint_name'], row['foreign_table_name'], 
+              row['foreign_column_name'], row['delete_rule'])
+            constraints << current_constraint
+            constraint_name_hash[constraint_name] = current_constraint
+          # This key is a composite
+          else
+            current_constraint = constraint_name_hash[constraint_name]
+            # Unique Keys are currently the only type of composite keys supported
+            if current_constraint.component_of_unique_key? 
+              current_constraint.column_name.add(row['column_name']) 
+            end
+          end
+          
+          # Process constraints that reference this table's local constraints
+          if !foreign_constraint_name.nil? && !constraint_name_hash.has_key?(foreign_constraint_name)
+            current_foreign_constraint = IBM_DB2Constraint.new(row['constraint_schema'], constraint_name, IBM_DB2Constraint::FOREIGN_KEY_TYPE,
+              row['foreign_table_name'], row['foreign_column_name'], foreign_constraint_name, row['table_name'], row['column_name'],
+              row['delete_rule'])
+              constraints << current_foreign_constraint
+              constraint_name_hash[foreign_constraint_name] = current_foreign_constraint
+          # Composite FKs are currently not supported 
+          # else
+          #  constraint_name_hash[foreign_constraint_name].column_name.add(row['foreign_column_name'])
+          end        
+        end
+        constraints
+      end
+      
+      
+      alias :base_last_generated_id :last_generated_id
+      # Private methods that returns the last automatically generated ID
+      # on the given +@connection+. This method is required by the +insert+ method
+      # This method is valid only for iSeries
+      def last_generated_id
+        if !@iseries then return base_last_generated_id end
+        
+        # Queries the db to obtain the last ID that was automatically generated
+        stmt = execute("SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1")
+        # Fetches the only record available (containing the last id)
+        DB2::fetch_row(stmt)
+        # Retrieves and returns the result of the query with the last id.
+        DB2::result(stmt,0)
+      end
+      private :last_generated_id
+        
+    end
+
+  end
+  
+end

data/lib/connection_adapters/mysql_adapter.rb

@@ -36,19 +36,22 @@ module ActiveRecord
     # Specifically: Primary, Foreign, Unique Key definitions
     class MysqlConstraint < AbstractTableConstraint
           
-      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
+      def initialize(constraint_name, table_schema, table_name, column_name, constraint_type,
+        referenced_table_name, referenced_column_name)
         @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 is_foreign_constraint?(table_name)
+        !@referenced_table_name.nil? && 
+        @referenced_table_name.upcase == table_name.upcase &&
+        @table_name.upcase != table_name.upcase
+      end
         
     end
     
@@ -82,15 +85,15 @@ module ActiveRecord
       # depending on access to the complete set of constraints for the table at a later time
       def constraints(table_name, name = nil)#:nodoc:
         constraints = []
-        
-        sql = "select t2.*, t1.column_name, t1.referenced_table_schema, t1.referenced_table_name, t1.referenced_column_name \
-        from information_schema.key_column_usage as t1 inner join information_schema.table_constraints as t2 \
-        using (constraint_name, table_schema, table_name) where table_name='#{table_name}' or t1.referenced_table_name='#{table_name}'"
+        sql = "select KCU.constraint_name, KCU.table_schema, KCU.table_name, KCU.column_name, TC.constraint_type, KCU.referenced_table_name, KCU.referenced_column_name from \
+          ((select constraint_name, constraint_type, table_name from information_schema.table_constraints where table_schema='#{schema}' and table_name='#{table_name}') as TC right join \
+          (select * from information_schema.key_column_usage where table_schema='#{schema}' and (table_name='#{table_name}' or referenced_table_name='#{table_name}')) as KCU on \
+          (TC.constraint_name=KCU.constraint_name AND TC.table_name=KCU.table_name))"
         results = execute(sql, name)
         constraint_name_hash = {}
         results.each do |row| 
-          constraints << MysqlConstraint.new(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9])
-          comparable_constraint_name = row[2].upcase
+          constraints << MysqlConstraint.new(row[0], row[1], row[2], row[3], row[4], row[5], row[6])
+          comparable_constraint_name = row[0].upcase + row[2].upcase
           constraint_name_count = constraint_name_hash[comparable_constraint_name]
           constraint_name_count ? 
             constraint_name_hash[comparable_constraint_name] = constraint_name_count + 1 :
@@ -98,7 +101,7 @@ module ActiveRecord
         end
         
         constraints.each do | constraint|
-          constraint.member_of_composite=(constraint_name_hash[constraint.constraint_name.upcase] > 1)
+          constraint.member_of_composite=(constraint_name_hash[constraint.constraint_name.upcase + constraint.table_name.upcase] > 1)
         end
         constraints
       end

data/lib/connection_adapters/oracle_adapter.rb

@@ -4,10 +4,16 @@ module ActiveRecord
   
     class OracleColumn < Column
     
-      attr_accessor :primary_key
+      attr_accessor :primary_key, :default_spceified
+        
+      def initialize(name, default, sql_type = nil, null = true)
+        if !(default.nil? || default.blank?) then @default_specified = true end
+        super(name, default, sql_type, null)
+      end
+        
     
       def default_specified?
-        !default.nil?
+        @default_specified
       end
       
       # The only means that Oracle currently provides for auto-generating a column
@@ -34,18 +40,24 @@ module ActiveRecord
       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
+      def initialize(constraint_name, constraint_type, table_name, column_name, 
+        referenced_constraint_name, referenced_table_name, referenced_column_name, delete_rule)
         @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
+        @column_name = Set.new [column_name]
         @referenced_table_name = referenced_table_name
         @referenced_column_name = referenced_column_name
+        @delete_rule = delete_rule
+      end
+      
+      def is_foreign_constraint?(table_name)
+        @table_name.upcase != table_name.upcase
+      end
+      
+      def is_member_of_composite?
+        @column_name.size > 1
       end
       
       def primary_key?
@@ -82,36 +94,58 @@ module ActiveRecord
     
       def constraints(table_name, name = nil)#:nodoc:
         constraints = []       
-        sql = "select t1.owner, t1.constraint_name, t1.constraint_type, lower(t1.table_name) as table_name, t1.r_owner, t1.r_constraint_name, \
-          t1.delete_rule, t2.column_name, lower(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.upcase}' or t3.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 \
+          (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))"
           
         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
+          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
+          constraint_name = row['constraint_name']
+          foreign_constraint_name = row['foreign_constraint_name']
           
-          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)
+          # Process constraints local to this table
+          if !constraint_name_hash.has_key?(constraint_name)
+            current_constraint = OracleConstraint.new(constraint_name, row['constraint_type'], row['table_name'], 
+            column_name, row['referenced_constraint_name'], row['foreign_table_name'], 
+            row['foreign_column_name'], row['foreign_delete_rule'])
+            constraints << current_constraint
+            constraint_name_hash[constraint_name] = current_constraint
+          # This key is a composite
+          else
+            current_constraint = constraint_name_hash[constraint_name]
+            # Unique Keys are currently the only type of composite keys supported
+            if current_constraint.component_of_unique_key? 
+              current_constraint.column_name.add(column_name)
+            end
+          end
+          
+          # Process constraints that reference this table's local constraints
+          if !foreign_constraint_name.nil? && !constraint_name_hash.has_key?(foreign_constraint_name)
+            current_foreign_constraint = OracleConstraint.new(foreign_constraint_name, OracleConstraint::FOREIGN_KEY_TYPE,
+              row['foreign_table_name'], row['foreign_column_name'], constraint_name,  
+              row['table_name'], row['column_name'], row['foreign_delete_rule'])
+              constraints << current_foreign_constraint
+              constraint_name_hash[foreign_constraint_name] = current_foreign_constraint
+          # Composite FKs are currently not supported 
+          # else
+          #  constraint_name_hash[foreign_constraint_name].column_name.add(row['foreign_column_name'])
+          end   
         end
         constraints       
       end
+
          
     end
     

data/lib/connection_adapters/postgresql_adapter.rb

@@ -3,12 +3,12 @@ module ActiveRecord
   module ConnectionAdapters
   
     class PostgreSQLColumn < Column #:nodoc:
-      attr_accessor :generated
+      attr_accessor :generated, :default_specified
       
       alias :generated? :generated
       
       def default_specified?
-        !default.nil?
+        @default_specified
       end
     
     end
@@ -16,21 +16,26 @@ module ActiveRecord
     
     class PostgreSQLConstraint < AbstractTableConstraint
        
-      def initialize(table_catalog, table_schema, table_name, column_name, constraint_catalog, constraint_schema, 
-        constraint_name, referenced_table_catalog, referenced_table_schema, referenced_table_name, constraint_type,
-        referenced_column_name)
+      def initialize(constraint_name, table_catalog, table_schema, table_name,
+        constraint_type, column_name, referenced_constraint_name, referenced_table_name,
+        referenced_column_name, delete_rule, update_rule)
         @table_catalog = table_catalog
         @table_schema = table_schema
         @table_name = table_name
         @column_name = column_name
-        @constraint_catalog = constraint_catalog
-        @constraint_schema = constraint_schema
         @constraint_name = constraint_name
         @constraint_type = constraint_type
-        @referenced_table_catalog = referenced_table_catalog
-        @referenced_table_schema = referenced_table_schema
+        @referenced_constraint_name = referenced_constraint_name
         @referenced_table_name = referenced_table_name
         @referenced_column_name = referenced_column_name
+        @update_rule = update_rule
+        @delete_rule = delete_rule
+      end
+      
+      def is_foreign_constraint?(table_name)
+        !@referenced_table_name.nil? && 
+        @referenced_table_name.upcase == table_name.upcase &&
+        @table_name.upcase != table_name.upcase
       end
       
     end
@@ -47,6 +52,7 @@ module ActiveRecord
           # typmod now unused as limit, precision, scale all handled by superclass
           current = PostgreSQLColumn.new(name, default_value(default), translate_field_type(type), notnull == "f")
           current.generated= (!default.nil? && default.index('nextval') == 0)
+          current.default_specified = !(default.nil? || default.blank?)
           columns << current
         end
         columns
@@ -54,23 +60,30 @@ module ActiveRecord
       
     
       def constraints(table_name, name = nil)#:nodoc:
-        constraints = []       
-        sql = "select t3.* , t4.* from information_schema.constraint_column_usage as t3 right join \
-          (select t2.*, t1.column_name from information_schema.key_column_usage as t1 inner join \
-            information_schema.table_constraints as t2 using (constraint_name, table_catalog, table_schema, table_name)) \
-            as t4 using (constraint_catalog, constraint_schema, constraint_name) \
-            where t4.table_name='#{table_name.downcase}' or t3.table_name='#{table_name.downcase}'"
+        constraints = []     
+  
+        sql = "select t1.*, KCU.column_name, REF2.unique_constraint_name, KCU2.table_name as referenced_table_name, \
+          KCU2.column_name as referenced_column_name, REF2.delete_rule, REF2.update_rule from \
+          (select constraint_name, table_catalog, table_schema, table_name, constraint_type from \
+          information_schema.table_constraints where table_name='#{table_name.downcase}' or constraint_name in \
+            (select REF.constraint_name from information_schema.referential_constraints as REF 
+            where unique_constraint_name in (select constraint_name from information_schema.table_constraints 
+            where table_name='#{table_name.downcase}'))) as t1 inner join information_schema.key_column_usage as KCU on \
+            (t1.constraint_name=KCU.constraint_name) left join information_schema.referential_constraints as REF2 \
+            on (REF2.constraint_name=t1.constraint_name) left join information_schema.key_column_usage as KCU2 \
+            on (REF2.unique_constraint_name=KCU2.constraint_name)"
+        
         results = query(sql, name)
         constraint_name_hash = {}
         results.each do |row| 
-          constraints << PostgreSQLConstraint.new(row[10], row[11], row[12], row[16], row[4], row[5], row[6], row[0], row[1], row[2], row[13], row[3])
-          comparable_constraint_name = row[6].upcase
+          constraints << PostgreSQLConstraint.new(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10])
+          comparable_constraint_name = row[0].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

data/lib/connection_adapters/sqlserver_adapter.rb

@@ -4,19 +4,21 @@ module ActiveRecord
   
     class SQLServerColumn < Column# :nodoc:
       attr_reader :identity, :is_special
+      attr_accessor :default_specified
       alias :generated? :identity
       
       def default_specified?
-        !default.nil?
+        @default_specified
       end
       
       # Borrowed verbatim from standard Rails sqlserver_adapter.
       # Had to re-implement a bit of functionality here to avoid
       # a dependency on SQLServerColumn.identity accessor
       # 
-      # Once the ActiveRecord gem releases the latest version of
+      # Once the ActiveRecord gem includes the latest version of
       # sqlserver_adapter, I'll be to remove this code
       def initialize(name, default, sql_type = nil, identity = false, null = true) 
+        if !(default.nil? || default.blank?) then @default_specified = true end
         super(name, default, sql_type, null)
         @identity = identity
         @is_special = sql_type =~ /text|ntext|image/i
@@ -28,23 +30,28 @@ module ActiveRecord
     
     class SQLServerConstraint < AbstractTableConstraint
       
-      def initialize(table_catalog, table_schema, table_name, column_name,
-        referenced_table_catalog, referenced_table_schema, referenced_table_name, referenced_column_name,
-        constraint_catalog, constraint_schema, constraint_name, constraint_type)
-        @table_catalog = table_catalog
+       def initialize(constraint_schema, table_name, column_name, constraint_name, constraint_type, 
+        referenced_constraint_name, referenced_table_name, referenced_column_name)
         @table_schema = table_schema
         @table_name = table_name
-        @column_name = column_name
-        @referenced_table_catalog = referenced_table_catalog
-        @referenced_table_schema = referenced_table_schema
+        @column_name = Set.new [column_name]
         @referenced_table_name = referenced_table_name
         @referenced_column_name = referenced_column_name
-        @constraint_catalog = constraint_catalog
         @constraint_schema = constraint_schema
+        @referenced_constraint_name = referenced_constraint_name
         @constraint_name = constraint_name 
         @constraint_type = constraint_type
       end
       
+      
+      def is_member_of_composite?
+        @column_name.size > 1
+      end
+      
+      def is_foreign_constraint?(table_name)
+        @table_name.upcase != table_name.upcase
+      end
+      
     end
 
     class SQLServerAdapter < AbstractAdapter
@@ -96,33 +103,72 @@ module ActiveRecord
       end
       
           
+      # SQL Server allows you to duplicate table names & constraint names in a single database,
+      # provided that each constraint belongs to a different schema.
+      # 
+      # The nice trickery in Rails and DrySQL that relies on retrieving info from the 
+      # information_schema views will get confused if you create > 1 table with the same name in
+      # the same database or > 1 constraint with the same name.
+      # 
+      # A future solution to this problem would be to have the ability to specify the desired schema
+      # in the database connection properties and have information_schema queries select only
+      # rows from the desired schema. Until this is implemented, do not duplicate table names
+      # or constraint names inside any DB.
+      # 
+      # Constraints Query Optimization:
+      # -------------------------------
+      #  - The current query seems to be optimal for the strategy of retrieving local table constraints
+      #    as well as foreign keys into the current table in a single query
+      #  - Since 4 tables need to be joined to return information about FKs into the current table
+      #    the strategy is to join maximally reduced subsets of each table (i.e. rather than
+      #    join the entire table, select minimum number of columns necessary and the minimum number of
+      #    rows necessary from each table and then join the results)
+      #  - Due to the layout of the information_schema views, the database will always need to scan every
+      #    row in REFERENTIAL_CONSTRAINTS in order to stitch together table constraints and the FKs from
+      #    other tables that reference these table constraints, which means that performance is inversely
+      #    related to the number of FKs defined in the schema. Deleting unnecessary tables & FKs, and keeping
+      #    logically separate groups of tables in separate schemas will improve performance
       def constraints(table_name, name = nil)#:nodoc:
-        constraints = []       
-        sql = "select t2.*, t1.COLUMN_NAME, t3.UNIQUE_CONSTRAINT_CATALOG, t3.UNIQUE_CONSTRAINT_SCHEMA, t3.UNIQUE_CONSTRAINT_NAME, 
-            t4.table_catalog as REFERENCED_TABLE_CATALOG, t4.table_schema as REFERENCED_TABLE_SCHEMA, t4.table_name as REFERENCED_TABLE_NAME, 
-            t4.column_name as REFERENCED_COLUMN_NAME from information_schema.constraint_column_usage as t1 inner join 
-            information_schema.table_constraints as t2 on (t2.constraint_name=t1.constraint_name AND t2.table_catalog=t1.table_catalog 
-            AND t2.table_schema=t1.table_schema AND t2.table_name=t1.table_name) left outer join
-			information_schema.referential_constraints as t3 on (t3.constraint_name=t2.constraint_name AND 
-			t3.constraint_catalog=t2.constraint_catalog AND t3.constraint_schema=t2.constraint_schema) left outer join
-			information_schema.constraint_column_usage as t4 on (t4.constraint_name=t3.unique_constraint_name AND 
-			t4.constraint_catalog=t3.unique_constraint_catalog AND t4.constraint_schema=t3.unique_constraint_schema)
-            where t4.table_name='#{table_name}' or t2.table_name='#{table_name}'"
+        constraints = [] 
+        sql = "select TC.constraint_schema, TC.constraint_name, TC.table_name, TC.constraint_type, CCU.column_name, \
+	      REF.constraint_name as foreign_constraint_name, REF.unique_constraint_name as referenced_constraint_name, REF.update_rule, \
+	      REF.delete_rule, CCUREF.table_name as foreign_table_name, CCUREF.column_name as foreign_column_name from \
+	      ((select * from information_schema.table_constraints where table_name='#{table_name}') as TC \
+	      inner join (select column_name, constraint_name from information_schema.constraint_column_usage where table_name='#{table_name}') \
+	      as CCU on (TC.constraint_name=CCU.constraint_name) left outer join information_schema.referential_constraints REF on \
+	      (TC.constraint_name=REF.unique_constraint_name or TC.constraint_name=REF.constraint_name) \
+	      left join information_schema.constraint_column_usage AS CCUREF on (NOT CCUREF.table_name='#{table_name}' AND \
+	      (REF.unique_constraint_name=CCUREF.constraint_name or REF.constraint_name=CCUREF.constraint_name)))"
+
         results = select_all(sql, name)
         constraint_name_hash = {}
         results.each do |row| 
-          constraints << SQLServerConstraint.new(row['TABLE_CATALOG'], row['TABLE_SCHEMA'], row['TABLE_NAME'], row['COLUMN_NAME'],
-            row['REFERENCED_TABLE_CATALOG'], row['REFERENCED_TABLE_SCHEMA'], row['REFERENCED_TABLE_NAME'], row['REFERENCED_COLUMN_NAME'], 
-            row['CONSTRAINT_CATALOG'], row['CONSTRAINT_SCHEMA'], row['CONSTRAINT_NAME'], row['CONSTRAINT_TYPE'])
-          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)
+          constraint_name = row['constraint_name']
+          foreign_constraint_name = row['foreign_constraint_name']
+
+          # Process constraints local to this table
+          if !constraint_name_hash.has_key?(constraint_name)
+            current_constraint = SQLServerConstraint.new(row['constraint_schema'], row['table_name'], row['column_name'], constraint_name, 
+            row['constraint_type'], row['referenced_constraint_name'], row['foreign_table_name'], row['foreign_column_name'] )
+            constraints << current_constraint
+            constraint_name_hash[constraint_name] = current_constraint
+          # This key is a composite
+          else
+            current_constraint = constraint_name_hash[constraint_name]
+            # Unique Keys are currently the only type of composite keys supported
+            if current_constraint.component_of_unique_key? then current_constraint.column_name.add(row['column_name']) end
+          end
+          
+          # Process constraints that reference this table's local constraints
+          if !foreign_constraint_name.nil? && !constraint_name_hash.has_key?(foreign_constraint_name)
+            current_foreign_constraint = SQLServerConstraint.new(row['constraint_schema'], row['foreign_table_name'], row['foreign_column_name'],
+              foreign_constraint_name, SQLServerConstraint::FOREIGN_KEY_TYPE, constraint_name, row['table_name'], row['column_name'] )
+              constraints << current_foreign_constraint
+              constraint_name_hash[foreign_constraint_name] = current_foreign_constraint
+          # Composite FKs are currently not supported 
+          # else
+          #  constraint_name_hash[foreign_constraint_name].column_name.add(row['foreign_column_name'])
+          end
         end
         constraints
       end

data/lib/drysql.rb

@@ -8,6 +8,9 @@ require 'connection_adapters/mysql_adapter'
 require 'connection_adapters/postgresql_adapter'
 require 'connection_adapters/sqlserver_adapter'
 require 'connection_adapters/oracle_adapter'
+if defined?(ActiveRecord::ConnectionAdapters::IBM_DB2Adapter)
+  require 'connection_adapters/ibm_db2_adapter' 
+end
 require 'connection_adapters/abstract/schema_definitions'
 require 'associations'
 require 'validations'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: drysql
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2007-01-03 00:00:00 -05:00
+  version: 0.2.0
+date: 2007-01-29 00:00:00 -05:00
 summary: Dynamic, Reflective, Invisible Object-Relational Mapping for Ruby
 require_paths: 
 - lib
@@ -39,6 +39,7 @@ files:
 - lib/connection_adapters/oracle_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: []