activerecord-oracle_enhanced-adapter 1.5.6 → 1.6.0

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -67,21 +67,21 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(Time.now).class.should == Time
+    column.type_cast_from_database(Time.now).class.should == Time
   end
 
   it "should return Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(Time.now).class.should == Date
+    column.type_cast_from_database(Time.now).class.should == Date
   end
 
   it "should typecast DateTime value to Date value from DATE column if column name contains 'date' and emulate_dates_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
     columns = @conn.columns('test_employees')
     column = columns.detect{|c| c.name == "hire_date"}
-    column.type_cast(DateTime.new(1900,1,1)).class.should == Date
+    column.type_cast_from_database(DateTime.new(1900,1,1)).class.should == Date
   end
 
   describe "/ DATE values from ActiveRecord model" do
@@ -206,7 +206,6 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         job_id        NUMBER,
         salary        NUMBER,
         commission_pct  NUMBER(2,2),
-        unwise_name_id NUMBER(2,2),
         manager_id    NUMBER(6),
         is_manager    NUMBER(1),
         department_id NUMBER(4,0),
@@ -219,46 +218,17 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
         INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
     SQL
   end
-
+  
   after(:all) do
     @conn.execute "DROP TABLE test2_employees"
     @conn.execute "DROP SEQUENCE test2_employees_seq"
   end
 
-  context "when number_datatype_coercion is :decimal" do
-    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-    it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "job_id"}
-      column.type.should == :decimal
-    end
-
-    it "should set NUMBER column type as decimal if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "salary"}
-      column.type.should == :decimal
-    end
-  end
-
-  context "when number_datatype_coercion is :float" do
-    before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-    it "should set NUMBER column type as float if emulate_integers_by_column_name is false" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "job_id"}
-      column.type.should == :float
-    end
-
-    it "should set NUMBER column type as float if column name is not 'id' and does not ends with '_id' and emulate_integers_by_column_name is true" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-      columns = @conn.columns('test2_employees')
-      column = columns.detect{|c| c.name == "salary"}
-      column.type.should == :float
-    end
+  it "should set NUMBER column type as decimal if emulate_integers_by_column_name is false" do
+    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "job_id"}
+    column.type.should == :decimal
   end
 
   it "should set NUMBER column type as integer if emulate_integers_by_column_name is true" do
@@ -270,24 +240,10 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     column.type.should == :integer
   end
 
-  it "should set NUMBER(p,0) column type as integer" do
+  it "should set NUMBER column type as decimal 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
     columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "department_id"}
-    column.type.should == :integer
-  end
-
-  it "should set NUMBER(p,s) column type as integer if column name ends with '_id' and emulate_integers_by_column_name is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
-    columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "unwise_name_id"}
-    column.type.should == :integer
-  end
-
-  it "should set NUMBER(p,s) column type as decimal if column name ends with '_id' and emulate_integers_by_column_name is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
-    columns = @conn.columns('test2_employees')
-    column = columns.detect{|c| c.name == "unwise_name_id"}
+    column = columns.detect{|c| c.name == "salary"}
     column.type.should == :decimal
   end
 
@@ -295,14 +251,14 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = false
     columns = @conn.columns('test2_employees')
     column = columns.detect{|c| c.name == "job_id"}
-    column.type_cast(1.0).class.should == BigDecimal
+    column.type_cast_from_database(1.0).class.should == BigDecimal
   end
 
-  it "should return Fixnum value from NUMBER column if column name ends with '_id' and emulate_integers_by_column_name is true" do
+  it "should return Fixnum value from NUMBER column if column name contains 'id' and emulate_integers_by_column_name is true" do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_integers_by_column_name = true
     columns = @conn.columns('test2_employees')
     column = columns.detect{|c| c.name == "job_id"}
-    column.type_cast(1.0).class.should == Fixnum
+    column.type_cast_from_database(1.0).class.should == Fixnum
   end
 
   describe "/ NUMBER values from ActiveRecord model" do
@@ -310,7 +266,7 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
       class ::Test2Employee < ActiveRecord::Base
       end
     end
-
+    
     after(:each) do
       Object.send(:remove_const, "Test2Employee")
       @conn.clear_types_for_columns
@@ -452,7 +408,7 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     columns = @conn.columns('test3_employees')
     %w(has_email has_phone active_flag manager_yn).each do |col|
       column = columns.detect{|c| c.name == col}
-      column.type_cast("Y").class.should == String
+      column.type_cast_from_database("Y").class.should == String
     end
   end
 
@@ -461,8 +417,8 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     columns = @conn.columns('test3_employees')
     %w(has_email has_phone active_flag manager_yn).each do |col|
       column = columns.detect{|c| c.name == col}
