activerecord-oracle_enhanced-adapter 1.7.11 → 1.8.0.beta1

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -1,13 +1,12 @@
-require 'spec_helper'
-require 'active_record/connection_adapters/oracle_enhanced/database_tasks'
-require 'stringio'
-require 'tempfile'
+require "active_record/connection_adapters/oracle_enhanced/database_tasks"
+require "stringio"
+require "tempfile"
 
 describe "Oracle Enhanced adapter database tasks" do
   let(:config) { CONNECTION_PARAMS.with_indifferent_access }
 
   describe "create" do
-    let(:new_user_config) { config.merge({username: "oracle_enhanced_test_user"}) }
+    let(:new_user_config) { config.merge(username: "oracle_enhanced_test_user") }
     before do
       fake_terminal(SYSTEM_CONNECTION_PARAMS[:password]) do
         ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
@@ -34,6 +33,15 @@ describe "Oracle Enhanced adapter database tasks" do
   end
 
   context "with test table" do
+    before(:all) do
+      $stdout, @original_stdout = StringIO.new, $stdout
+      $stderr, @original_stderr = StringIO.new, $stderr
+    end
+
+    after(:all) do
+      $stdout, $stderr = @original_stdout, @original_stderr
+    end
+
     before do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       ActiveRecord::Base.connection.execute "CREATE TABLE test_posts (name VARCHAR2(20))"
@@ -66,7 +74,7 @@ describe "Oracle Enhanced adapter database tasks" do
         it "dumps the database structure to a file without the schema information" do
           contents = File.read(temp_file)
           expect(contents).to include('CREATE TABLE "TEST_POSTS"')
-          expect(contents).not_to include('INSERT INTO schema_migrations')
+          expect(contents).not_to include("INSERT INTO schema_migrations")
         end
       end
 

data/spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   include LoggerSpecHelper
 
@@ -42,7 +40,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should NOT log dbms output when dbms output is disabled" do
     @conn.disable_dbms_output
 
-    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{'is_it_long'=>1}])
+    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{ "is_it_long" => 1 }])
 
     expect(@logger.output(:debug)).not_to match(/^DBMS_OUTPUT/)
   end
@@ -50,7 +48,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{'is_it_long'=>1}])
+    expect(@conn.select_all("select more_than_five_characters_long('hi there') is_it_long from dual").to_a).to eq([{ "is_it_long" => 1 }])
 
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -hi there-$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is longer than 5$/)
@@ -60,7 +58,7 @@ describe "OracleEnhancedAdapter logging dbms_output from plsql" do
   it "should log dbms output lines to the rails log" do
     @conn.enable_dbms_output
 
-    expect(@conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a).to eq([{'is_it_long'=>0}])
+    expect(@conn.select_all("select more_than_five_characters_long('short') is_it_long from dual").to_a).to eq([{ "is_it_long" => 0 }])
 
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: before the if -short-$/)
     expect(@logger.output(:debug)).to match(/^DBMS_OUTPUT: it is 5 or shorter$/)

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -1,69 +1,62 @@
-require 'spec_helper'
-
 if ActiveRecord::Base.method_defined?(:changed?)
 
   describe "OracleEnhancedAdapter dirty object tracking" do
+    include SchemaSpecHelper
 
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-      @conn = ActiveRecord::Base.connection
-      @conn.execute "DROP TABLE test_employees" rescue nil
-      @conn.execute "DROP SEQUENCE test_employees_seq" rescue nil
-      @conn.execute <<-SQL
-        CREATE TABLE test_employees (
-          id            NUMBER PRIMARY KEY,
-          first_name    VARCHAR2(20),
-          last_name     VARCHAR2(25),
-          job_id        NUMBER(6,0) NULL,
-          salary        NUMBER(8,2),
-          comments      CLOB,
-          hire_date     DATE
-        )
-      SQL
-      @conn.execute <<-SQL
-        CREATE SEQUENCE test_employees_seq  MINVALUE 1
-          INCREMENT BY 1 CACHE 20 NOORDER NOCYCLE
-      SQL
+      schema_define do
+        create_table :test_employees, force: true do |t|
+          t.string    :first_name,  limit: 20
+          t.string    :last_name,   limit: 25
+          t.integer   :job_id,      limit: 6, null: true
+          t.decimal   :salary,      precision: 8, scale: 2
+          t.text      :comments
+          t.date      :hire_date
+        end
+      end
+
       class TestEmployee < ActiveRecord::Base
       end
     end
 
     after(:all) do
+      schema_define do
+        drop_table :test_employees
+      end
       Object.send(:remove_const, "TestEmployee")
-      @conn.execute "DROP TABLE test_employees"
-      @conn.execute "DROP SEQUENCE test_employees_seq"
-      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+      ActiveRecord::Base.clear_cache!
     end
 
     it "should not mark empty string (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:first_name => '')
