sequel_oracle_extensions 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/sequel/oracle_extensions/schemata.rb

@@ -28,7 +28,7 @@ module Sequel
       def table_metadata(table,options={})
 		    columns    = schema table, options
         attributes = columns.instance_eval{ remove_instance_variable :@features }
-		    attributes[:columns] = Hash[ columns ]
+		    attributes[:columns] = columns
 		    
 		    # Collect table partitioning information, if applicable.
 		    if attributes[:partitioning]
@@ -39,14 +39,16 @@ module Sequel
 					ds = ds.where :owner => schema unless schema.nil?
 					
 					# Basic partitioning info.
-					attributes[:partitioning] = ds.
-		    	    select(:partitioning_type.as(:type), :interval, :subpartitioning_type.as(:subtype)).
-		    	    from(:"#{who}_part_tables").where(:table_name=>table).first
+					attributes[:partitioning] = Hash[
+						ds.select(:partitioning_type.as(:type), :interval, :subpartitioning_type.as(:subtype)).
+		    	    from(:"#{who}_part_tables").first(:table_name=>table).
+		    	    map{|k,v| [k, k==:interval ? v : v.downcase.to_sym] }
+			   	]
 		    	
 		    	# Partitioning key column info. 
-					attributes[:partitioning][:key] = ds.
-		    	    select(:column_name).from(:"#{who}_part_key_columns").order(:column_position).
-		    	    where(:object_type=>'TABLE', :name=>table).map{|r| r.values.flatten }
+					attributes[:partitioning][:key] =
+						ds.select(:column_name).from(:"#{who}_part_key_columns").order(:column_position).
+		    	    where(:object_type=>'TABLE', :name=>table).map{|r| outm[r.values.first] }
 				end
 	    	    
 		    attributes
@@ -125,19 +127,13 @@ module Sequel
 	              order(:status.desc, :index_name, :ic__column_position)
 				ds = ds.where :i__owner => schema, :c__index_owner => schema  unless schema.nil?
 				ds = ds.where :i__status => (opts[:valid] ? 'VALID' : 'UNUSABLE') unless opts[:valid].nil?
-				unless opts[:all]
-				  pk = from(:"#{who}_constraints".as(:c)).where(:c__constraint_type=>'P').
-					     where(:c__index_name => :i__index_name)
-					pk = pk.where :c__owner => schema unless schema.nil?
-					ds = ds.where ~pk.exists
-				end
 
 				# Collect the indexes as a hash of subhashes, including a column list.
-				# As a followup, collect any additional metadata about the indexes (such as bitmap join columns).
 				hash, join_indexes = {}, []
 				ds.each do |row|
 					key = outm[row[:index_name]]
 					unless subhash = hash[key]
+						# Unconditional attributes
 						subhash = hash[key] = {
 							:columns=>[], :unique=>(row[:uniqueness]=='UNIQUE'),
 							:db_type=>row[:index_type], :logging=>(row[:logging]=='YES'),
@@ -145,28 +141,38 @@ module Sequel
 							:tablespace=>outm[row[:tablespace_name]], :partitioned=>(row[:partitioned]=='YES'),
 							:visible=>(row[:visibility]=='VISIBLE'), :compress=>(row[:compression]!='DISABLED')
 						}
-						case subhash[:db_type]
-            when /\b(BITMAP|NORMAL|DOMAIN)$/
-						  subhash[:type] = $1.downcase.intern
-						end
+						
+						# Conditional attributes
+						subhash[:type] = $1.downcase.intern if subhash[:db_type] =~ /\b(BITMAP|NORMAL|DOMAIN)$/i
             subhash[:function_based] = true if /^FUNCTION-BASED\b/ === subhash[:db_type]
             subhash[:valid] = (row[:status]=='VALID') unless row[:status]=='N/A'
-				    if row[:join_index]=='YES'
-						  join_indexes << row[:index_name]
-						  subhash[:join] = []
-				    end
+						join_indexes << row[:index_name] and subhash[:join] = [] if row[:join_index]=='YES'
 					end
 					subhash[:columns] << outm[row[:column_name]]
 				end
