activerecord-oracle_enhanced-adapter 1.7.0.beta1 → 1.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98878e23459a54a04b7fa57b79ff3ee30e50f78
-  data.tar.gz: ebecb63118fb612c6b21c5b6038e6f82c05e9bfd
+  metadata.gz: 7bfe3790c7fd04db5135ae542ed043d6cf3d841c
+  data.tar.gz: b9a99140af3273a2106d29f2c01c24fe7d247913
 SHA512:
-  metadata.gz: 539c8e0b3e594c6cde1704bbddbefb7dc92208d1bcbf053fd8a6eff37322b0e7c7acc899f9a9c9d7581ff4b06d9d2c7ddd7dc6cdb85db96af04f027331445646
-  data.tar.gz: 5257dcdc1df87458889098bec9eada6b1105f6158e7e47a2600ff35a362ecb6f40ad2a37a438a83e1a99cb7364fb4980fe96cd221ac0688fc86f91b4baa07ef4
+  metadata.gz: e741ac73131eb73c8a1156fd90927db6777bef7306fced5df9bb6e58860057138077f91bc08b956e6ac924c50edfcd866e7ff3b05487ef9f4849e53b8c8a0ec3
+  data.tar.gz: 9b744df558be9c9dab4abca0127791d0792d50c405bbdafe0c6013528df8db20c491cdd33a739d53f23dfcbb21c2f10a671ba90fd26e07f4f3dfc1780d93934d

data/Gemfile

@@ -5,7 +5,7 @@ group :development do
   gem 'rdoc'
   gem 'rake'
 
-  gem 'activerecord',   github: 'rails/rails', branch: 'master'
+  gem 'activerecord',   github: 'rails/rails', branch: '5-0-stable'
   gem 'rack',           github: 'rack/rack', branch: 'master'
   gem 'arel',           github: 'rails/arel', branch: 'master'
 

data/README.md

@@ -18,7 +18,7 @@ Oracle enhanced adapter Rails 5 support is still in beta release, so use with ca
 
 ```ruby
 # Use oracle as the database for Active Record
-gem 'activerecord-oracle_enhanced-adapter', '=> 1.7.0.beta1'
+gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0.beta1'
 ```
 
 ### Rails 4.2
@@ -258,14 +258,17 @@ class Employee < ActiveRecord::Base
   # specify sequence name
   self.sequence_name = "hr.hr_employee_s"
 
-  # set which DATE columns should be converted to Ruby Date
-  set_date_columns :hired_on, :birth_date_on
+  # set which DATE columns should be converted to Ruby Date using ActiveRecord Attribute API
+  # Starting from Oracle enhanced adapter 1.7 Oracle `DATE` columns are mapped to Ruby `Date` by default.
+  attribute :hired_on, :date
+  attribute :birth_date_on, :date
 
-  # set which DATE columns should be converted to Ruby Time
-  set_datetime_columns :last_login_time
+  # set which DATE columns should be converted to Ruby Time using ActiveRecord Attribute API
+  attribute :last_login_time, :datetime
 
-  # set which VARCHAR2 columns should be converted to true and false
-  set_boolean_columns :manager, :active
+  # set which VARCHAR2 columns should be converted to true and false using ActiveRecord Attribute API
+  attribute :manager, :boolean
+  attribute :active, :boolean
 
   # set which columns should be ignored in ActiveRecord
   ignore_table_columns :attribute1, :attribute2