-      column.type_cast("Y").class.should == TrueClass
-      column.type_cast("N").class.should == FalseClass
+      column.type_cast_from_database("Y").class.should == TrueClass
+      column.type_cast_from_database("N").class.should == FalseClass
     end
   end
 
@@ -650,6 +606,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
 
 end
 
+
 describe "OracleEnhancedAdapter date and timestamp with different NLS date formats" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -906,7 +863,7 @@ describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
     @employee.reload
     @employee.last_login_at.should == @today.to_time
   end
-
+  
 end
 
 describe "OracleEnhancedAdapter handling of CLOB columns" do
@@ -1383,6 +1340,7 @@ describe "OracleEnhancedAdapter handling of RAW columns" do
   end
 end
 
+
 describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
@@ -1443,3 +1401,45 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
   end
 
 end
+
+describe "OracleEnhancedAdapter handling of BINARY_FLOAT columns" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    @conn.execute "DROP TABLE test2_employees" rescue nil
+    @conn.execute <<-SQL
+      CREATE TABLE test2_employees (
+        id            NUMBER PRIMARY KEY,
+        first_name    VARCHAR2(20),
+        last_name     VARCHAR2(25),
+        email         VARCHAR2(25),
+        phone_number  VARCHAR2(20),
+        hire_date     DATE,
+        job_id        NUMBER,
+        salary        NUMBER,
+        commission_pct  NUMBER(2,2),
+        hourly_rate   BINARY_FLOAT,
+        manager_id    NUMBER(6),
+        is_manager    NUMBER(1),
+        department_id NUMBER(4,0),
+        created_at    DATE
+      )
+    SQL
+    @conn.execute "DROP SEQUENCE test2_employees_seq" rescue nil
+    @conn.execute <<-SQL
+      CREATE SEQUENCE test2_employees_seq  MINVALUE 1
+        INCREMENT BY 1 START WITH 10040 CACHE 20 NOORDER NOCYCLE
+    SQL
+  end
+  
+  after(:all) do
+    @conn.execute "DROP TABLE test2_employees"
+    @conn.execute "DROP SEQUENCE test2_employees_seq"
+  end
+
+  it "should set BINARY_FLOAT column type as float" do
+    columns = @conn.columns('test2_employees')
+    column = columns.detect{|c| c.name == "hourly_rate"}
+    column.type.should == :float
+  end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'active_record/connection_adapters/oracle_enhanced_database_tasks'
+require 'active_record/connection_adapters/oracle_enhanced/database_tasks'
 require 'stringio'
 require 'tempfile'
 

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -16,7 +16,6 @@ if ActiveRecord::Base.method_defined?(:changed?)
           last_name     VARCHAR2(25),
           job_id        NUMBER(6,0) NULL,
           salary        NUMBER(8,2),
-          pto_per_hour  NUMBER,
           comments      CLOB,
           hire_date     DATE
         )
@@ -28,7 +27,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       class TestEmployee < ActiveRecord::Base
       end
     end
-
+  
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       @conn.execute "DROP TABLE test_employees"
@@ -63,16 +62,6 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee.should_not be_changed
     end
 
-    it "should not mark empty float (stored as NULL) as changed when reassigning it" do
-      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion) { :float }
-      @employee = TestEmployee.create!(:pto_per_hour => '')
-      @employee.pto_per_hour = ''
-      @employee.should_not be_changed
-      @employee.reload
-      @employee.pto_per_hour = ''
-      @employee.should_not be_changed
-    end
-
     it "should not mark empty text (stored as NULL) as changed when reassigning it" do
       @employee = TestEmployee.create!(:comments => nil)
       @employee.comments = nil
@@ -122,7 +111,7 @@ if ActiveRecord::Base.method_defined?(:changed?)
       @employee = TestEmployee.new
       @employee.job_id = 0
       @employee.save!.should be_true
-
+      
       @employee.should_not be_changed
 
       @employee.job_id = '0'
@@ -147,6 +136,11 @@ if ActiveRecord::Base.method_defined?(:changed?)
       end
     end
 
+    it "should be able to handle attributes which are not backed by a column" do
+      TestEmployee.create!(:comments => "initial")
+      @employee = TestEmployee.select("#{TestEmployee.quoted_table_name}.*, 24 ranking").first
+      expect { @employee.ranking = 25 }.to_not raise_error
+    end
   end
 
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -22,7 +22,7 @@ describe "OracleEnhancedAdapter schema dump" do
     schema_define do
       create_table :test_posts, options do |t|
         t.string :title
-        t.timestamps
+        t.timestamps null: true
       end
       add_index :test_posts, :title
     end
