sequel_oracle_extensions 0.5.2 → 0.5.3

data/lib/sequel/oracle_extensions/schemata.rb

@@ -1,123 +1,148 @@
-require 'sequel'
-Sequel.require 'adapters/shared/oracle'
-
-# The oracle_schemata extension adds some schema related methods to the Oracle database adapater.
-module Sequel
-  module Oracle
-    module DatabaseMethods
-      
-			SELECT_INDEXES_SQL = %q{
-SELECT i.index_name, i.status, i.uniqueness, ic.column_name
-FROM all_indexes i
-	INNER JOIN all_ind_columns ic
-		ON ic.index_owner = i.owner AND ic.index_name = i.index_name 
-WHERE i.table_name = ? AND i.dropped = 'NO'
-ORDER BY status DESC, index_name, ic.column_position
-		  }.freeze
-      
-	    # Returns the indexes for the given table. By default, it does not return primary keys.
-	    #
-      # * <tt>:all</tt> - Returns all indexes, even primary keys.
-	    def indexes(table, options={})
-	      sql, m = SELECT_INDEXES_SQL, output_identifier_meth
-	      table = m[table]
-		    ixs = Hash.new{|h,k| h[k] = {:table_name=>table, :columns=>[]}}
-		    
-		    if options[:all]
-	        sql = sql.sub /ORDER BY /, %q{ AND NOT EXISTS (
-	SELECT uc.index_name FROM all_constraints uc
-	WHERE uc.index_name = i.index_name AND uc.owner = i.owner AND uc.constraint_type = 'P'
-)
-ORDER BY }
-		    end
-
-	      metadata_dataset.with_sql(SELECT_INDEXES_SQL, table.to_s.upcase).each do |r|
-	        r = Hash[ r.map{|k,v| [k, (k==:index_name || k==:column_name) ? m[v] : v]} ]
-		      ix = ixs[m.call r.delete(:index_name)]
-	        ix[:valid] = r.delete(:status)=='VALID'
-	        ix[:unique] = r.delete(:uniqueness)=='UNIQUE'
-	        ix[:columns] << r.delete(:column_name)
-	        ix.update r
-	      end
-	      ixs
-	    end
-
-	    # Returns the primary key for the given +table+ (or +schema.table+), as a hash.
-	    #
-      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
-      #   looks for any matching key.
-      # * <tt>:all</tt>     - Return an array of matching keys, instead of the first matching key.
-      #
-	    def primary_key(qualified_table, options={})
-	    	result = table_constraints(qualified_table, options) do |ds,table_name,x_cons|
-	        ds.where(:c__constraint_type=>'P', :c__table_name=>table_name).
-	           order(:status.desc, :index_name, :cc__position)
-				end
-				options[:all] ? result : result.first
-	    end
-
-	    # Returns the foreign keys defined on the given +table+ (or +schema.table+), as an array of hashes.
-	    #
-      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
-      #   looks for all matching keys.
-	    def foreign_keys(qualified_table, options={})
-	    	table_constraints(qualified_table, options) do |ds,table_name,x_cons|
-	        ds.where(:c__constraint_type=>'R', :c__table_name=>table_name).
-	           order(:table_name, :constraint_name, :cc__position)
-				end
-	    end
-	    
-	    # Returns foreign keys that refer to the given +table+ (or +schema.table+), as an array of hashes.
-	    #
-      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
-      #   looks for all matching keys.
-	    def references(qualified_table, options={})
-	    	table_constraints(qualified_table, options) do |ds,table_name,x_cons|
-	        ds.join(:"#{x_cons}traints___t", [[:owner,:c__r_owner], [:constraint_name,:c__r_constraint_name]]).
-	           where(:c__constraint_type=>'R', :t__constraint_type=>'P', :t__table_name=>table_name).
-	           order(:table_name, :constraint_name, :cc__position)
-				end
-	    end
-	    
-	  private
-	  	
-	  	# Internal helper method for introspection of table constraints.
-	  	def table_constraints(qualified_table,options={})
-	    	ds, result    = metadata_dataset, []
-	    	schema, table = ds.schema_and_table(qualified_table)
-	    	x_cons        = schema.nil? ? 'user_cons' : 'all_cons'
-	    	inm           = ds.identifier_input_method
-	    	
-	    	# Build the dataset and apply filters for introspection of constraints.
-				# Also allows the caller to customize the dataset.
-	    	ds = ds.select(:c__constraint_name, :c__table_name, :c__rely, :c__status, :c__validated,
-	    	               :cc__column_name, :c__index_name, :c__constraint_type).
-				        from(:"#{x_cons}traints___c").
-				        join(:"#{x_cons}_columns___cc", [[:owner,:owner], [:constraint_name,:constraint_name]])
-				unless schema.nil?
-					ds = ds.where :c__owner => schema.to_s.send(inm)
-				end
-				unless (z = options[:enabled]).nil?
-					ds = ds.where :status => (z ? 'ENABLED' : 'DISABLED')
-				end
-				ds = yield ds, table.to_s.send(inm), x_cons
-				
-				# Return the table constraints as an array of hashes, including a column list.
-	      hash = Hash.new do |h,k|
-	      	result.push :constraint_name=>ds.send(:output_identifier,k), :columns=>[]
-	      	h[k] = result.last
-	      end
-        ds.each do |row|
-        	ref = hash[row[:constraint_name]]
-        	ref[:table_name]||= ds.send(:output_identifier,row.delete(:table_name))
-        	ref[:columns]   <<  ds.send(:output_identifier,row.delete(:column_name))
-        	ref[:rely]      ||= row.delete(:rely)=='RELY'
-        	ref[:enabled]   ||= row.delete(:status)=='ENABLED'
-        	ref[:validated] ||= row.delete(:validated)=='VALIDATED'
-        	ref[:index_name]||= ds.send(:output_identifier,row.delete(:index_name)) if row[:index_name]
-        end
-        result
-	  	end
-    end
-  end
-end
+require 'sequel'
+Sequel.require 'adapters/shared/oracle'
+
+# The oracle_schemata extension adds some schema related methods to the Oracle database adapater.
+module Sequel
+  module Oracle
+    module DatabaseMethods
+      
+	    # Returns the indexes for the given +table+ (or +schema.table+), as an array of hashes.
+			# By default, it does not return primary keys.
+	    #
+      # * <tt>:valid</tt> - Only look for indexes that are valid (true) or unusable (false). By default (nil),
+      #   looks for any matching index.
+      # * <tt>:all</tt> - Returns all indexes, even ones used for primary keys.
+	    def indexes(qualified_table, options={})
+	    	ds, result    = metadata_dataset, []
+				outm          = lambda{|k| ds.send :output_identifier, k}
+	    	schema, table = ds.schema_and_table(qualified_table).map{|k| k.to_s.send(ds.identifier_input_method) if k} 
+	    	
+	    	# Build the dataset and apply filters for introspection of indexes.
+	    	ds = ds.select(:i__index_name, :i__status, :i__uniqueness, :i__visibility,
+				               :i__index_type, :i__join_index, :ic__column_name).
+				        from(:"all_indexes___i").
+				        join(:"all_ind_columns___ic", [ [:index_owner,:owner], [:index_name,:index_name] ]).
+								where(:i__table_name=>table, :i__dropped=>'NO').
+	              order(:status.desc, :index_name, :ic__column_position)
+				unless schema.nil?
+					ds = ds.where :i__owner => schema
+				end
+				unless (z = options[:valid]).nil?
+					ds = ds.where :i__status => (z ? 'VALID' : 'UNUSABLE')
+				end
+				if options[:all]
+				  pk = from(:all_constraints.as(:c)).where(:c__constraint_type=>'P').
+					     where(:c__index_name=>:i__index_name, :c__owner=>:i__owner)
+					ds = ds.where ~pk.exists
+				end
+
+				# Return the table constraints as an array of hashes, including a column list.
+	      hash = Hash.new do |h,k|
+	      	result.push :index_name=>outm[k], :table_name=>outm[table], :columns=>[]
+	      	h[k] = result.last
+	      end
+        ds.each do |row|
+        	ref = hash[row[:index_name]]
+					ref[:index_type]        ||= row[:index_type]
+					ref[:join_index]        ||= row[:join_index]=='YES'
+        	ref[:status]            ||= row[:status]=='VALID'
+        	ref[:uniqueness]        ||= row[:uniqueness]=='UNIQUE'
+        	ref[:visibility]        ||= row[:visibility]=='VISIBLE'
+        	ref[:columns]           <<  outm[row[:column_name]]
+        end
+        result
+	    end
+
+	    # Returns the primary key for the given +table+ (or +schema.table+), as a hash.
+	    #
+      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
+      #   looks for any matching key.
+      # * <tt>:all</tt>     - Return an array of matching keys, instead of the first matching key.
+      #
+	    def primary_key(qualified_table, options={})
+	    	result = table_constraints qualified_table, 'P', options
+				options[:all] ? result : result.first
+	    end
+
+	    # Returns unique constraints defined on the given +table+ (or +schema.table+), as an array of hashes.
+	    #
+      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
+      #   looks for all matching keys.
+	    def unique_keys(qualified_table, options={})
+	    	table_constraints qualified_table, 'U', options
+	    end
+	    
+	    # Returns foreign keys defined on the given +table+ (or +schema.table+), as an array of hashes.
+	    #
+      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
+      #   looks for all matching keys.
+	    def foreign_keys(qualified_table, options={})
+	    	table_constraints qualified_table, 'R', options
+	    end
+	    
+	    # Returns foreign keys that refer to the given +table+ (or +schema.table+), as an array of hashes.
+	    #
+      # * <tt>:enabled</tt> - Only look for keys that are enabled (true) or disabled (false). By default (nil),
+      #   looks for all matching keys.
+	    def references(qualified_table, options={})
+	    	table_constraints qualified_table, 'R', options.merge(:table_name_column=>:t__table_name)
+	    end
+	    
+	  private
+	  	
+	  	# Internal helper method for introspection of table constraints.
+	  	def table_constraints(qualified_table, constraint_type, options={})
+	    	ds, result    = metadata_dataset, []
+				outm          = lambda{|k| ds.send :output_identifier, k}
+	    	schema, table = ds.schema_and_table(qualified_table).map{|k| k.to_s.send(ds.identifier_input_method) if k} 
+	    	x_cons        = schema.nil? ? 'user_cons' : 'all_cons'
+	    	
+	    	# Build the dataset and apply filters for introspection of constraints.
+				# Also allows the caller to customize the dataset.
+	    	ds = ds.select(:c__constraint_name, :c__table_name, :c__rely, :c__status, :c__validated, :cc__column_name).
+				        from(:"#{x_cons}traints___c").
+				        join(:"#{x_cons}_columns___cc", [ [:owner,:owner], [:constraint_name,:constraint_name] ]).
+								where((options[:table_name_column]||:c__table_name)=>table, :c__constraint_type=>constraint_type).
+	              order(:table_name, :status.desc, :constraint_name, :cc__position)
+				unless schema.nil?
+					ds = ds.where :c__owner => schema
+				end
+				unless (z = options[:enabled]).nil?
+					ds = ds.where :c__status => (z ? 'ENABLED' : 'DISABLED')
+				end
+
+				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] ]).
+	                where(:t__constraint_type=>'P')
+				else
+	        ds = ds.select_more(:c__index_name)
+				end
+				ds = yield ds, table if block_given?
+				
+				# Return the table constraints as an array of hashes, including a column list.
+	      hash = Hash.new do |h,k|
+	      	result.push :constraint_name=>outm[k], :constraint_type=>constraint_type, :columns=>[]
+	      	h[k] = result.last
+	      end
+        ds.each do |row|
+        	ref = hash[row[:constraint_name]]
+        	ref[:table_name]        ||= outm[row[:table_name]]
+        	ref[:rely]              ||= row[:rely]=='RELY'
+        	ref[:enabled]           ||= row[:status]=='ENABLED'
+        	ref[:validated]         ||= row[:validated]=='VALIDATED'
+        	ref[:columns]           <<  outm[row[:column_name]]
+
+					if row.include? :r_constraint_name
+						ref[:r_constraint_name] ||= outm[row[:r_constraint_name]]
+						ref[:r_table_name]      ||= outm[row[:r_table_name]]
+					end
+					if row[:index_name]
+						ref[:index_name]        ||= outm[row[:index_name]]
+					end
+        end
+        result
+	  	end
+    end
+  end
+end

