sequel_oracle_extensions 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/sequel/oracle_extensions/schemata.rb

@@ -88,7 +88,7 @@ module Sequel
       #   # } }
 	    def indexes(table, opts={})
 	    	ds, result    = metadata_dataset, []
-				outm          = lambda{|k| ds.send :output_identifier, k}
+				outm          = sql_ident_to_sym_proc ds
 	    	schema, table = ds.schema_and_table(table).map{|k| k.to_s.send(ds.identifier_input_method) if k} 
 	    	who           = schema.nil? ? 'user' : 'all'
 	    	
@@ -112,15 +112,14 @@ module Sequel
 				# 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 = {}, []
-				p ds.sql
 				ds.each do |row|
-					key = :"#{outm[row[:index_name]]}"
+					key = outm[row[:index_name]]
 					unless subhash = hash[key]
 						subhash = hash[key] = {
 							:columns=>[], :unique=>(row[:uniqueness]=='UNIQUE'), :logging=>(row[:logging]=='YES'),
 							:db_type=>row[:index_type], :valid=>(row[:status]=='VALID'),
 							:parallel=>(row[:degree]!='1' || row[:instances]!='1'),
-							:tablespace=>:"#{outm[row[:tablespace_name]]}", :partitioned=>(row[:partitioned]=='YES'),
+							:tablespace=>outm[row[:tablespace_name]], :partitioned=>(row[:partitioned]=='YES'),
 							:visible=>(row[:visibility]=='VISIBLE'), :compress=>(row[:compression]!='DISABLED')
 						}
 						case subhash[:db_type]; when 'BITMAP','NORMAL'
@@ -131,16 +130,16 @@ module Sequel
 						  subhash[:join] = []
 				    end
 					end
-					subhash[:columns] << :"#{outm[row[:column_name]]}"
+					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]]}"
+					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]]}"
+					subhash[:columns][pos] = outm["#{row[:outer_table_name]}__#{ref_column}"]
+					subhash[:join][pos]    = outm[row[:inner_table_column]]
 				end
 				hash
 	    end
@@ -251,6 +250,19 @@ module Sequel
 	    	table_constraints table, 'R', options.merge(:table_name_column=>:t__table_name)
 	    end
 
+    protected
+
+      # Type-safe (and nil safe) conversion for SQL identifers to Ruby symbols.
+      # Returns a proc that converts String types and passes through all other types
+      def sql_ident_to_sym_proc(dataset)
+        lambda do |k|
+          unless String===k then k else
+            k = dataset.send :output_identifier, k
+            String===k ? k.intern : k
+          end
+        end
+      end
+
     private
 
 			# Overridden because Oracle has slightly different syntax.
@@ -341,7 +353,7 @@ module Sequel
 	  	# Internal helper method for introspection of table constraints.
 	  	def table_constraints(table, constraint_type, options={})
 	    	ds, result    = metadata_dataset, []
-				outm          = lambda{|k| ds.send :output_identifier, k}
+				outm          = sql_ident_to_sym_proc ds
 	    	schema, table = ds.schema_and_table(table).map{|k| k.to_s.send(ds.identifier_input_method) if k} 
 	    	x_cons        = schema.nil? ? 'user_cons' : 'all_cons'
 	    	
@@ -366,23 +378,23 @@ module Sequel
 				# Return the table constraints as a hash of subhashes, including a column list.
 				hash = {}
 				ds.each do |row|
-					key = :"#{outm[row[:constraint_name]]}"
+					key = outm[row[:constraint_name]]
 					unless subhash = hash[key]
 						subhash = hash[key] = {
 							:rely=>(row[:rely]=='RELY'), :enabled=>(row[:status]=='ENABLED'),
 							:validated=>(row[:validated]=='VALIDATED'), :columns=>[]
 						}
 						if row.include? :r_constraint_name
-							subhash[:ref_constraint] = :"#{outm[row[:r_constraint_name]]}"
+							subhash[:ref_constraint] = outm[row[:r_constraint_name]]
 							if options[:table_name_column]==:t__table_name
-							then subhash[:table] = :"#{outm[row[:table_name]]}"
-							else subhash[:ref_table] = :"#{outm[row[:r_table_name]]}"
+							then subhash[:table] = outm[row[:table_name]]
+							else subhash[:ref_table] = outm[row[:r_table_name]]
 							end
 						elsif row.include? :index_name
-							subhash[:using_index] = :"#{outm[row[:index_name]]}"
+							subhash[:using_index] = outm[row[:index_name]]
 						end
 					end
-					subhash[:columns] << :"#{outm[row[:column_name]]}"
+					subhash[:columns] << outm[row[:column_name]]
 				end
 				hash
 	  	end

data/sequel_oracle_extensions.gemspec

@@ -1,62 +1,61 @@
-# 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.6.0"
-
-  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.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, 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
-    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.25.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<sequel>, [">= 3.25.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<sequel>, [">= 3.25.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.6.1"
+
+  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.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.7.2}
+  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
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sequel>, [">= 3.25.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<sequel>, [">= 3.25.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<sequel>, [">= 3.25.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_oracle_extensions
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -04:00
-default_executable: 
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -75,7 +74,6 @@ files:
 - spec/sequel/oracle_extensions/hints_spec.rb
 - spec/sequel/oracle_extensions/merge_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/joekhoobyar/sequel_oracle_extensions
 licenses: []
 
@@ -105,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Oracle MERGE, optimizer hints, and schema extensions for Sequel