@@ -180,21 +180,21 @@ describe "OracleEnhancedAdapter schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk"/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts"/
     end
 
     it "should include foreign key with delete dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :delete
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :delete/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :cascade/
     end
 
     it "should include foreign key with nullify dependency in schema dump" do
       schema_define do
         add_foreign_key :test_comments, :test_posts, dependent: :nullify
       end
-      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", name: "test_comments_test_post_id_fk", dependent: :nullify/
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", on_delete: :nullify/
     end
 
     it "should not include foreign keys on ignored table names in schema dump" do
@@ -226,6 +226,7 @@ describe "OracleEnhancedAdapter schema dump" do
     end
 
     it "should include composite foreign keys" do
+      pending "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
@@ -376,7 +377,7 @@ describe "OracleEnhancedAdapter schema dump" do
             t.virtual :full_name,        :as => "first_name || ', ' || last_name"
             t.virtual :short_name,       :as => "COALESCE(first_name, last_name)", :type => :string, :limit => 300
             t.virtual :abbrev_name,      :as => "SUBSTR(first_name,1,50) || ' ' || SUBSTR(last_name,1,1) || '.'", :type => "VARCHAR(100)"
-            t.virtual :name_ratio, :as=>'(LENGTH(first_name)/LENGTH(last_name))'
+            t.virtual :name_ratio, :as=>'(LENGTH(first_name)*10/LENGTH(last_name)*10)'
             t.column  :full_name_length, :virtual, :as => "length(first_name || ', ' || last_name)", :type => :integer
             t.virtual :field_with_leading_space, :as => "' ' || first_name || ' '", :limit => 300, :type => :string
           end
@@ -402,30 +403,13 @@ describe "OracleEnhancedAdapter schema dump" do
       end
     end
 
-    context "when number_datatype_coercion is :float" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-      it 'should dump correctly' do
-        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
-        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*),(\s*)type: :float$/
-        standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
-      end
-    end
-
-    context "when number_datatype_coercion is :decimal" do
-      before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-      it 'should dump correctly' do
-        standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)scale: 0,(\s*)as:(.*),(\s*)type: :integer/
-        standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/
-        standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
-        standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
-      end
+    it 'should dump correctly' do
+      standard_dump.should =~ /t\.virtual "full_name",(\s*)limit: 512,(\s*)as: "\\"FIRST_NAME\\"\|\|', '\|\|\\"LAST_NAME\\"",(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "short_name",(\s*)limit: 300,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "full_name_length",(\s*)precision: 38,(\s*)as:(.*),(\s*)type: :integer/
+      standard_dump.should =~ /t\.virtual "name_ratio",(\s*)as:(.*)\"$/ # no :type
+      standard_dump.should =~ /t\.virtual "abbrev_name",(\s*)limit: 100,(\s*)as:(.*),(\s*)type: :string/
+      standard_dump.should =~ /t\.virtual "field_with_leading_space",(\s*)limit: 300,(\s*)as: "' '\|\|\\"FIRST_NAME\\"\|\|' '",(\s*)type: :string/
     end
 
     context 'with column cache' do
@@ -471,160 +455,23 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
-  describe "NUMBER columns" do
-    after(:each) do
+  describe ":float datatype" do
+    before(:each) do
       schema_define do
-        drop_table "test_numbers"
-      end
-    end
-
-    let(:value_within_max_precision)    { (10 ** @conn.class::NUMBER_MAX_PRECISION) - 1 }
-    let(:value_exceeding_max_precision) { (10 ** @conn.class::NUMBER_MAX_PRECISION) + 1 }
-
-    context "when using ActiveRecord::Schema.define and ActiveRecord::ConnectionAdapters::TableDefinition#float" do
-      before :each do
-        schema_define do
-          create_table :test_numbers, :force => true do |t|
-            t.float :value
-          end
-        end
-      end
-
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
-      end
-
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
+        create_table :test_floats, force: true do |t|
+          t.float :hourly_rate
         end
       end
     end
 
-    context "when using handwritten 'CREATE_TABLE' SQL" do
-      before :each do
-        ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-        @conn = ActiveRecord::Base.connection
-        @conn.execute <<-SQL
-          CREATE TABLE test_numbers (
-            id     NUMBER(#{@conn.class::NUMBER_MAX_PRECISION},0) PRIMARY KEY,
-            value  NUMBER
-          )
-        SQL
-        @conn.execute <<-SQL
-          CREATE SEQUENCE test_numbers_seq  MINVALUE 1
-            INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
-        SQL
-      end
-
-      context "when number_datatype_coercion is :float" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:float) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.float "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            number2.save!
-          end
-        end
+    after(:each) do
+      schema_define do
+        drop_table :test_floats
       end
+    end
 
-      context "when number_datatype_coercion is :decimal" do
-        before { ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.stub(:number_datatype_coercion).and_return(:decimal) }
-
-        it "should dump correctly" do
-          standard_dump.should =~ /t\.decimal "value"$/
-        end
-
-        describe "ActiveRecord saving" do
-          before :each do
-            class ::TestNumber < ActiveRecord::Base
-              self.table_name = "test_numbers"
-            end
-          end
-
-          it "should allow saving of values within NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_within_max_precision)
-          end
-
-          it "should allow saving of values larger than NUMBER_MAX_PRECISION" do
-            number = TestNumber.new(value: value_exceeding_max_precision)
-            number.save!
-            number.reload
-            number.value.should eq(value_exceeding_max_precision)
-          end
-
-          it "should be recreatable from dump and have same properties" do
-            # Simulating db:schema:dump & db:test:load
-            2.times do |i|
-              create_table_dump = standard_dump[/(create_table.+?end)/m]
-
-              schema_define do
-                drop_table "test_numbers"
-              end
-
-              schema_define(&eval("-> * { #{create_table_dump} }"))
-            end
-
-            number = TestNumber.new(value: value_within_max_precision)
-            number.save!
-
-            # Raises 'ORA-01438' as :value column type isn't FLOAT'ish
-            number2 = TestNumber.new(value: value_exceeding_max_precision)
-            lambda do
-              number2.save!
-            end.should raise_error() { |e| e.message.should =~ /ORA-01438/ }
-          end
-        end
-      end # context (:decimal)
-
-    end # context (handwritten)
-  end # describe (NUMBER columns)
-
+    it "should dump float type correctly" do
+      standard_dump.should =~ /t\.float "hourly_rate"$/
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -627,25 +627,28 @@ end
     end
 
     it "should add foreign key" do
+      fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_test_post_id_fk").first(10)}"
+
       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.*\.TEST_COMMENTS_TEST_POST_ID_FK/}
