oracle_enhanced_plus_xmltype 0.0.4 → 0.0.5

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile

@@ -3,7 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in oracle_enhanced_plus_xmltype.gemspec
 gemspec
 
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '3.1.3'
 gem 'ruby-oci8', '2.0.6'
 #gem 'activerecord-oracle_enhanced-adapter', '1.3.2'
-gem 'activerecord-oracle_enhanced-adapter', :git => "https://github.com/rsim/oracle-enhanced.git"
+gem 'activerecord-oracle_enhanced-adapter'
+
+group :development, :test do
+  gem "ruby-debug"
+end

data/lib/oracle_enhanced_plus_xmltype.rb

@@ -17,6 +17,17 @@ if defined?(::Rails::Railtie)
           
           ActiveRecord::ConnectionAdapters::OracleEnhancedColumn.class_eval do
             self.send :include, ::OracleEnhancedColumnWithXmltype
+            #ugly, i know.
+            def initialize(name, default, sql_type = nil, null = true, table_name = nil, forced_column_type = nil, virtual=false) #:nodoc:
+              @table_name = table_name
+              @forced_column_type = forced_column_type
+              @virtual = sql_type =~ /xmltype/i ? false : virtual 
+              super(name, default, sql_type, null)
+              @virtual_column_data_default = default.inspect if @virtual
+              # Is column NCHAR or NVARCHAR2 (will need to use N'...' value quoting for these data types)?
+              # Define only when needed as adapter "quote" method will check at first if instance variable is defined.
+              @nchar = true if @type == :string && sql_type[0,1] == 'N'
+            end
           end
           
           ActiveRecord::ConnectionAdapters::OracleEnhancedOCIConnection.class_eval do

data/lib/oracle_enhanced_plus_xmltype/oracle_enhanced_column_with_xmltype.rb

@@ -1,9 +1,11 @@
+
 module OracleEnhancedColumnWithXmltype
   module ClassMethods
     
   end
   
   module InstanceMethods
+    
     def simplified_type(field_type)
       forced_column_type ||
       case field_type

data/lib/oracle_enhanced_plus_xmltype/version.rb

@@ -1,3 +1,3 @@
 module OracleEnhancedPlusXmltype
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/oracle_enhanced_plus_xmltype.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = %q{add XMLTYPE to active record oracle adapter}
   s.add_development_dependency "rspec", ">= 2.6.0"
   s.rubyforge_project = "oracle_enhanced_plus_xmltype"
-  s.add_dependency "rails", ">= 3.0.0"
-  #s.add_dependency "activerecord-oracle_enhanced-adapter", ">= 1.3.2"
+  s.add_dependency "rails", ">= 3.1.0"
+  # s.add_dependency "activerecord-oracle_enhanced-adapter", ">= 1.3.2"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/oracle_enhanced_plus_xmltype/oracle_enhanced_adapter_with_xmltype_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe "OracleEnhancedAdapter with xml type connection sanity check" do
+
+  it "should connect to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should_not be_nil
+    ActiveRecord::Base.connection.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
+  end
+
+  it "should connect to database as SYSDBA" do
+    ActiveRecord::Base.establish_connection(SYS_CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should_not be_nil
+    ActiveRecord::Base.connection.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
+  end
+
+  it "should be active after connection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should be_active
+  end
+
+  it "should not be active after disconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.connection.should_not be_active
+  end
+
+  it "should be active after reconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.reconnect!
+    ActiveRecord::Base.connection.should be_active
+  end
+
+end
+
+describe "OracleEnhancedAdapter" do
+
+
+  
+  describe "test constant update" do    
+    it "should update NATIVE_DATABASE_TYPES to include the xmltype type" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES.keys.should include(:xmltype)
+    end
+    
+    it "should update NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS to include the xmltype type" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter::NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS.keys.should include(:xmltype)
+    end
+  end
+  
+  describe "test 4k limit" do
+    before(:all) do
+      set_test_employees
+    end
+
+    after(:all) do
+      remove_test_employees
+    end
+    
+    it "should let data in that's larger than 4k" do
+      pending "need to fix 4k problem"
+      t = TestEmployee.new(:first_name => "some", :last_name => "name" , :data => test_data.merge(:bigKey => (1..(1024*1024)).map { |e| "#{rand(100)}" }.join("\n") ))
+      t.save
+    end
+  end
+
+  describe "test quote xml override" do
+    before(:all) do
+      set_test_employees
+    end
+
+    after(:all) do
+      remove_test_employees
+    end
+    
+    
+    before(:each) do
+      @xml_column = TestEmployee.columns.find {|c| c.type == :xmltype}
+    end
+    
+    it "should quote xml" do
+      TestEmployee.connection.should_receive(:quote_xml)
+      t = TestEmployee.create(:first_name => "some", :last_name => "name" , :data => test_data)
+    end
+    
+    it "should throw error if xml value isnt a hash" do
+      lambda { TestEmployee.create(:first_name => "some name", :last_name => "name", :data => "somestring") }.should raise_error( /XMLTYPE column must be of type Hash/)
+    end
+    
+    it "should throw an error if metadata is not a valid hash when saved" do
+      t = TestEmployee.new(:first_name => "some name", :last_name => "name", :data => (1..10).to_a)
+      expect { t.save }.to raise_error(  /XMLTYPE column must be of type Hash/)
+    end
+    
+    
+    it "should return nil if value is nil" do
+      TestEmployee.connection.should_receive(:quote_xml).and_return(nil)
+      TestEmployee.create(:first_name => "some name", :last_name => "name", :data => nil)
+    end
+    
+    it "should return the hash exactly as it was received", :wip => true do
+      t = TestEmployee.create(:first_name => "some", :last_name => "name" , :data => test_data)
+      t.data.stringify_keys.sort.should == test_data.stringify_keys.sort
+    end
+    
+
+  end
+  
+  describe "test column changes" do
+    before(:all) do
+      set_test_employees
+    end
+
+    after(:all) do
+      remove_test_employees
+    end
+    
+    
+    before(:each) do
+      @xml_column = TestEmployee.columns.find {|c| c.type == :xmltype}
+    end
+    
+    it "should not set virtual for xmltypes" do
+      @xml_column.should_not be_virtual
+    end
+    
+    it "should set virtual for reg virtual columns" do
+      TestEmployee.columns.find {|c| c.name == "percent" }.should be_virtual
+    end
+    
+    it "should set virtual default data for reg virtual columns" do
+      TestEmployee.columns.find {|c| c.name == "percent" }.virtual_column_data_default.should_not be_blank
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require "bundler"
+Bundler.setup(:default, :development)
+
+$:.unshift(File.expand_path('../lib', __FILE__))
+
+require 'rspec'
+
+require "rails/all"
+require 'activerecord-oracle_enhanced-adapter'
+require 'oracle_enhanced_plus_xmltype.rb'
+
+DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
+DATABASE_HOST = ENV['DATABASE_HOST'] || "192.168.1.7"
+DATABASE_PORT = ENV['DATABASE_PORT']
+DATABASE_USER = ENV['DATABASE_USER'] || 'oracle_enhanced'
+DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'oracle_enhanced'
+DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'oracle'
+
+CONNECTION_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
+  :username => DATABASE_USER,
+  :password => DATABASE_PASSWORD,
+  :encoding => "utf8"
+}
+
+SYS_CONNECTION_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
+  :username => "sys",
+  :password => DATABASE_SYS_PASSWORD,
+  :privilege => "SYSDBA"
+}
+
+SYSTEM_CONNECTION_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
+  :username => "system",
+  :password => DATABASE_SYS_PASSWORD
+}
+
+DATABASE_NON_DEFAULT_TABLESPACE = ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYSTEM"
+
+# Set default $KCODE to UTF8
+$KCODE = "UTF8"
+
+# set default time zone in TZ environment variable
+# which will be used to set session time zone
+ENV['TZ'] ||= 'Europe/Riga'
+
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+include SchemaSpecHelper
+include DataSpecHelper
+
+
+