@@ -278,6 +281,35 @@ You can also access remote tables over database link using
 self.table_name "hr_employees@db_link"
 ```
 
+Examples for Rails 4.x
+
+```ruby
+class Employee < ActiveRecord::Base
+  # specify schema and table name
+  self.table_name = "hr.hr_employees"
+
+  # specify primary key name
+  self.primary_key = "employee_id"
+
+  # specify sequence name
+  self.sequence_name = "hr.hr_employee_s"
+
+  # If you're using Rails 4.2 or earlier you can do this
+
+  # set which DATE columns should be converted to Ruby Date
+  set_date_columns :hired_on, :birth_date_on
+
+  # set which DATE columns should be converted to Ruby Time
+  set_datetime_columns :last_login_time
+
+  # set which VARCHAR2 columns should be converted to true and false
+  set_boolean_columns :manager, :active
+
+  # set which columns should be ignored in ActiveRecord
+  ignore_table_columns :attribute1, :attribute2
+end
+```
+
 Examples for Rails 3.2 and lower version of Rails
 
 ```ruby
@@ -429,6 +461,14 @@ Post.contains(:all_text, "aaa within title")
 Post.contains(:all_text, "bbb within comment_author")
 ```
 
+Please note that `index_column` must be a real column in your database and it's value will be overriden every time your `index_column_trigger_on` columns are changed. So, _do not use columns with real data as `index_column`_.
+
+Index column can be created as:
+
+```ruby
+add_column :posts, :all_text, :string, limit: 2, comment: 'Service column for context search index'
+```
+
 ### Oracle virtual columns support
 
 Since version R11G1 Oracle database allows adding computed [Virtual Columns](http://www.oracle-base.com/articles/11g/virtual-columns-11gr1.php) to the table.

data/VERSION

@@ -1 +1 @@
-1.7.0.beta1
+1.7.0.beta2

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,11 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.7.0.beta1"
+  s.version = "1.7.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version     = '>= 2.2.2'
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2016-07-18}
+  s.date = %q{2016-07-22}
   s.description = %q{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.
 }
@@ -87,7 +88,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
   ]
   s.add_dependency(%q<rspec>, ["~> 3.3"])
   s.add_dependency(%q<activerecord>, ["~> 5.0.0"])
-  s.add_dependency(%q<arel>, ["~> 7.0"])
+  s.add_dependency(%q<arel>, ["~> 7.1.0"])
   s.add_dependency(%q<ruby-plsql>, [">= 0.5.0"])
   s.add_dependency(%q<ruby-oci8>, [">= 2.2.0"]) if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
   s.license = 'MIT'

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -361,7 +361,7 @@ module ActiveRecord
             @raw_statement.setBigDecimal(position, value)
           when Java::OracleSql::BLOB
             @raw_statement.setBlob(position, value)
-          when ActiveRecord::OracleEnhanced::Type::Text::Data
+          when Java::OracleSql::CLOB
             @raw_statement.setClob(position, value)
           when ActiveRecord::OracleEnhanced::Type::Raw
             @raw_statement.setString(position, ActiveRecord::ConnectionAdapters::OracleEnhanced::Quoting.encode_raw(value))

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_quoting.rb

@@ -9,8 +9,9 @@ module ActiveRecord
             blob.setBytes(1, value.to_s.to_java_bytes)
             blob
           when ActiveRecord::OracleEnhanced::Type::Text::Data
-            #TODO: may need CLOB specific handling
-            value.to_s
+            clob = Java::OracleSql::CLOB.createTemporary(@connection.raw_connection, false, Java::OracleSql::CLOB::DURATION_SESSION)
+            clob.setString(1, value.to_s)
+            clob
           when Date, DateTime
             Java::oracle.sql.DATE.new(value.strftime("%Y-%m-%d %H:%M:%S"))
           when Time

data/lib/active_record/connection_adapters/oracle_enhanced/schema_definitions.rb

@@ -1,14 +1,5 @@
 module ActiveRecord
   module ConnectionAdapters
-    #TODO: Overriding `aliased_types` cause another database adapter behavior changes
-    #It should be addressed by supporting `create_table_definition`
-    class TableDefinition
-      private
-      def aliased_types(name, fallback)
-        fallback
-      end
-    end
-
     module OracleEnhanced
 
       class ForeignKeyDefinition < ActiveRecord::ConnectionAdapters::ForeignKeyDefinition

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -1070,7 +1070,7 @@ module ActiveRecord
         SQL
 
         warn <<-WARNING.strip_heredoc if pks.count > 1
-          WARNING: Rails does not support composite primary key.
+          WARNING: Active Record does not support composite primary key.
 
           #{table_name} has composite primary key. Composite primary key is ignored.
         WARNING

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -34,55 +34,6 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
     @conn.execute "DROP SEQUENCE test_employees_seq"
   end
 
-  xit "should set DATE column type as datetime if emulate_dates_by_column_name is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
-    columns = @conn.columns('test_employees')
-    column = columns.detect{|c| c.name == "hire_date"}
-    expect(column.type).to eq(:datetime)
-  end
-
-  xit "should set DATE column type as date 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"}
-    expect(column.type).to eq(:date)
-  end
-
-  xit "should set DATE column type as datetime if column name does not contain '_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 == "created_at"}
-    expect(column.type).to eq(:datetime)
-  end
-
-  xit "should set DATE column type as datetime if column name contains 'date' as part of other word 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 == "updated_at"}
-    expect(column.type).to eq(:datetime)
-  end
-
-  xit "should return Time value from DATE column if emulate_dates_by_column_name is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
-    columns = @conn.columns('test_employees')
-    column = columns.detect{|c| c.name == "hire_date"}
-    expect(@conn.lookup_cast_type_from_column(column).cast(Time.now).class).to eq(Time)
-  end
-
-  xit "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"}
-    expect(@conn.lookup_cast_type_from_column(column).cast(Time.now).class).to eq(Date)
-  end
-
-  xit "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"}
-    expect(@conn.lookup_cast_type_from_column(column).cast(DateTime.new(1900,1,1)).class).to eq(Date)
-  end
-
   describe "/ DATE values from ActiveRecord model" do
     before(:each) do
       # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
@@ -162,16 +113,6 @@ describe "OracleEnhancedAdapter date type detection based on column names" do
       expect(@employee.hire_date.class).to eq(Date)
     end
 
-    xit "should see set_date_columns values in different connection" do
-      class ::TestEmployee < ActiveRecord::Base
-        set_date_columns :hire_date
-      end
-      # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false
-      # establish other connection
-      other_conn = ActiveRecord::Base.oracle_enhanced_connection(CONNECTION_PARAMS)
-      expect(other_conn.get_type_for_column('test_employees', 'hire_date')).to eq(:date)
-    end
-
     it "should return Time value from DATE column if emulate_dates_by_column_name is true but column is defined as datetime" do
       class ::TestEmployee < ActiveRecord::Base
         # set_datetime_columns :hire_date
@@ -237,43 +178,6 @@ describe "OracleEnhancedAdapter integer type detection based on column names" do
     @conn.execute "DROP SEQUENCE test2_employees_seq"
   end
 
-  xit "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"}
-    expect(column.type).to eq(:decimal)
-  end
-
-  xit "should set NUMBER column type as integer if 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"}
-    expect(column.type).to eq(:integer)
-    column = columns.detect{|c| c.name == "id"}
-    expect(column.type).to eq(:integer)
-  end
-
-  xit "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 == "salary"}
-    expect(column.type).to eq(:decimal)
-  end
-
-  xit "should return BigDecimal value from NUMBER column 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"}
-    expect(@conn.lookup_cast_type_from_column(column).cast(1.0).class).to eq(BigDecimal)
-  end
-
-  xit "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"}
-    expect(@conn.lookup_cast_type_from_column(column).cast(1.0).class).to eq(Fixnum)
-  end
-
   describe "/ NUMBER values from ActiveRecord model" do
     before(:each) do
       class ::Test2Employee < ActiveRecord::Base
@@ -442,71 +346,12 @@ describe "OracleEnhancedAdapter boolean type detection based on string column ty
     end
   end
 
-  xit "should set CHAR/VARCHAR2 column type as string if emulate_booleans_from_strings is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
-    columns = @conn.columns('test3_employees')
-    %w(has_email has_phone active_flag manager_yn).each do |col|
-      column = columns.detect{|c| c.name == col}
-      expect(column.type).to eq(:string)
-    end
-  end
-
-  xit "should set CHAR/VARCHAR2 column type as boolean if emulate_booleans_from_strings is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-    columns = @conn.columns('test3_employees')
-    %w(has_email has_phone active_flag manager_yn).each do |col|
-      column = columns.detect{|c| c.name == col}
-      expect(column.type).to eq(:boolean)
-    end
-  end
-
-  xit "should set VARCHAR2 column type as string if column name does not contain 'flag' or 'yn' and emulate_booleans_from_strings is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-    columns = @conn.columns('test3_employees')
-    %w(phone_number email).each do |col|
-      column = columns.detect{|c| c.name == col}
-      expect(column.type).to eq(:string)
-    end
-  end
-
-  xit "should return string value from VARCHAR2 boolean column if emulate_booleans_from_strings is false" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
-    columns = @conn.columns('test3_employees')
-    %w(has_email has_phone active_flag manager_yn).each do |col|
-      column = columns.detect{|c| c.name == col}
-      expect(@conn.lookup_cast_type_from_column(column).cast("Y").class).to eq(String)
-    end
-  end
-
-  xit "should return boolean value from VARCHAR2 boolean column if emulate_booleans_from_strings is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-    columns = @conn.columns('test3_employees')
-    %w(has_email has_phone active_flag manager_yn).each do |col|
-      column = columns.detect{|c| c.name == col}
-      expect(@conn.lookup_cast_type_from_column(column).cast("Y").class).to eq(TrueClass)
-      expect(@conn.lookup_cast_type_from_column(column).cast("N").class).to eq(FalseClass)
-    end
-  end
-
-  xit "should translate boolean type to VARCHAR2(1) if emulate_booleans_from_strings is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-    expect(ActiveRecord::Base.connection.type_to_sql(
-      :boolean, nil, nil, nil)).to eq("VARCHAR2(1)")
-  end
-
   it "should translate boolean type to NUMBER(1) if emulate_booleans_from_strings is false" do
     # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
     expect(ActiveRecord::Base.connection.type_to_sql(
       :boolean, nil, nil, nil)).to eq("NUMBER(1)")
   end
 
-  xit "should get default value from VARCHAR2 boolean column if emulate_booleans_from_strings is true" do
-    ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = true
-    columns = @conn.columns('test3_employees')
-    expect(columns.detect{|c| c.name == 'has_phone'}.default).to be_truthy
-    expect(columns.detect{|c| c.name == 'manager_yn'}.default).to be_falsey
-  end
-
   describe "/ VARCHAR2 boolean values from ActiveRecord model" do
     before(:each) do
       # ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_booleans_from_strings = false
@@ -782,21 +627,6 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     expect(@employee.created_at_ts).to eq(@now)
   end
 
-  xit "should quote Date values with TO_DATE" do
-    expect(@conn.quote(@today)).to eq("TO_DATE('#{@today.year}-#{"%02d" % @today.month}-#{"%02d" % @today.day}','YYYY-MM-DD HH24:MI:SS')")
-  end
-
-  xit "should quote Time values with TO_DATE" do
-    expect(@conn.quote(@now)).to eq("TO_DATE('#{@now.year}-#{"%02d" % @now.month}-#{"%02d" % @now.day} "+
-                                "#{"%02d" % @now.hour}:#{"%02d" % @now.min}:#{"%02d" % @now.sec}','YYYY-MM-DD HH24:MI:SS')")
-  end
-
-  xit "should quote Time values with TO_TIMESTAMP" do
-    @ts = @now + 0.1
-    expect(@conn.quote(@ts)).to eq("TO_TIMESTAMP('#{@ts.year}-#{"%02d" % @ts.month}-#{"%02d" % @ts.day} "+
-                                "#{"%02d" % @ts.hour}:#{"%02d" % @ts.min}:#{"%02d" % @ts.sec}:100000','YYYY-MM-DD HH24:MI:SS:FF6')")
-  end
-
 end
 
 describe "OracleEnhancedAdapter assign string to :date and :datetime columns" do
@@ -1493,15 +1323,6 @@ describe "OracleEnhancedAdapter quoting of NCHAR and NVARCHAR2 columns" do
     ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
   end
 
-  xit "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}
-      expect(column.type).to eq(:string)
-      expect(column.nchar).to eq(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|

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -225,24 +225,6 @@ describe "OracleEnhancedAdapter schema dump" do
       expect(standard_dump(ignore_tables: [ /test_posts/i ])).to match(/add_foreign_key "test_comments"/)
     end
 
-    it "should include composite foreign keys" do
-      skip "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
-
-        execute <<-SQL
-          ALTER TABLE TEST_POSTS
-          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
-        SQL
-
-        add_column :test_comments, :baz_id, :integer
-        add_column :test_comments, :fooz_id, :integer
-
-        add_foreign_key :test_comments, :test_posts, columns: ["baz_id", "fooz_id"], name: 'comments_posts_baz_fooz_fk'
-      end
-      expect(standard_dump).to match(/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

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -733,52 +733,6 @@ end
       expect(TestComment.find_by_id(c.id).test_post_id).to be_nil
     end
 
-    it "should add a composite foreign key" do
-      skip "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
-
-        execute <<-SQL
-          ALTER TABLE TEST_POSTS
-          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
-        SQL
-
-        add_column :test_comments, :baz_id, :integer
-        add_column :test_comments, :fooz_id, :integer
-
-        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"]
-      end
-
-      expect do
-        TestComment.create(:body => "test", :fooz_id => 1, :baz_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(
-        /ORA-02291.*\.TES_COM_BAZ_ID_FOO_ID_FK/
-      )}
-    end
-
-    it "should add a composite foreign key with name" do
-      skip "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
-
-        execute <<-SQL
-          ALTER TABLE TEST_POSTS
-          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
-        SQL
-
-        add_column :test_comments, :baz_id, :integer
-        add_column :test_comments, :fooz_id, :integer
-
-        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
-      end
-
-      expect do
-        TestComment.create(:body => "test", :baz_id => 1, :fooz_id => 1)
-      end.to raise_error() {|e| expect(e.message).to match(/ORA-02291.*\.COMMENTS_POSTS_BAZ_FOOZ_FK/)}
-    end
-
     it "should remove foreign key by table name" do
       schema_define do
         add_foreign_key :test_comments, :test_posts

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -91,29 +91,6 @@ describe "OracleEnhancedAdapter structure dump" do
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
     end
     
-    it "should dump composite foreign keys" do
-      skip "Composite foreign keys are not supported in this version"
-      @conn.add_column :foos, :fooz_id, :integer
-      @conn.add_column :foos, :baz_id, :integer
-      
-      @conn.execute <<-SQL
-        ALTER TABLE FOOS 
-        ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
-      SQL
-      
-      @conn.add_column :test_posts, :fooz_id, :integer
-      @conn.add_column :test_posts, :baz_id, :integer
-            
-      @conn.execute <<-SQL
-        ALTER TABLE TEST_POSTS
-        ADD CONSTRAINT fk_test_post_fooz_baz FOREIGN KEY (baz_id,fooz_id) REFERENCES foos(baz_id,fooz_id)
-      SQL
-      
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
-      expect(dump.split('\n').length).to eq(1)
-      expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOOZ_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\,\"?FOOZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\,\"?FOOZ_ID\"?\)/i)
-    end
-  
     it "should not error when no foreign keys are present" do
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
       expect(dump.split('\n').length).to eq(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.0.beta1
+  version: 1.7.0.beta2
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="