-      @employee.first_name = ''
+      @employee = TestEmployee.create!(first_name: "")
+      @employee.first_name = ""
       expect(@employee).not_to be_changed
       @employee.reload
-      @employee.first_name = ''
+      @employee.first_name = ""
       expect(@employee).not_to be_changed
     end
 
     it "should not mark empty integer (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:job_id => '')
-      @employee.job_id = ''
+      @employee = TestEmployee.create!(job_id: "")
+      @employee.job_id = ""
       expect(@employee).not_to be_changed
       @employee.reload
-      @employee.job_id = ''
+      @employee.job_id = ""
       expect(@employee).not_to be_changed
     end
 
     it "should not mark empty decimal (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:salary => '')
-      @employee.salary = ''
+      @employee = TestEmployee.create!(salary: "")
+      @employee.salary = ""
       expect(@employee).not_to be_changed
       @employee.reload
-      @employee.salary = ''
+      @employee.salary = ""
       expect(@employee).not_to be_changed
     end
 
     it "should not mark empty text (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:comments => nil)
+      @employee = TestEmployee.create!(comments: nil)
       @employee.comments = nil
       expect(@employee).not_to be_changed
       @employee.reload
@@ -72,16 +65,16 @@ if ActiveRecord::Base.method_defined?(:changed?)
     end
 
     it "should not mark empty text (stored as empty_clob()) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:comments => '')
-      @employee.comments = ''
+      @employee = TestEmployee.create!(comments: "")
+      @employee.comments = ""
       expect(@employee).not_to be_changed
       @employee.reload
-      @employee.comments = ''
+      @employee.comments = ""
       expect(@employee).not_to be_changed
     end
 
     it "should mark empty text (stored as empty_clob()) as changed when assigning nil to it" do
-      @employee = TestEmployee.create!(:comments => '')
+      @employee = TestEmployee.create!(comments: "")
       @employee.comments = nil
       expect(@employee).to be_changed
       @employee.reload
@@ -90,20 +83,20 @@ if ActiveRecord::Base.method_defined?(:changed?)
     end
 
     it "should mark empty text (stored as NULL) as changed when assigning '' to it" do
-      @employee = TestEmployee.create!(:comments => nil)
-      @employee.comments = ''
+      @employee = TestEmployee.create!(comments: nil)
+      @employee.comments = ""
       expect(@employee).to be_changed
       @employee.reload
-      @employee.comments = ''
+      @employee.comments = ""
       expect(@employee).to be_changed
     end
 
     it "should not mark empty date (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(:hire_date => '')
-      @employee.hire_date = ''
+      @employee = TestEmployee.create!(hire_date: "")
+      @employee.hire_date = ""
       expect(@employee).not_to be_changed
       @employee.reload
-      @employee.hire_date = ''
+      @employee.hire_date = ""
       expect(@employee).not_to be_changed
     end
 
@@ -114,30 +107,30 @@ if ActiveRecord::Base.method_defined?(:changed?)
 
       expect(@employee).not_to be_changed
 
-      @employee.job_id = '0'
+      @employee.job_id = "0"
       expect(@employee).not_to be_changed
     end
 
     it "should not update unchanged CLOBs" do
       @employee = TestEmployee.create!(
-          :comments => "initial"
+          comments: "initial"
       )
       expect(@employee.save!).to be_truthy
       @employee.reload
-      expect(@employee.comments).to eq('initial')
+      expect(@employee.comments).to eq("initial")
 
-      oci_conn = @conn.instance_variable_get('@connection')
+      oci_conn = @conn.instance_variable_get("@connection")
       class << oci_conn
          def write_lob(lob, value, is_binary = false); raise "don't do this'"; end
       end
-      expect{@employee.save!}.not_to raise_exception(RuntimeError, "don't do this'")
+      expect { @employee.save! }.not_to raise_exception(RuntimeError, "don't do this'")
       class << oci_conn
         remove_method :write_lob
       end
     end
 
     it "should be able to handle attributes which are not backed by a column" do
-      TestEmployee.create!(:comments => "initial")
+      TestEmployee.create!(comments: "initial")
       @employee = TestEmployee.select("#{TestEmployee.quoted_table_name}.*, 24 ranking").first
       expect { @employee.ranking = 25 }.to_not raise_error
     end

data/spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "OracleEnhancedAdapter emulate OracleAdapter" do
 
   before(:all) do
@@ -10,7 +8,7 @@ describe "OracleEnhancedAdapter emulate OracleAdapter" do
   end
 
   it "should be an OracleAdapter" do
-    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(:emulate_oracle_adapter => true))
+    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(emulate_oracle_adapter: true))
     expect(ActiveRecord::Base.connection).not_to be_nil
     expect(ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::OracleAdapter)).to be_truthy
   end

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-require 'ruby-plsql'
+require "ruby-plsql"
 
 describe "OracleEnhancedAdapter custom methods for create, update and destroy" do
   include LoggerSpecHelper