-				ds = metadata_dataset.from(:"#{who}_join_ind_columns").where(:index_name=>join_indexes)
-				ds = ds.where :index_owner => schema unless schema.nil?
-				ds.each do |row|
-					subhash    = hash[outm[row[:index_name]]]
-					ref_column = outm[row[:outer_table_column]]
-					pos        = subhash[:columns].index ref_column
-					subhash[:columns][pos] = outm["#{row[:outer_table_name]}__#{ref_column}"]
-					subhash[:join][pos]    = outm[row[:inner_table_column]]
+				
+				# Exclude the primary key index, if required and applicable.
+				# NOTE:  Disabled primary keys do not use any indexes, so they are not applicable here.
+				if ! opts[:all] and pk = primary_key(table)
+					if pk[:using_index]  then hash.delete pk[:using_index]
+					elsif pk[:enabled]   then hash.delete_if {|k,v| v[:columns]==pk[:columns] }
+					end					
 				end
+				
+				# Collect any additional metadata about the indexes (such as bitmap join columns).
+				unless join_indexes.empty?
+					ds = metadata_dataset.from(:"#{who}_join_ind_columns").where(:index_name=>join_indexes)
+					ds = ds.where :index_owner => schema unless schema.nil?
+					ds.each do |row|
+						subhash    = hash[outm[row[:index_name]]]
+						ref_column = outm[row[:outer_table_column]]
+						pos        = subhash[:columns].index ref_column
+						subhash[:columns][pos] = outm["#{row[:outer_table_name]}__#{ref_column}"]
+						subhash[:join][pos]    = outm[row[:inner_table_column]]
+					end
+				end
+				
+				# Done.
 				hash
 	    end
 
@@ -444,6 +450,7 @@ module Sequel
 	              order(:table_name, :status.desc, :constraint_name, :cc__position)
 				ds = ds.where :c__owner => schema unless schema.nil?
 				ds = ds.where :c__status => (options[:enabled] ? 'ENABLED' : 'DISABLED') unless options[:enabled].nil?
+				ds = ds.where :c__validated => (options[:validated] ? 'VALIDATED' : 'NOT VALIDATED') unless options[:validated].nil?
 				if constraint_type == 'R'
 	        ds = ds.select_more(:c__r_constraint_name, :t__table_name.as(:r_table_name)).
 					        join(:"#{x_cons}traints___t", [ [:owner,:c__r_owner], [:constraint_name,:c__r_constraint_name] ]).
@@ -451,7 +458,6 @@ module Sequel
 				else
 	        ds = ds.select_more(:c__index_name)
 				end
-				ds = ds.limit(1) if constraint_type == 'P'
 				
 				# Return the table constraints as a hash of subhashes, including a column list.
 				hash = {}

data/sequel_oracle_extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_oracle_extensions}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joe Khoobyar"]
-  s.date = %q{2011-08-24}
+  s.authors = [%q{Joe Khoobyar}]
+  s.date = %q{2011-08-26}
   s.description = %q{Oracle extensions for Sequel, including MERGE statements, optimizer hints, and schema extensions.}
   s.email = %q{joe@ankhcraft.com}
   s.extra_rdoc_files = [
@@ -34,14 +34,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/joekhoobyar/sequel_oracle_extensions}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Oracle MERGE, optimizer hints, and schema extensions for Sequel}
-  s.test_files = [
-    "spec/sequel/oracle_extensions/hints_spec.rb",
-    "spec/sequel/oracle_extensions/merge_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_oracle_extensions
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-08-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -103,11 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Oracle MERGE, optimizer hints, and schema extensions for Sequel
-test_files: 
-- spec/sequel/oracle_extensions/hints_spec.rb
-- spec/sequel/oracle_extensions/merge_spec.rb
-- spec/spec_helper.rb
+test_files: []
+