+      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
     end
 
     context "with table_name_prefix" do
       let(:table_name_prefix) { 'xxx_' }
 
       it "should use table_name_prefix for foreign table" do
+        fk_name = "fk_rails_#{Digest::SHA256.hexdigest("xxx_test_comments_test_post_id_fk").first(10)}"
         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.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
       end
     end
 
@@ -653,13 +656,14 @@ end
       let(:table_name_suffix) { '_xxx' }
 
       it "should use table_name_suffix for foreign table" do
+        fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_xxx_test_post_id_fk").first(10)}"
         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.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
       end
     end
 
@@ -678,7 +682,8 @@ end
       end
       lambda do
         TestComment.create(:body => "test", :test_post_id => 1)
-      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TES_COM_TES_POS_ID_FOR_KEY/}
+      end.should raise_error() {|e| e.message.should =~
+        /ORA-02291.*\.C#{Digest::SHA1.hexdigest("test_comments_test_post_id_foreign_key")[0,29].upcase}/}
     end
 
     it "should add foreign key with very long name which is shortened" do
@@ -692,12 +697,14 @@ end
     end
 
     it "should add foreign key with column" do
+      fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_post_id_fk").first(10)}"
+
       schema_define do
         add_foreign_key :test_comments, :test_posts, :column => "post_id"
       end
       lambda do
         TestComment.create(:body => "test", :post_id => 1)
-      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.TEST_COMMENTS_POST_ID_FK/}
+      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.#{fk_name}/i}
     end
 
     it "should add foreign key with delete dependency" do
@@ -721,6 +728,7 @@ end
     end
 
     it "should add a composite foreign key" do
+      pending "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer
@@ -743,6 +751,7 @@ end
     end
 
     it "should add a composite foreign key with name" do
+      pending "Composite foreign keys are not supported in this version"
       schema_define do
         add_column :test_posts, :baz_id, :integer
         add_column :test_posts, :fooz_id, :integer

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -92,6 +92,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
     
     it "should dump composite foreign keys" do
+      pending "Composite foreign keys are not supported in this version"
       @conn.add_column :foos, :fooz_id, :integer
       @conn.add_column :foos, :baz_id, :integer
       

data/spec/spec_config.yaml.template

@@ -0,0 +1,10 @@
+rails:
+  gem_version: '4.0-master'
+database:
+  name:         'orcl'
+  host:         '127.0.0.1'
+  port:         1521
+  user:         'oracle_enhanced'
+  password:     'oracle_enhanced'
+  sys_password: 'admin'
+timezone: 'Europe/Riga'