@@ -95,7 +93,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       END;
     SQL
 
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
   end
 
   after(:all) do
@@ -115,55 +112,55 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       # should return ID of new record
       set_create_method do
         plsql.test_employees_pkg.create_employee(
-          :p_first_name => first_name,
-          :p_last_name => last_name,
-          :p_hire_date => hire_date,
-          :p_salary => salary,
-          :p_description => "#{first_name} #{last_name}",
-          :p_employee_id => nil
+          p_first_name: first_name,
+          p_last_name: last_name,
+          p_hire_date: hire_date,
+          p_salary: salary,
+          p_description: "#{first_name} #{last_name}",
+          p_employee_id: nil
         )[:p_employee_id]
       end
 
       # return value is ignored
       set_update_method do
         plsql.test_employees_pkg.update_employee(
-          :p_employee_id => id,
-          :p_first_name => first_name,
-          :p_last_name => last_name,
-          :p_hire_date => hire_date,
-          :p_salary => salary,
-          :p_description => "#{first_name} #{last_name}"
+          p_employee_id: id,
+          p_first_name: first_name,
+          p_last_name: last_name,
+          p_hire_date: hire_date,
+          p_salary: salary,
+          p_description: "#{first_name} #{last_name}"
         )
       end
 
       # return value is ignored
       set_delete_method do
         plsql.test_employees_pkg.delete_employee(
-          :p_employee_id => id
+          p_employee_id: id
         )
       end
 
       private
 
-      def raise_make_transaction_rollback
-        raise "Make the transaction rollback"
-      end
+        def raise_make_transaction_rollback
+          raise "Make the transaction rollback"
+        end
     end
 
-    @today = Date.new(2008,6,28)
+    @today = Date.new(2008, 6, 28)
     @buffer = StringIO.new
   end
 
   after(:each) do
     Object.send(:remove_const, "TestEmployee")
-    ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    ActiveRecord::Base.clear_cache!
   end
 
   it "should create record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     expect(@employee.first_name).to eq("First")
@@ -178,9 +175,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     TestEmployee.after_create :raise_make_transaction_rollback
 
     @employee = TestEmployee.new(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     employees_count = TestEmployee.count
     expect {
@@ -192,10 +189,10 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should update record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today,
-      :description => "description"
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today,
+      description: "description"
     )
     @employee.reload
     @employee.first_name = "Second"
@@ -208,10 +205,10 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     TestEmployee.after_update :raise_make_transaction_rollback
 
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today,
-      :description => "description"
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today,
+      description: "description"
     )
     empl_id = @employee.id
     @employee.reload
@@ -226,9 +223,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   it "should not update record if nothing is changed and partial writes are enabled" do
     TestEmployee.partial_writes = true
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     @employee.save!
@@ -239,9 +236,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   it "should update record if nothing is changed and partial writes are disabled" do
     TestEmployee.partial_writes = false
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     @employee.save!
@@ -251,9 +248,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should delete record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     empl_id = @employee.id
@@ -264,9 +261,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should delete record and set destroyed flag" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     @employee.destroy
@@ -278,9 +275,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     TestEmployee.after_destroy :raise_make_transaction_rollback
 
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     empl_id = @employee.id
@@ -294,9 +291,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should set timestamps when creating record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     expect(@employee.created_at).not_to be_nil
     expect(@employee.updated_at).not_to be_nil
@@ -304,9 +301,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should set timestamps when updating record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.reload
     expect(@employee.created_at).to be_nil
@@ -320,9 +317,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   it "should log create record" do
     set_logger
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     expect(@logger.logged(:debug).last).to match(/^TestEmployee Create \(\d+\.\d+(ms)?\)  custom create method$/)
     clear_logger
@@ -331,9 +328,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
   it "should log update record" do
     (TestEmployee.partial_writes = false) rescue nil
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     set_logger
     @employee.save!
@@ -343,9 +340,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should log delete record" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     set_logger
     @employee.destroy
@@ -355,8 +352,8 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should validate new record before creation" do
     @employee = TestEmployee.new(
-      :last_name => "Last",
-      :hire_date => @today
+      last_name: "Last",
+      hire_date: @today
     )
     expect(@employee.save).to be_falsey
     expect(@employee.errors[:first_name]).not_to be_blank
@@ -364,9 +361,9 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
 
   it "should validate existing record before update" do
     @employee = TestEmployee.create(
-      :first_name => "First",
-      :last_name => "Last",
-      :hire_date => @today
+      first_name: "First",
+      last_name: "Last",
+      hire_date: @today
     )
     @employee.first_name = nil
     expect(@employee.save).to be_falsey