sequel_oracle_extensions 0.5.1 → 0.5.2

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/joekhoobyar/sequel_oracle_extensions"
     gem.authors = ["Joe Khoobyar"]
     gem.add_dependency "sequel", ">= 3.10.0" 
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.8"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -20,10 +20,10 @@ rescue LoadError
 end
 
 require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:rspec) do |spec|
+RSpec::Core::RakeTask.new(:rspec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
-Rspec::Core::RakeTask.new(:rcov) do |spec|
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/sequel/oracle_extensions/schemata.rb

@@ -9,27 +9,28 @@ module Sequel
 			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' 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'
-)
+	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
       
-      SELECT_PRIMARY_KEY_SQL = %q{
-SELECT c.constraint_name, c.index_name, c.status, cc.column_name
-FROM all_constraints c
-INNER JOIN all_cons_columns cc ON cc.owner = c.owner AND cc.constraint_name = c.constraint_name
-WHERE c.table_name = ? AND c.constraint_type = 'P'
-ORDER BY status DESC, constraint_name, cc.position
-      }.freeze
-
-	    # Returns the indexes for the given table, excluding any primary keys.
-	    def indexes(table)
-		    m = output_identifier_meth
+	    # 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)]
@@ -40,40 +41,83 @@ ORDER BY status DESC, constraint_name, cc.position
 	      end
 	      ixs
 	    end
-	        
-	    # Returns the primary key for the given table, as a hash.
+
+	    # 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 all matching keys.
-      # * <tt>:all</tt> - Returns all matching keys.  By default, returns the first matching key - provided
-      #   that either there is only one key or that only the key is enabled.
-      # * <tt>:first</tt> - Returns the first matching key.
-	    def primary_key(table, options={})
-	      sql, m = SELECT_PRIMARY_KEY_SQL, output_identifier_meth
-	      table, pks = m[table], []
-        pkh = Hash.new{|h,k| pks.push(h[k]=v={:table_name=>table, :columns=>[]}); v }
-
-	      unless (z = options[:enabled]).nil?
-	        sql = sql.sub /WHERE /, "WHERE c.status = #{z ? 'ENABLED' : 'DISABLED'}"
-	      end
-
-	      metadata_dataset.with_sql(sql, table.to_s.upcase).each do |r|
-	        if options[:first] && pks.length==1 && r[:constraint_name] != pks[:constraint_name]
-		        return pks.first
-		      end
-
-	        r = Hash[ r.map{|k,v| [k, (k==:status || v.nil? || v=='') ? v : m[v]]} ]
-          pk = pkh[m.call r[:constraint_name]]
-	        pk[:enabled] = r.delete(:status)=='ENABLED'
-	        pk[:columns] << r.delete(:column_name)
-	        pk.update r
-	      end
+      #   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
 
-	      unless options[:all] or (pks.length>1 and pks[0][:enabled] != pks[1][:enabled])
-		      return pks.first
-		    end
-	      pks
+	    # 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

data/sequel_oracle_extensions.gemspec

@@ -1,64 +1,56 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# 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.1"
+  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{2010-05-27}
+  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"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".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"
+    ".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.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.5.2}
   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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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.beta.8"])
+      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.beta.8"])
+      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.beta.8"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_oracle_extensions
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2011-08-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 3
         - 10
@@ -35,16 +38,16 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 description: Oracle extensions for Sequel, including MERGE statements, optimizer hints, and schema extensions.
@@ -58,7 +61,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - .rspec
 - LICENSE
 - README.rdoc
@@ -78,32 +80,34 @@ homepage: http://github.com/joekhoobyar/sequel_oracle_extensions
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Oracle MERGE, optimizer hints, an 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: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC