activerecord-oracle_enhanced-adapter 1.2.3 → 1.2.4

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -290,6 +290,12 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       @employee2.job_id.class.should == Fixnum
     end
 
+    it "should return Fixnum value from NUMBER column with integer value using _before_type_cast method" do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
+      create_employee2
+      @employee2.job_id_before_type_cast.class.should == Fixnum
+    end
+
     it "should return BigDecimal value from NUMBER column if column name does not contain 'id' and emulate_integers_by_column_name is true" do
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
       create_employee2

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -1,61 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "OracleEnhancedAdapter original schema dump" do
-
-  before(:all) do
-    if !defined?(RUBY_ENGINE)
-      if ActiveRecord::Base.respond_to?(:oracle_connection)
-        @old_conn = ActiveRecord::Base.oracle_connection(CONNECTION_PARAMS)
-        @old_conn.class.should == ActiveRecord::ConnectionAdapters::OracleAdapter
-      end
-    elsif RUBY_ENGINE == 'jruby'
-      @old_conn = ActiveRecord::Base.jdbc_connection(JDBC_CONNECTION_PARAMS)
-      @old_conn.class.should == ActiveRecord::ConnectionAdapters::JdbcAdapter
-    end
-
-    @new_conn = ActiveRecord::Base.oracle_enhanced_connection(CONNECTION_PARAMS)
-    @new_conn.class.should == ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
-  end
-
-  after(:all) do
-    # Workaround for undefining callback that was defined by JDBC adapter
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-      ActiveRecord::Base.class_eval do
-        def after_save_with_oracle_lob
-          nil
-        end
-      end
-    end
-  end
-
-  if !defined?(RUBY_ENGINE) && ActiveRecord::Base.respond_to?(:oracle_connection) || defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-    it "should return the same tables list as original oracle adapter" do
-      @new_conn.tables.sort.should == @old_conn.tables.sort
-    end
-
-    it "should return the same index list as original oracle adapter" do
-      @new_conn.indexes('employees').sort_by(&:name).should == @old_conn.indexes('employees').sort_by(&:name)
-    end
-
-    it "should return the same pk_and_sequence_for as original oracle adapter" do
-      if @old_conn.respond_to?(:pk_and_sequence_for)
-        @new_conn.tables.each do |t|
-          @new_conn.pk_and_sequence_for(t).should == @old_conn.pk_and_sequence_for(t)
-        end
-      end
-    end
-
-    it "should return the same structure dump as original oracle adapter" do
-      @new_conn.structure_dump.split(";\n\n").sort.should == @old_conn.structure_dump.split(";\n\n").sort
-    end
-
-    it "should return the same structure drop as original oracle adapter" do
-      @new_conn.structure_drop.split(";\n\n").sort.should == @old_conn.structure_drop.split(";\n\n").sort
-    end
-  end
-
-end
-
 describe "OracleEnhancedAdapter schema dump" do
   include SchemaSpecHelper
 
@@ -225,32 +169,35 @@ describe "OracleEnhancedAdapter schema dump" do
 
   end
 
-end
-
-describe "OracleEnhancedAdapter structure dump" do
-  before(:all) do
-    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @conn = ActiveRecord::Base.connection
+  describe "temporary tables" do
+    after(:each) do
+      drop_test_posts_table
+    end
+    
+    it "should include temporary options" do
+      create_test_posts_table(:temporary => true)
+      standard_dump.should =~ /create_table "test_posts", :temporary => true/
+    end
   end
 
-  describe "database stucture dump extentions" do
-    before(:all) do
-      @conn.execute <<-SQL
-        CREATE TABLE nvarchartable (
-          unq_nvarchar  NVARCHAR2(255) DEFAULT NULL
-        )
-      SQL
+  describe "indexes" do
+    after(:each) do
+      drop_test_posts_table
     end
 
-    after(:all) do
-      @conn.execute "DROP TABLE nvarchartable"
+    it "should not specify default tablespace in add index" do
+      create_test_posts_table
+      standard_dump.should =~ /add_index \"test_posts\", \[\"title\"\], :name => \"index_test_posts_on_title\"$/
     end
 
