pmacs-activerecord-oracle_enhanced-adapter 1.4.2.rc1 → 1.5.5.1

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -2,10 +2,31 @@ require 'spec_helper'
 
 describe "OracleEnhancedAdapter schema definition" do
   include SchemaSpecHelper
+  include LoggerSpecHelper
 
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-    @oracle11g = !! ActiveRecord::Base.connection.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+    @oracle11g_or_higher = !! !! ActiveRecord::Base.connection.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
+  end
+
+  describe 'option to create sequence when adding a column' do
+    before do
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :keyboards, :force => true, :id  => false do |t|
+          t.string      :name
+        end
+        add_column :keyboards, :id, :primary_key
+      end
+      class ::Keyboard < ActiveRecord::Base; end
+    end
+
+    it 'creates a sequence when adding a column with create_sequence = true' do
+      _, sequence_name = ActiveRecord::Base.connection.pk_and_sequence_for_without_cache(:keyboards)
+
+      sequence_name.should == Keyboard.sequence_name
+    end
   end
 
   describe "table and sequence creation with non-default primary key" do
@@ -22,11 +43,7 @@ describe "OracleEnhancedAdapter schema definition" do
         end
       end
       class ::Keyboard < ActiveRecord::Base
-        if self.respond_to?(:primary_key=)
-          self.primary_key = :key_number
-        else
-          set_primary_key :key_number
-        end
+        self.primary_key = :key_number
       end
       class ::IdKeyboard < ActiveRecord::Base
       end
@@ -51,6 +68,15 @@ describe "OracleEnhancedAdapter schema definition" do
     end
   end
 
+  describe "default sequence name" do
+
+    it "should return sequence name without truncating too much" do
+      seq_name_length = ActiveRecord::Base.connection.sequence_name_length
+      tname = "#{DATABASE_USER}" + "." +"a"*(seq_name_length - DATABASE_USER.length) + "z"*(DATABASE_USER).length
+      ActiveRecord::Base.connection.default_sequence_name(tname).should match (/z_seq$/)
+    end
+  end
+
   describe "sequence creation parameters" do
 
     def create_test_employees_table(sequence_start_value = nil)
@@ -186,6 +212,15 @@ describe "OracleEnhancedAdapter schema definition" do
         e = TestEmployee.create!(:first_name => 'Raimonds')
         @conn.select_value("SELECT test_employees_seq.currval FROM dual").should == e.id
       end