data/lib/sequel/oracle_extensions.rb

@@ -1,4 +1,4 @@
-require 'sequel'
-require 'sequel/oracle_extensions/schemata'
-require 'sequel/oracle_extensions/merge'
-require 'sequel/oracle_extensions/hints'
+require 'sequel'
+require 'sequel/oracle_extensions/schemata'
+require 'sequel/oracle_extensions/merge'
+require 'sequel/oracle_extensions/hints'

data/lib/sequel_oracle_extensions.rb

@@ -1 +1 @@
-require 'sequel/oracle_extensions'
+require 'sequel/oracle_extensions'

data/sequel_oracle_extensions.gemspec

@@ -1,56 +1,62 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{sequel_oracle_extensions}
-  s.version = "0.5.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joe Khoobyar"]
-  s.date = %q{2011-08-16}
-  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 = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/sequel/oracle_extensions.rb",
-    "lib/sequel/oracle_extensions/hints.rb",
-    "lib/sequel/oracle_extensions/merge.rb",
-    "lib/sequel/oracle_extensions/schemata.rb",
-    "lib/sequel_oracle_extensions.rb",
-    "sequel_oracle_extensions.gemspec",
-    "spec/sequel/oracle_extensions/hints_spec.rb",
-    "spec/sequel/oracle_extensions/merge_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/joekhoobyar/sequel_oracle_extensions}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Oracle MERGE, optimizer hints, an schema extensions for Sequel}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 3.10.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<sequel>, [">= 3.10.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<sequel>, [">= 3.10.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sequel_oracle_extensions}
+  s.version = "0.5.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Joe Khoobyar"]
+  s.date = %q{2011-08-17}
+  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 = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/sequel/oracle_extensions.rb",
+    "lib/sequel/oracle_extensions/hints.rb",
+    "lib/sequel/oracle_extensions/merge.rb",
+    "lib/sequel/oracle_extensions/schemata.rb",
+    "lib/sequel_oracle_extensions.rb",
+    "sequel_oracle_extensions.gemspec",
+    "spec/sequel/oracle_extensions/hints_spec.rb",
+    "spec/sequel/oracle_extensions/merge_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/joekhoobyar/sequel_oracle_extensions}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Oracle MERGE, optimizer hints, an 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
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sequel>, [">= 3.10.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<sequel>, [">= 3.10.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<sequel>, [">= 3.10.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+  end
+end
+