data/spec/support/data_spec_helper.rb

@@ -0,0 +1,11 @@
+
+module DataSpecHelper
+  def test_data
+    {
+      :key => "some_value", 
+      :arrayKey => ("a".."z").to_a,
+      :hashKey => {:innerKey => "innerValue", :innerKey2 => "inners"} 
+    }
+  end
+  
+end

data/spec/support/schema_spec_helper.rb

@@ -0,0 +1,35 @@
+module SchemaSpecHelper
+  def schema_define(&block)
+    ActiveRecord::Schema.define do
+      suppress_messages do
+        instance_eval(&block)
+      end
+    end
+  end
+  
+  def remove_test_employees
+    ActiveRecord::Base.connection.execute "DROP TABLE test_employees"
+    ActiveRecord::Base.connection.execute "DROP SEQUENCE test_employees_seq"
+    Object.send(:remove_const, "TestEmployee")
+  end
+  
+  def set_test_employees
+    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    # debugger
+    schema_define do
+      expr = "( numerator/NULLIF(denominator,0) )*100"
+      create_table :test_employees, :force => true do |t|
+        t.string :first_name
+        t.string :last_name
+        t.integer :numerator, :default=>0
+        t.integer :denominator, :default=>0
+        t.virtual :percent, :default => expr
+        t.xmltype :data
+        # t.virtual :employee_name, :default => "first_name || ' ' || last_name"
+      end
+    end
+    cls = Class.new(ActiveRecord::Base)
+    Object.const_set "TestEmployee", cls
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oracle_enhanced_plus_xmltype
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jake Varghese
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -05:00
+date: 2012-03-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,24 +32,24 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
+        version: 3.1.0
+  prerelease: false
+  requirement: *id002
 description: add XMLTYPE to active record oracle adapter
 email: 
 - jake3030@yahoo.com
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Rakefile
 - lib/oracle_enhanced_plus_xmltype.rb
@@ -70,6 +71,10 @@ files:
 - lib/oracle_enhanced_plus_xmltype/oracle_enhanced_schema_definitions_with_xmltype.rb
 - lib/oracle_enhanced_plus_xmltype/version.rb
 - oracle_enhanced_plus_xmltype.gemspec
+- spec/oracle_enhanced_plus_xmltype/oracle_enhanced_adapter_with_xmltype_spec.rb
+- spec/spec_helper.rb
+- spec/support/data_spec_helper.rb
+- spec/support/schema_spec_helper.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -100,9 +105,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oracle_enhanced_plus_xmltype
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: add XMLTYPE to active record oracle adapter
-test_files: []
-
+test_files: 
+- spec/oracle_enhanced_plus_xmltype/oracle_enhanced_adapter_with_xmltype_spec.rb
+- spec/spec_helper.rb
+- spec/support/data_spec_helper.rb
+- spec/support/schema_spec_helper.rb