+
+      it "should not generate NoMethodError for :returning_id:Symbol" do
+        set_logger
+        @conn.reconnect! unless @conn.active?
+        insert_id = @conn.insert("INSERT INTO test_employees (first_name) VALUES ('Yasuo')", nil, "id")
+        @logger.output(:error).should_not match(/^Could not log "sql.active_record" event. NoMethodError: undefined method `name' for :returning_id:Symbol/)
+        clear_logger
+      end
+
     end
 
     describe "with separate creation of primary key trigger" do
@@ -226,11 +261,7 @@ describe "OracleEnhancedAdapter schema definition" do
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:primary_key => @primary_key, :sequence_name => @sequence_name)
         class ::TestEmployee < ActiveRecord::Base
-          if self.respond_to?(:primary_key=)
-            self.primary_key = "employee_id"
-          else
-            set_primary_key "employee_id"
-          end
+          self.primary_key = "employee_id"
         end
       end
 
@@ -262,11 +293,7 @@ describe "OracleEnhancedAdapter schema definition" do
         @sequence_name = "test_employees_s"
         create_table_with_trigger(:sequence_name => @sequence_name, :trigger_name => "test_employees_t1")
         class ::TestEmployee < ActiveRecord::Base
-          if self.respond_to?(:sequence_name=)
-            self.sequence_name = :autogenerated
-          else
-            set_sequence_name :autogenerated
-          end
+          self.sequence_name = :autogenerated
         end
       end
 
@@ -313,7 +340,7 @@ describe "OracleEnhancedAdapter schema definition" do
         drop_table :test_employees
       end
       Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.table_name_prefix = ''
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
@@ -364,17 +391,26 @@ describe "OracleEnhancedAdapter schema definition" do
         schema_define do
           drop_table :test_employees rescue nil
           drop_table :new_test_employees rescue nil
+          drop_table :test_employees_no_primary_key rescue nil
+
           create_table  :test_employees do |t|
             t.string    :first_name
             t.string    :last_name
           end
-      end
+
+          create_table  :test_employees_no_pkey, :id => false do |t|
+            t.string    :first_name
+            t.string    :last_name
+          end
+        end
     end
 
     after(:each) do
       schema_define do
         drop_table :test_employees rescue nil
         drop_table :new_test_employees rescue nil
+        drop_table :test_employees_no_pkey rescue nil
+        drop_table :new_test_employees_no_pkey rescue nil
       end
     end
 
@@ -396,6 +432,12 @@ describe "OracleEnhancedAdapter schema definition" do
       end.should raise_error
     end
 
+    it "should rename table when table has no primary key and sequence" do
+      lambda do
+        @conn.rename_table("test_employees_no_pkey","new_test_employees_no_pkey")
+      end.should_not raise_error
+    end
+
   end
 
   describe "create triggers" do
@@ -536,7 +578,12 @@ end
   end
 
   describe "foreign key constraints" do
+    let(:table_name_prefix) { '' }
+    let(:table_name_suffix) { '' }
+
     before(:each) do
+      ActiveRecord::Base.table_name_prefix = table_name_prefix
+      ActiveRecord::Base.table_name_suffix = table_name_suffix
       schema_define do
         create_table :test_posts, :force => true do |t|
           t.string :title
@@ -562,6 +609,8 @@ end
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
+      ActiveRecord::Base.table_name_prefix = ''
+      ActiveRecord::Base.table_name_suffix = ''
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
     end
 
@@ -574,6 +623,34 @@ end
       end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TEST_COMMENTS_TEST_POST_ID_FK/}
     end
 
+    context "with table_name_prefix" do
+      let(:table_name_prefix) { 'xxx_' }
+
+      it "should use table_name_prefix for foreign table" do
+        schema_define do
+          add_foreign_key :test_comments, :test_posts
+        end
+
+        lambda do
+          TestComment.create(:body => "test", :test_post_id => 1)
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.XXX_TES_COM_TES_POS_ID_FK/}
+      end
+    end
+
+    context "with table_name_suffix" do
+      let(:table_name_suffix) { '_xxx' }
+
+      it "should use table_name_suffix for foreign table" do
+        schema_define do
+          add_foreign_key :test_comments, :test_posts
+        end
+
+        lambda do
+          TestComment.create(:body => "test", :test_post_id => 1)
+        end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TES_COM_XXX_TES_POS_ID_FK/}
+      end
+    end
+
     it "should add foreign key with name" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, :name => "comments_posts_fk"
@@ -757,7 +834,6 @@ end
     end
 
     it "should add foreign key in change_table" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -773,7 +849,6 @@ end
     end
 
     it "should add foreign key in change_table references" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -788,7 +863,6 @@ end
     end
 
     it "should remove foreign key by table name" do
-      return pending("Not in this ActiveRecord version") unless ENV['RAILS_GEM_VERSION'] >= '2.1'
       schema_define do
         create_table :test_comments, :force => true do |t|
           t.string :body, :limit => 4000
@@ -874,11 +948,7 @@ end
 
     before(:each) do
       class ::TestPost < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "synonym_to_posts"
-        else
-          set_table_name "synonym_to_posts"
-        end
+        self.table_name = "synonym_to_posts"
       end
     end
 
@@ -1016,11 +1086,19 @@ end
       TestPost.columns_hash['title'].should be_nil
       TestPost.columns_hash['content'].should be_nil
     end
+
+    it "should ignore type and options parameter and remove column" do
+      schema_define do
+        remove_column :test_posts, :title, :string, {}
+      end
+      TestPost.reset_column_information
+      TestPost.columns_hash['title'].should be_nil
+    end
   end
 
   describe 'virtual columns in create_table' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
     end
 
     it 'should create virtual column with old syntax' do
@@ -1031,11 +1109,7 @@ end
         end
       end
       class ::TestFraction < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "test_fractions"
-        else
-          set_table_name "test_fractions"
-        end
+        self.table_name = "test_fractions"
       end
 
       TestFraction.reset_column_information
@@ -1070,7 +1144,7 @@ end
 
   describe 'virtual columns' do
     before(:each) do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
       expr = "( numerator/NULLIF(denominator,0) )*100"
       schema_define do
         create_table :test_fractions, :force => true do |t|
@@ -1080,17 +1154,13 @@ end
         end
       end
       class ::TestFraction < ActiveRecord::Base
-        if self.respond_to?(:table_name=)
-          self.table_name = "test_fractions"
-        else
-          set_table_name "test_fractions"
-        end
+        self.table_name = "test_fractions"
       end
       TestFraction.reset_column_information
     end
 
     after(:each) do
-      if @oracle11g
+      if @oracle11g_or_higher
         schema_define do
           drop_table :test_fractions
         end
@@ -1235,7 +1305,7 @@ end
       it "should use correct tablespace" do
         ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:table] = DATABASE_NON_DEFAULT_TABLESPACE
         @conn.create_table :tablespace_tests do |t|
-          t.integer :id
+          t.string :foo
         end
         @would_execute_sql.should =~ /CREATE +TABLE .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
       end
@@ -1276,5 +1346,65 @@ end
       ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces.delete(:index)
       @would_execute_sql.should =~ /CREATE +INDEX .* ON .* \(.*\) TABLESPACE #{DATABASE_NON_DEFAULT_TABLESPACE}/
     end
+
+    describe "#initialize_schema_migrations_table" do
+      # In Rails 2.3 to 3.2.x the index name for the migrations
+      # table is hard-coded. We can modify the index name here
+      # so we can support prefixes/suffixes that would
+      # cause the index to be too long.
+      #
+      # Rails 4 can use this solution as well.
+      after(:each) do
+        ActiveRecord::Base.table_name_prefix = ''
+        ActiveRecord::Base.table_name_suffix = ''
+      end
+
+      def add_schema_migrations_index
+        schema_define do
+          initialize_schema_migrations_table
+        end
+      end
+
+      context "without prefix or suffix" do
+        it "should not truncate the index name" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "UNIQUE_SCHEMA_MIGRATIONS" ON "SCHEMA_MIGRATIONS" ("VERSION")')
+        end
+      end
+
+      context "with prefix" do
+        before { ActiveRecord::Base.table_name_prefix = 'toolong_' }
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the prefix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "TOOLONG_UNIQUE_SCHEMA_MIGRATIO" ON "TOOLONG_SCHEMA_MIGRATIONS" ("VERSION")')
+        end
+      end
+
+      context "with suffix" do
+        before { ActiveRecord::Base.table_name_suffix = '_toolong' }
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the suffix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "UNIQUE_SCHEMA_MIGRATIO_TOOLONG" ON "SCHEMA_MIGRATIONS_TOOLONG" ("VERSION")')
+        end
+      end
+
+      context "with prefix and suffix" do
+        before do
+          ActiveRecord::Base.table_name_prefix = 'begin_'
+          ActiveRecord::Base.table_name_suffix = '_end'
+        end
+
+        it "should truncate the 'unique_schema_migrations' portion of the index name to fit the suffix within the limit" do
+          add_schema_migrations_index
+
+          @would_execute_sql.should include('CREATE UNIQUE INDEX "BEGIN_UNIQUE_SCHEMA_MIGRAT_END" ON "BEGIN_SCHEMA_MIGRATIONS_END" ("VERSION")')
+        end
+      end
+    end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -6,7 +6,8 @@ describe "OracleEnhancedAdapter structure dump" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
     @conn = ActiveRecord::Base.connection
-    @oracle11g = !! @conn.select_value("SELECT * FROM v$version WHERE banner LIKE 'Oracle%11g%'")
+    @oracle11g_or_higher = !! @conn.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 11")
   end
   describe "structure dump" do
     before(:each) do
@@ -19,11 +20,7 @@ describe "OracleEnhancedAdapter structure dump" do
       end
       class ::TestPost < ActiveRecord::Base
       end
-      if TestPost.respond_to?(:table_name=)
-        TestPost.table_name = "test_posts"
-      else
-        TestPost.set_table_name "test_posts"
-      end
+      TestPost.table_name = "test_posts"
     end
   
     after(:each) do
@@ -40,6 +37,8 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute "ALTER TABLE foos drop column baz_id" rescue nil
       @conn.execute "ALTER TABLE test_posts drop column fooz_id" rescue nil
       @conn.execute "ALTER TABLE test_posts drop column baz_id" rescue nil
+      @conn.execute "DROP VIEW test_posts_view_z" rescue nil
+      @conn.execute "DROP VIEW test_posts_view_a" rescue nil
     end
   
     it "should dump single primary key" do
@@ -141,9 +140,16 @@ describe "OracleEnhancedAdapter structure dump" do
       dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
       dump.should =~ /CREATE OR REPLACE TYPE TEST_TYPE/
     end
+
+    it "should dump views" do
+      @conn.execute "create or replace VIEW test_posts_view_z as select * from test_posts"
+      @conn.execute "create or replace VIEW test_posts_view_a as select * from test_posts_view_z"
+      dump = ActiveRecord::Base.connection.structure_dump_db_stored_code.gsub(/\n|\s+/,' ')
+      dump.should =~ /CREATE OR REPLACE FORCE VIEW TEST_POSTS_VIEW_A.*CREATE OR REPLACE FORCE VIEW TEST_POSTS_VIEW_Z/
+    end
   
     it "should dump virtual columns" do
-      pending "Not supported in this database version" unless @oracle11g
+      pending "Not supported in this database version" unless @oracle11g_or_higher
       @conn.execute <<-SQL
         CREATE TABLE bars (
           id          NUMBER(38,0) NOT NULL,
@@ -250,7 +256,7 @@ describe "OracleEnhancedAdapter structure dump" do
   describe "full drop" do
     before(:each) do 
       @conn.create_table :full_drop_test do |t|
-        t.integer :id
+        t.string :foo
       end
       @conn.create_table :full_drop_test_temp, :temporary => true do |t|
         t.string :foo

data/spec/spec_helper.rb

@@ -13,35 +13,21 @@ elsif RUBY_ENGINE == 'jruby'
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
-ENV['RAILS_GEM_VERSION'] ||= '3.2-master'
-NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5' || ENV['RAILS_GEM_VERSION'] =~ /^2\.3\.1\d$/
+ENV['RAILS_GEM_VERSION'] ||= '4.0-master'
+NO_COMPOSITE_PRIMARY_KEYS = true
 
 puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
 
 require 'active_record'
 
-if ENV['RAILS_GEM_VERSION'] >= '3.0'
-  require 'action_dispatch'
-  require 'active_support/core_ext/module/attribute_accessors'
-  require 'active_support/core_ext/class/attribute_accessors'
-
-  if ENV['RAILS_GEM_VERSION'] =~ /^3.0.0.beta/
-    require "rails/log_subscriber"
-    require 'active_record/railties/log_subscriber'
-  else
-    require "active_support/log_subscriber"
-    require 'active_record/log_subscriber'
-  end
+require 'action_dispatch'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/class/attribute_accessors'
 
-  require 'logger'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
-  require 'action_pack'
-  require 'action_controller/session/abstract_store'
-  require 'active_record/session_store'
-elsif ENV['RAILS_GEM_VERSION'] <= '2.3'
-  require 'action_pack'
-  require 'action_controller/session/active_record_store'
-end
+require "active_support/log_subscriber"
+require 'active_record/log_subscriber'
+
+require 'logger'
 
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
@@ -51,30 +37,16 @@ module LoggerSpecHelper
     @logger = MockLogger.new
     @old_logger = ActiveRecord::Base.logger
 
-    if ENV['RAILS_GEM_VERSION'] >= '3.0'
-      @notifier = ActiveSupport::Notifications::Fanout.new
-
-      ActiveSupport::LogSubscriber.colorize_logging = false
+    @notifier = ActiveSupport::Notifications::Fanout.new
 
-      ActiveRecord::Base.logger = @logger
-      @old_notifier = ActiveSupport::Notifications.notifier
-      ActiveSupport::Notifications.notifier = @notifier
+    ActiveSupport::LogSubscriber.colorize_logging = false
 
-      ActiveRecord::LogSubscriber.attach_to(:active_record)
-      if ENV['RAILS_GEM_VERSION'] >= '3.2'
-        ActiveSupport::Notifications.subscribe("sql.active_record", ActiveRecord::ExplainSubscriber.new)
-      end
-    else # ActiveRecord 2.x
-      if ActiveRecord::Base.respond_to?(:connection_pool)
-        ActiveRecord::Base.connection_pool.clear_reloadable_connections!
-      else
-        ActiveRecord::Base.clear_active_connections!
-      end
-      ActiveRecord::Base.logger = @logger
-      ActiveRecord::Base.colorize_logging = false
-      # ActiveRecord::Base.logger.level = Logger::DEBUG
-    end
+    ActiveRecord::Base.logger = @logger
+    @old_notifier = ActiveSupport::Notifications.notifier
+    ActiveSupport::Notifications.notifier = @notifier
 
+    ActiveRecord::LogSubscriber.attach_to(:active_record)
+    ActiveSupport::Notifications.subscribe("sql.active_record", ActiveRecord::ExplainSubscriber.new)
   end
 
   class MockLogger
@@ -115,11 +87,8 @@ module LoggerSpecHelper
     ActiveRecord::Base.logger = @old_logger
     @logger = nil
 
-    if ENV['RAILS_GEM_VERSION'] >= '3.0'
-      ActiveSupport::Notifications.notifier = @old_notifier
-      @notifier = nil
-    end
-
+    ActiveSupport::Notifications.notifier = @old_notifier
+    @notifier = nil
   end
 
   # Wait notifications to be published (for Rails 3.0)
@@ -177,11 +146,13 @@ SYSTEM_CONNECTION_PARAMS = {
 
 DATABASE_NON_DEFAULT_TABLESPACE = ENV['DATABASE_NON_DEFAULT_TABLESPACE'] || "SYSTEM"
 
-# Set default $KCODE to UTF8
-if RUBY_VERSION < "1.9"
-  $KCODE = "UTF8"
-end
-
 # set default time zone in TZ environment variable
 # which will be used to set session time zone
 ENV['TZ'] ||= 'Europe/Riga'
+
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+# Set default_timezone :local explicitly 
+# because this default value has been changed to :utc atrails master branch 
+ActiveRecord::Base.default_timezone = :local
+