-    it "should return the character size of nvarchar fields" do
-      if /.*unq_nvarchar nvarchar2\((\d+)\).*/ =~ @conn.structure_dump
-         "#$1".should == "255"
-      end
+    it "should not specify default tablespace in add index" do
+      tablespace_name = @conn.default_tablespace
+      @conn.stub!(:default_tablespace).and_return('dummy')
+      create_test_posts_table
+      standard_dump.should =~ /add_index \"test_posts\", \[\"title\"\], :name => \"index_test_posts_on_title\", :tablespace => \"#{tablespace_name}\"$/
     end
+
   end
 
 end
+

data/spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb

@@ -720,4 +720,65 @@ describe "OracleEnhancedAdapter schema definition" do
 
   end
 
+  describe "alter columns with column cache" do
+    include LoggerSpecHelper
+
+    before(:all) do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+    end
+
+    after(:all) do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = nil
+    end
+
+    before(:each) do
+      schema_define do
+        create_table :test_posts, :force => true do |t|
+          t.string :title, :null => false
+        end
+      end
+      class ::TestPost < ActiveRecord::Base; end
+      TestPost.columns_hash['title'].null.should be_false
+    end
+
+    after(:each) do
+      Object.send(:remove_const, "TestPost")
+      schema_define { drop_table :test_posts }
+    end
+
+    it "should change column to nullable" do
+      schema_define do
+        change_column :test_posts, :title, :string, :null => true
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['title'].null.should be_true
+    end
+
+    it "should add column" do
+      schema_define do
+        add_column :test_posts, :body, :string
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['body'].should_not be_nil
+    end
+
+    it "should rename column" do
+      schema_define do
+        rename_column :test_posts, :title, :subject
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['subject'].should_not be_nil
+      TestPost.columns_hash['title'].should be_nil
+    end
+
+    it "should remove column" do
+      schema_define do
+        remove_column :test_posts, :title
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['title'].should be_nil
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -41,13 +41,8 @@ else
   require 'action_controller/session/active_record_store'
 end
 if !defined?(RUBY_ENGINE)
-  # change version to 1.0.6 to test with old oracle_adapter
   gem 'ruby-oci8', '=2.0.3'
   require 'oci8'
-  if OCI8::VERSION =~ /^1\./
-    gem "activerecord-oracle-adapter"
-    require 'active_record/connection_adapters/oracle_adapter'
-  end
 elsif RUBY_ENGINE == 'ruby'
   gem 'ruby-oci8', '=2.0.3'
   require 'oci8'
@@ -57,6 +52,7 @@ elsif RUBY_ENGINE == 'jruby'
 end
 
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
+require 'ruby-plsql'
 
 module LoggerSpecHelper
   def log_to(stream)
@@ -84,8 +80,8 @@ end
 DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
 DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
 DATABASE_PORT = ENV['DATABASE_PORT'] || 1521
-DATABASE_USER = ENV['DATABASE_USER'] || 'hr'
-DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'hr'
+DATABASE_USER = ENV['DATABASE_USER'] || 'oracle_enhanced'
+DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'oracle_enhanced'
 DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'admin'
 
 CONNECTION_PARAMS = {
@@ -96,14 +92,6 @@ CONNECTION_PARAMS = {
   :password => DATABASE_PASSWORD
 }
 
-JDBC_CONNECTION_PARAMS = {
-  :adapter => "jdbc",
-  :driver => "oracle.jdbc.driver.OracleDriver",
-  :url => "jdbc:oracle:thin:@#{DATABASE_HOST}:#{DATABASE_PORT}:#{DATABASE_NAME}",
-  :username => DATABASE_USER,
-  :password => DATABASE_PASSWORD
-}
-
 SYS_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +02:00
+date: 2010-02-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced_version.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
@@ -110,6 +111,7 @@ specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord
 test_files: 
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb