activerecord-oracle_enhanced-adapter 1.3.1 → 1.3.2

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter context index" do
   include SchemaSpecHelper
@@ -58,11 +57,11 @@ describe "OracleEnhancedAdapter context index" do
   before(:all) do
     grant_ctxapp
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @conn = ActiveRecord::Base.connection
   end
 
   describe "on single table" do
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       @title_words = %w{aaa bbb ccc}
       @body_words = %w{foo bar baz}
       create_table_posts
@@ -162,6 +161,7 @@ describe "OracleEnhancedAdapter context index" do
 
   describe "on multiple tables" do
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       create_tables
       class ::Post < ActiveRecord::Base
         has_many :comments, :dependent => :destroy
@@ -224,6 +224,7 @@ describe "OracleEnhancedAdapter context index" do
 
   describe "with specified tablespace" do
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       create_table_posts
       class ::Post < ActiveRecord::Base
         has_context_index
@@ -278,6 +279,7 @@ describe "OracleEnhancedAdapter context index" do
     describe "without table prefixe and suffix" do
 
       before(:all) do
+        @conn = ActiveRecord::Base.connection
         create_tables
       end
 

data/spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter to_d method" do
   it "BigDecimal#to_d returns the same decimal number" do

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 unless defined?(NO_COMPOSITE_PRIMARY_KEYS)
 

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+# encoding: utf-8
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter date type detection based on column names" do
   before(:all) do
@@ -1119,3 +1120,62 @@ describe "OracleEnhancedAdapter handling of BLOB columns" do
   end
 end
 
+describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    @conn.execute <<-SQL
+      CREATE TABLE test_items (
+        id                  NUMBER(6,0) PRIMARY KEY,
+        nchar_column        NCHAR(20),
+        nvarchar2_column    NVARCHAR2(20),
+        char_column         CHAR(20),
+        varchar2_column     VARCHAR2(20)
+      )
+    SQL
+    @conn.execute "CREATE SEQUENCE test_items_seq"
+  end
+
+  after(:all) do
+    @conn.execute "DROP TABLE test_items"
+    @conn.execute "DROP SEQUENCE test_items_seq"
+  end
+
+  before(:each) do
+    class ::TestItem < ActiveRecord::Base
+    end
+  end
+
+  after(:each) do
+    Object.send(:remove_const, "TestItem")
+  end
+
+  it "should set nchar instance variable" do
+    columns = @conn.columns('test_items')
+    %w(nchar_column nvarchar2_column char_column varchar2_column).each do |col|
+      column = columns.detect{|c| c.name == col}
+      column.type.should == :string
+      column.nchar.should == (col[0,1] == 'n' ? true : nil)
+    end
+  end
+
+  it "should quote with N prefix" do
+    columns = @conn.columns('test_items')
+    %w(nchar_column nvarchar2_column char_column varchar2_column).each do |col|
+      column = columns.detect{|c| c.name == col}
+      @conn.quote('abc', column).should == (column.nchar ? "N'abc'" : "'abc'")
+      @conn.quote(nil, column).should == 'NULL'
+    end
+  end
+
+  it "should create record" do
+    nchar_data = 'āčē'
+    item = TestItem.create(
+      :nchar_column => nchar_data,
+      :nvarchar2_column => nchar_data
+    ).reload
+    item.nchar_column.should == nchar_data + ' '*17
+    item.nvarchar2_column.should == nchar_data
+  end
+
+end

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   include LoggerSpecHelper

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 if ActiveRecord::Base.instance_methods.include?('changed?')
 

data/spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter emulate OracleAdapter" do
 

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 require 'ruby-plsql'
 

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter schema dump" do
   include SchemaSpecHelper
@@ -228,6 +228,15 @@ describe "OracleEnhancedAdapter schema dump" do
       end
       standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :columns => \["baz_id", "fooz_id"\], :name => "comments_posts_baz_fooz_fk"/
     end
+    it "should include foreign keys following all tables" do
+      # if foreign keys preceed declaration of all tables
+      # it can cause problems when using db:test rake tasks
+      schema_define do
+        add_foreign_key :test_comments, :test_posts
+      end
+      dump = standard_dump
+      dump.rindex("create_table").should < dump.index("add_foreign_key")
+    end
   end
 
   describe "synonyms" do

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -1,16 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter schema definition" do
   include SchemaSpecHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @conn = ActiveRecord::Base.connection
   end
 
   describe "table and sequence creation with non-default primary key" do
 
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       schema_define do
         create_table :keyboards, :force => true, :id  => false do |t|
           t.primary_key :key_number
@@ -64,9 +64,14 @@ describe "OracleEnhancedAdapter schema definition" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_sequence_start_value = @saved_sequence_start_value
     end
 
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
     before(:each) do
       save_default_sequence_start_value
     end
+
     after(:each) do
       restore_default_sequence_start_value
       schema_define do
@@ -137,8 +142,8 @@ describe "OracleEnhancedAdapter schema definition" do
       end
     end
 
-    after(:all) do
-      seq_name = @sequence_name
+    def drop_table_with_trigger(options = {})
+      seq_name = options[:sequence_name]
       schema_define do
         drop_table :test_employees, (seq_name ? {:sequence_name => seq_name} : {})
       end
@@ -148,11 +153,16 @@ describe "OracleEnhancedAdapter schema definition" do
 
     describe "with default primary key" do
       before(:all) do
+        @conn = ActiveRecord::Base.connection
         create_table_with_trigger
         class ::TestEmployee < ActiveRecord::Base
         end
       end
 
+      after(:all) do
+        drop_table_with_trigger
+      end
+
       it "should populate primary key using trigger" do
         lambda do
           @conn.execute "INSERT INTO test_employees (first_name) VALUES ('Raimonds')"
@@ -172,11 +182,17 @@ describe "OracleEnhancedAdapter schema definition" do
 
     describe "with separate creation of primary key trigger" do
       before(:all) do
+        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+        @conn = ActiveRecord::Base.connection
         create_table_and_separately_trigger
         class ::TestEmployee < ActiveRecord::Base
         end
       end
 
+      after(:all) do
+        drop_table_with_trigger
+      end
+
       it "should populate primary key using trigger" do
         lambda do
           @conn.execute "INSERT INTO test_employees (first_name) VALUES ('Raimonds')"
@@ -196,6 +212,8 @@ describe "OracleEnhancedAdapter schema definition" do
 
     describe "with non-default primary key and non-default sequence name" do
       before(:all) do
+        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+        @conn = ActiveRecord::Base.connection
         @primary_key = "employee_id"
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:primary_key => @primary_key, :sequence_name => @sequence_name)
@@ -204,6 +222,10 @@ describe "OracleEnhancedAdapter schema definition" do
         end
       end
 
+      after(:all) do
+        drop_table_with_trigger(:sequence_name => @sequence_name)
+      end
+
       it "should populate primary key using trigger" do
         lambda do
           @conn.execute "INSERT INTO test_employees (first_name) VALUES ('Raimonds')"
@@ -223,6 +245,8 @@ describe "OracleEnhancedAdapter schema definition" do
 
     describe "with non-default sequence name and non-default trigger name" do
       before(:all) do
+        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+        @conn = ActiveRecord::Base.connection
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:sequence_name => @sequence_name, :trigger_name => "test_employees_t1")
         class ::TestEmployee < ActiveRecord::Base
@@ -230,6 +254,10 @@ describe "OracleEnhancedAdapter schema definition" do
         end
       end
 
+      after(:all) do
+        drop_table_with_trigger(:sequence_name => @sequence_name)
+      end
+
       it "should populate primary key using trigger" do
         lambda do
           @conn.execute "INSERT INTO test_employees (first_name) VALUES ('Raimonds')"
@@ -260,6 +288,10 @@ describe "OracleEnhancedAdapter schema definition" do
       end
     end
 
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
     after(:each) do
       schema_define do
         drop_table :test_employees
@@ -312,6 +344,7 @@ describe "OracleEnhancedAdapter schema definition" do
   describe "create triggers" do
 
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       schema_define do
         create_table  :test_employees do |t|
           t.string    :first_name
@@ -346,6 +379,9 @@ describe "OracleEnhancedAdapter schema definition" do
   end
 
   describe "add index" do
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
 
     it "should return default index name if it is not larger than 30 characters" do
       @conn.index_name("employees", :column => "first_name").should == "index_employees_on_first_name"
@@ -667,6 +703,10 @@ describe "OracleEnhancedAdapter schema definition" do
   end
 
   describe "disable referential integrity" do
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
     before(:each) do
       schema_define do
         create_table :test_posts, :force => true do |t|
@@ -705,6 +745,7 @@ describe "OracleEnhancedAdapter schema definition" do
 
   describe "synonyms" do
     before(:all) do
+      @conn = ActiveRecord::Base.connection
       @db_link = "db_link"
       @username = @db_link_username = CONNECTION_PARAMS[:username]
       @db_link_password = CONNECTION_PARAMS[:password]
@@ -825,6 +866,10 @@ describe "OracleEnhancedAdapter schema definition" do
   end
 
   describe "miscellaneous options" do
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+    end
+
     before(:each) do
       @conn.instance_variable_set :@would_execute_sql, @would_execute_sql=''
       class <<@conn

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "OracleEnhancedAdapter structure dump" do
   include LoggerSpecHelper

data/spec/spec_helper.rb

@@ -1,20 +1,10 @@
 require 'rubygems'
+require "bundler"
+Bundler.setup(:default, :development)
 
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+$:.unshift(File.expand_path('../../lib', __FILE__))
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'spec'
+require 'rspec'
 
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
   puts "==> Running specs with MRI version #{RUBY_VERSION}"
@@ -23,7 +13,7 @@ elsif RUBY_ENGINE == 'jruby'
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
-ENV['RAILS_GEM_VERSION'] ||= '3.0.0'
+ENV['RAILS_GEM_VERSION'] ||= '3.1-master'
 NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5'
 
 puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
@@ -194,8 +184,8 @@ SYSTEM_CONNECTION_PARAMS = {
   :password => DATABASE_SYS_PASSWORD
 }
 
-# For JRuby Set default $KCODE to UTF8
-$KCODE = "UTF8" if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+# Set default $KCODE to UTF8
+$KCODE = "UTF8"
 
 # set default time zone in TZ environment variable
 # which will be used to set session time zone

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -15,25 +15,170 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +03:00
+date: 2011-01-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  requirement: *id001
+  prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
+  requirement: *id002
+  prerelease: false
   name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
+  requirement: *id004
+  prerelease: false
+  name: activemodel
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id001
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  prerelease: false
+  name: activesupport
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  prerelease: false
+  name: actionpack
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  prerelease: false
+  name: railties
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  prerelease: false
+  name: arel
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  prerelease: false
+  name: rack
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 4
+        - 4
+        version: 0.4.4
+  requirement: *id010
+  prerelease: false
+  name: ruby-plsql
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  requirement: *id011
+  prerelease: false
+  name: ruby-oci8
 description: |
   Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
   This adapter is superset of original ActiveRecord Oracle adapter.
@@ -46,7 +191,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
+- .rspec
 - Gemfile
 - History.txt
 - License.txt
@@ -90,15 +235,14 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/rsim/oracle-enhanced
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -122,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord