activerecord-oracle_enhanced-adapter 1.8.0.beta1 → 1.8.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1beed345101483212d25e0040e52c3fd04c727
-  data.tar.gz: 75338dd46c82d721a9d5762e900444ecc41b563f
+  metadata.gz: 4a86ef85ec7e673fd5ce17f5c7b3310b556f28a2
+  data.tar.gz: 997989db47ecd4c360ae34536309e25b983ad7f7
 SHA512:
-  metadata.gz: 821f716a5eb0bed68a572bd2c2e848e8800bedbec6fe2132fcc7bd97fd76e8e9c8d0e630b781deccc196165764afac8fc1ee65d1e5bd6019e2facfc4db2d8511
-  data.tar.gz: b1bcd32cb0b630b2db83c44dccf398620ff84a6032dc0876d0c38f1cb4993045b57cb6b604498e78f34928d819fc163241aeb2960021876157d4bf6aac53446e
+  metadata.gz: 42b2013124fe69b031243f33a5c1f2be3b483259975d593d7b5d4d523988246581df3369baa9e6581fda2c10dd4a90887ecc043cd03ee3f1dc67805f59d0e66b
+  data.tar.gz: a08ff57547d9f528d0dce8d6d8f026ba82256d889c1415d142b5df2a18a2e26ccda255af4da40274927d8a0f9b971eb108d363c18f15222bb44d46725444876d

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -10,9 +10,7 @@ group :development do
   gem "rdoc"
   gem "rake"
 
-  gem "activerecord",   github: "rails/rails", branch: "master"
-  gem "rack",           github: "rack/rack", branch: "master"
-
+  gem "activerecord",   github: "rails/rails", branch: "5-1-stable"
   gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
 
   platforms :ruby do

data/History.md

@@ -1,3 +1,33 @@
+## 1.8.0.rc1 / 2017-03-20
+
+* Major enhancements
+  * Support Rails 5.1.0.rc1
+  * Add JSON attribute support #1240
+  * Update `database.yml` when `rails new <new_app> -d oracle` specified [rails/rails#28257]
+
+* Changes and bug fixes
+  * Eliminate a redundant empty lines in schema.rb generated by SchemaDumper [#1232]
+  * Align the columns of db/structure.sql [#1242]
+  * Use Abstract StatementPool [#1228]
+  * Decouple Composite Primary Key code [#1224, #1225]
+  * Push `valid_type?` up to abstract adapter [#1208]
+  * Oracle12 visitor is also available for 12.2 [#1217]
+  * Oracle Database 12c Release 2 bundles new ojdbc8.jar [#1218]
+  * Deprecate `supports_migrations?` on connection adapters [#1209]
+  * Use `ActiveRecord::SchemaMigration.table_name` [#1221]
+  * No need to check if `changed?` defined [#1226]
+  * No need to initialize `@quoted_column_names` and `@quoted_table_names` [#1227]
+  * Hard code `empty_blob()` or `empty_clob()` based on types [#1229]
+  * ruby-plsql 0.6.0 or higher version is required [#1216]
+  * No need to specify `rack` in Gemfile [#1230]
+  * Bundle from more secure source [#1243]
+  * Add Travis CI build status [#1231]
+  * Bump JRuby to 9.1.8.0 [#1222]
+  * Remove a duplicate spec testing `Model.distinct.count` [#1235]
+  * Suppress unused and not initialized warnings [#1215]
+  * Suppress `WARNING: Using the `raise_error` matcher without providing a specific error` [#1219]
+  * Suppress `WARNING: Using `expect { }.not_to raise_error(...)` risks false positives` [#1220]
+
 ## 1.8.0.beta1 / 2017-02-27
 
 * Major enhancements

data/RUNNING_TESTS.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rsim/oracle-enhanced.svg?branch=master)](https://travis-ci.org/rsim/oracle-enhanced)
+
 # When and Which tests need to be executed
 
 When you are creating a fix and/or some new features for Oracle enhanced adapter,

data/VERSION

@@ -1 +1 @@
-1.8.0.beta1
+1.8.0.rc1

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "activerecord-oracle_enhanced-adapter"
-  s.version = "1.8.0.beta1"
+  s.version = "1.8.0.rc1"
 
   s.required_rubygems_version = ">= 1.8.11"
   s.required_ruby_version     = ">= 2.2.2"
   s.license = "MIT"
   s.authors = ["Raimonds Simanovskis"]
-  s.date = "2016-12-26"
+  s.date = "2017-03-20"
   s.description = '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.
 '
@@ -30,7 +30,6 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/connection.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/context_index.rb",
-    "lib/active_record/connection_adapters/oracle_enhanced/cpk.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb",
     "lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb",
@@ -48,6 +47,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "lib/active_record/connection_adapters/oracle_enhanced/version.rb",
     "lib/active_record/oracle_enhanced/type/boolean.rb",
     "lib/active_record/oracle_enhanced/type/integer.rb",
+    "lib/active_record/oracle_enhanced/type/json.rb",
     "lib/active_record/oracle_enhanced/type/national_character_string.rb",
     "lib/active_record/oracle_enhanced/type/raw.rb",
     "lib/active_record/oracle_enhanced/type/string.rb",
@@ -56,7 +56,6 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
@@ -75,7 +74,6 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb",
-    "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
@@ -87,7 +85,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.add_runtime_dependency("activerecord", ["~> 5.1.0.beta"])
+  s.add_runtime_dependency("activerecord", ["~> 5.1.0.rc"])
   s.add_runtime_dependency("arel", ["~> 8.0"])
-  s.add_runtime_dependency("ruby-plsql")
+  s.add_runtime_dependency("ruby-plsql", [">= 0.6.0"])
 end

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

@@ -79,7 +79,7 @@ module ActiveRecord
         # New method in ActiveRecord 3.1
         # Will add RETURNING clause in case of trigger generated primary keys
         def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-          unless id_value || pk == false || pk.nil? || (defined?(CompositePrimaryKeys) && pk.kind_of?(CompositePrimaryKeys::CompositeKeys))
+          unless id_value || pk == false || pk.nil? ||  pk.is_a?(Array)
             sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
             (binds = binds.dup) << ActiveRecord::Relation::QueryAttribute.new("returning_id", nil, ActiveRecord::OracleEnhanced::Type::Integer.new)
           end

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

@@ -12,8 +12,9 @@ begin
   end
 
   # Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
-  # Oracle 12c client provides new ojdbc7.jar
-  ojdbc_jars = %w(ojdbc7.jar ojdbc6.jar)
+  # Oracle 12c Release 1 client provides ojdbc7.jar
+  # Oracle 12c Release 2 client provides ojdbc8.jar
+  ojdbc_jars = %w(ojdbc8.jar ojdbc7.jar ojdbc6.jar)
 
   if ENV_JAVA["java.class.path"] !~ Regexp.new(ojdbc_jars.join("|"))
     # On Unix environment variable should be PATH, on Windows it is sometimes Path

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

@@ -89,9 +89,9 @@ module ActiveRecord
           when ActiveRecord::OracleEnhanced::Type::NationalCharacterString::Data then
             "N" << "'#{quote_string(value.to_s)}'"
           when ActiveModel::Type::Binary::Data then
-            "empty_#{ type_to_sql(column.type.to_sym).downcase rescue 'blob' }()"
+            "empty_blob()"
           when ActiveRecord::OracleEnhanced::Type::Text::Data then
-            "empty_#{ type_to_sql(column.type.to_sym).downcase rescue 'clob' }()"
+            "empty_clob()"
           else
             super
           end

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

@@ -72,8 +72,10 @@ module ActiveRecord #:nodoc:
                   # unrecognized index type
                   statement_parts = ["# unrecognized index #{index.name.inspect} with type #{index.type.inspect}"]
                 end
-                "  " + statement_parts.join(", ")
-              end
+                "  " + statement_parts.join(", ") unless statement_parts.empty?
+              end.compact
+
+              return if add_index_statements.empty?
 
               stream.puts add_index_statements.sort.join("\n")
               stream.puts

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

@@ -114,7 +114,7 @@ module ActiveRecord
         end
 
         def insert_versions_sql(versions) # :nodoc:
-          sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
+          sm_table = quote_table_name(ActiveRecord::SchemaMigration.table_name)
 
           if supports_multi_insert?
             versions.inject("INSERT ALL\n") { |sql, version|

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

@@ -28,7 +28,7 @@ module ActiveRecord #:nodoc:
               structure_dump_column(row)
             end
           end
-          ddl << cols.join(",\n ")
+          ddl << cols.map { |col| " #{col}" }.join(",\n")
           ddl << structure_dump_primary_key(table_name)
           ddl << "\n)"
           structure << ddl

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -29,6 +29,7 @@
 # portions Copyright 2005 Graham Jenkins
 
 require "active_record/connection_adapters/abstract_adapter"
+require "active_record/connection_adapters/statement_pool"
 require "active_record/connection_adapters/oracle_enhanced/connection"
 require "active_record/connection_adapters/oracle_enhanced/database_statements"
 require "active_record/connection_adapters/oracle_enhanced/schema_statements"
@@ -212,40 +213,17 @@ module ActiveRecord
       cattr_accessor :use_old_oracle_visitor
       self.use_old_oracle_visitor = false
 
-      class StatementPool
-        include Enumerable
+      class StatementPool < ConnectionAdapters::StatementPool
+        private
 
-        def initialize(connection, max = 300)
-          @connection = connection
-          @max        = max
-          @cache      = {}
-        end
-
-        def each(&block); @cache.each(&block); end
-        def key?(key);    @cache.key?(key); end
-        def [](key);      @cache[key]; end
-        def length;       @cache.length; end
-        def delete(key);  @cache.delete(key); end
-
-        def []=(sql, key)
-          while @max <= @cache.size
-            @cache.shift.last.close
+          def dealloc(stmt)
+            stmt.close
           end
-          @cache[sql] = key
-        end
-
-        def clear
-          @cache.values.each do |cursor|
-            cursor.close
-          end
-          @cache.clear
-        end
       end
 
       def initialize(connection, logger = nil, config = {}) # :nodoc:
         super(connection, logger, config)
-        @quoted_column_names, @quoted_table_names = {}, {}
-        @statements = StatementPool.new(connection, config.fetch(:statement_limit) { 250 })
+        @statements = StatementPool.new(self.class.type_cast_config_to_integer(config[:statement_limit]))
         @enable_dbms_output = false
       end
 
@@ -263,10 +241,6 @@ module ActiveRecord
         end
       end
 
-      def supports_migrations? #:nodoc:
-        true
-      end
-
       def supports_savepoints? #:nodoc:
         true
       end
@@ -288,7 +262,7 @@ module ActiveRecord
       end
 
       def supports_fetch_first_n_rows_and_offset?
-        if !use_old_oracle_visitor && @connection.database_version == [12, 1]
+        if !use_old_oracle_visitor && @connection.database_version.first >= 12
           true
         else
           false
@@ -311,6 +285,32 @@ module ActiveRecord
         @connection.database_version.first >= 11
       end
 
+      def supports_json?
+        # No migration supported for :json type due to there is no `JSON` data type
+        # in Oracle Database itself.
+        #
+        # 1.Define :string or :text in migration
+        #
+        # create_table :test_posts, force: true do |t|
+        #   t.string  :title
+        #   t.text    :article
+        # end
+        #
+        # 2. Set :json attributes
+        #
+        # class TestPost < ActiveRecord::Base
+        #  attribute :title, :json
+        #  attribute :article, :json
+        # end
+        #
+        # 3. Add `is json` database constraints by running sql statements
+        #
+        # alter table test_posts add constraint test_posts_title_is_json check (title is json)
+        # alter table test_posts add constraint test_posts_article_is_json check (article is json)
+        #
+        @connection.database_version.first >= 12
+      end
+
       #:stopdoc:
       DEFAULT_NLS_PARAMETERS = {
         nls_calendar: nil,
@@ -517,13 +517,7 @@ module ActiveRecord
 
       # Writes LOB values from attributes for specified columns
       def write_lobs(table_name, klass, attributes, columns) #:nodoc:
-        # is class with composite primary key>
-        is_with_cpk = klass.respond_to?(:composite?) && klass.composite?
-        if is_with_cpk
-          id = klass.primary_key.map { |pk| attributes[pk.to_s] }
-        else
-          id = quote(attributes[klass.primary_key])
-        end
+        id = quote(attributes[klass.primary_key])
         columns.each do |col|
           value = attributes[col.name]
           # changed sequence of next two lines - should check if value is nil before converting to yaml
@@ -532,8 +526,7 @@ module ActiveRecord
             value = klass.attribute_types[col.name].serialize(value)
           end
           uncached do
-            sql = is_with_cpk ? "SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)} WHERE #{klass.composite_where_clause(id)} FOR UPDATE" :
-              "SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)} WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE"
+            sql = "SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)} WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE"
             unless lob_record = select_one(sql, "Writable Large Object")
               raise ActiveRecord::RecordNotFound, "statement #{sql} returned no rows"
             end
@@ -919,10 +912,6 @@ module ActiveRecord
         select_value("SELECT temporary FROM all_tables WHERE table_name = '#{table_name.upcase}' and owner = SYS_CONTEXT('userenv', 'session_user')") == "Y"
       end
 
-      def valid_type?(type)
-        !native_database_types[type].nil?
-      end
-
       def combine_bind_parameters(
         from_clause: [],
         join_clause: [],
@@ -1080,9 +1069,6 @@ require "active_record/connection_adapters/oracle_enhanced/schema_definitions"
 # Extensions for context index definition
 require "active_record/connection_adapters/oracle_enhanced/context_index"
 
-# Load additional methods for composite_primary_keys support
-require "active_record/connection_adapters/oracle_enhanced/cpk"
-
 # Patches and enhancements for schema dumper
 require "active_record/connection_adapters/oracle_enhanced/schema_dumper"
 
@@ -1124,3 +1110,7 @@ require "active_record/oracle_enhanced/type/boolean"
 
 # To use :boolean type for Attribute API, each type needs registered explicitly.
 ActiveRecord::Type.register(:boolean, ActiveRecord::OracleEnhanced::Type::Boolean, adapter: :oracleenhanced)
+
+# Add JSON attribute support
+require "active_record/oracle_enhanced/type/json"
+ActiveRecord::Type.register(:json, ActiveRecord::OracleEnhanced::Type::Json, adapter: :oracleenhanced)

data/lib/active_record/oracle_enhanced/type/json.rb

@@ -0,0 +1,8 @@
+module ActiveRecord
+  module OracleEnhanced
+    module Type
+      class Json < ActiveRecord::Type::Internal::AbstractJson
+      end
+    end
+  end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -177,39 +177,6 @@ describe "OracleEnhancedAdapter" do
 
   end
 
-  describe "without composite_primary_keys" do
-
-    before(:all) do
-      @conn = ActiveRecord::Base.connection
-      @conn.execute "DROP TABLE test_employees" rescue nil
-      @conn.execute <<-SQL
-        CREATE TABLE test_employees (
-          employee_id   NUMBER PRIMARY KEY,
-          name          VARCHAR2(50)
-        )
-      SQL
-      Object.send(:remove_const, "CompositePrimaryKeys") if defined?(CompositePrimaryKeys)
-      class ::TestEmployee < ActiveRecord::Base
-        self.primary_key = :employee_id
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, "TestEmployee")
-      @conn.execute "DROP TABLE test_employees"
-      ActiveRecord::Base.clear_cache!
-    end
-
-    it "should tell ActiveRecord that count distinct is supported" do
-      expect(ActiveRecord::Base.connection.supports_count_distinct?).to be_truthy
-    end
-
-    it "should execute correct SQL COUNT DISTINCT statement" do
-      expect { TestEmployee.distinct.count(:employee_id) }.not_to raise_error
-    end
-
-  end
-
   describe "reserved words column quoting" do
 
     before(:all) do

data/spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb

@@ -78,6 +78,10 @@ describe "OracleEnhancedAdapter context index" do
       ActiveRecord::Base.clear_cache!
     end
 
+    before(:each) do
+      @post = nil
+    end
+
     after(:each) do
       @post.destroy if @post
     end

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -1346,3 +1346,58 @@ describe "OracleEnhancedAdapter handling of BINARY_FLOAT columns" do
     expect(column.type).to eq(:float)
   end
 end
+
+describe "OracleEnhancedAdapter attribute API support for JSON type" do
+
+  include SchemaSpecHelper
+
+  before(:each) do
+    @conn = ActiveRecord::Base.connection
+    @oracle12c_or_higher = !! @conn.select_value(
+      "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) >= 12")
+    skip "Not supported in this database version" unless @oracle12c_or_higher
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    schema_define do
+      create_table :test_posts, force: true do |t|
+        t.string  :title
+        t.text    :article
+      end
+    end
+    @conn.execute <<-SQL
+      alter table test_posts add constraint test_posts_title_is_json check (title is json)
+    SQL
+    @conn.execute <<-SQL
+      alter table test_posts add constraint test_posts_article_is_json check (article is json)
+    SQL
+
+    class TestPost < ActiveRecord::Base
+      attribute :title, :json
+      attribute :article, :json
+    end
+  end
+
+  after(:each) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    schema_define do
+      drop_table :test_posts, if_exists: true
+    end
+  end
+
+  it "should support attribute api for JSON" do
+    post = TestPost.create!(title: { "publish" => true, "foo" => "bar" }, article: { "bar" => "baz" })
+    post.reload
+    expect(post.title).to eq ({ "publish" => true, "foo" => "bar" })
+    expect(post.article).to eq ({ "bar" => "baz" })
+    post.title = ({ "publish" => false, "foo" => "bar2" })
+    post.save
+    expect(post.reload.title).to eq ({ "publish" => false, "foo" => "bar2" })
+  end
+
+  it "should support IS JSON" do
+    post = TestPost.create!(title: { "publish" => true, "foo" => "bar" })
+    count_json = TestPost.where("title is json")
+    expect(count_json.size).to eq 1
+    count_non_json = TestPost.where("title is not json")
+    expect(count_non_json.size).to eq 0
+  end
+end

data/spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb

@@ -1,139 +1,137 @@
-if ActiveRecord::Base.method_defined?(:changed?)
-
-  describe "OracleEnhancedAdapter dirty object tracking" do
-    include SchemaSpecHelper
-
-    before(:all) do
-      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-      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
+describe "OracleEnhancedAdapter dirty object tracking" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    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
 
-    after(:all) do
-      schema_define do
-        drop_table :test_employees
-      end
-      Object.send(:remove_const, "TestEmployee")
-      ActiveRecord::Base.clear_cache!
+    class TestEmployee < ActiveRecord::Base
     end
+  end
 
-    it "should not mark empty string (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(first_name: "")
-      @employee.first_name = ""
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.first_name = ""
-      expect(@employee).not_to be_changed
+  after(:all) do
+    schema_define do
+      drop_table :test_employees
     end
+    Object.send(:remove_const, "TestEmployee")
+    ActiveRecord::Base.clear_cache!
+  end
 
-    it "should not mark empty integer (stored as NULL) as changed when reassigning it" do
-      @employee = TestEmployee.create!(job_id: "")
-      @employee.job_id = ""
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.job_id = ""
-      expect(@employee).not_to be_changed
-    end
+  it "should not mark empty string (stored as NULL) as changed when reassigning it" do
+    @employee = TestEmployee.create!(first_name: "")
+    @employee.first_name = ""
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.first_name = ""
+    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 = ""
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.salary = ""
-      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 = ""
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.job_id = ""
+    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.comments = nil
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.comments = nil
-      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 = ""
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.salary = ""
+    expect(@employee).not_to be_changed
+  end
 
-    it "should not mark empty text (stored as empty_clob()) as changed when reassigning it" do
-      @employee = TestEmployee.create!(comments: "")
-      @employee.comments = ""
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.comments = ""
-      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.comments = nil
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.comments = nil
+    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.comments = nil
-      expect(@employee).to be_changed
-      @employee.reload
-      @employee.comments = nil
-      expect(@employee).to be_changed
-    end
+  it "should not mark empty text (stored as empty_clob()) as changed when reassigning it" do
+    @employee = TestEmployee.create!(comments: "")
+    @employee.comments = ""
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.comments = ""
+    expect(@employee).not_to be_changed
+  end
 
-    it "should mark empty text (stored as NULL) as changed when assigning '' to it" do
-      @employee = TestEmployee.create!(comments: nil)
-      @employee.comments = ""
-      expect(@employee).to be_changed
-      @employee.reload
-      @employee.comments = ""
-      expect(@employee).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.comments = nil
+    expect(@employee).to be_changed
+    @employee.reload
+    @employee.comments = nil
+    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 = ""
-      expect(@employee).not_to be_changed
-      @employee.reload
-      @employee.hire_date = ""
-      expect(@employee).not_to be_changed
-    end
+  it "should mark empty text (stored as NULL) as changed when assigning '' to it" do
+    @employee = TestEmployee.create!(comments: nil)
+    @employee.comments = ""
+    expect(@employee).to be_changed
+    @employee.reload
+    @employee.comments = ""
+    expect(@employee).to be_changed
+  end
 
-    it "should not mark integer as changed when reassigning it" do
-      @employee = TestEmployee.new
-      @employee.job_id = 0
-      expect(@employee.save!).to be_truthy
+  it "should not mark empty date (stored as NULL) as changed when reassigning it" do
+    @employee = TestEmployee.create!(hire_date: "")
+    @employee.hire_date = ""
+    expect(@employee).not_to be_changed
+    @employee.reload
+    @employee.hire_date = ""
+    expect(@employee).not_to be_changed
+  end
 
-      expect(@employee).not_to be_changed
+  it "should not mark integer as changed when reassigning it" do
+    @employee = TestEmployee.new
+    @employee.job_id = 0
+    expect(@employee.save!).to be_truthy
 
-      @employee.job_id = "0"
-      expect(@employee).not_to be_changed
-    end
+    expect(@employee).not_to be_changed
 
-    it "should not update unchanged CLOBs" do
-      @employee = TestEmployee.create!(
-          comments: "initial"
-      )
-      expect(@employee.save!).to be_truthy
-      @employee.reload
-      expect(@employee.comments).to eq("initial")
-
-      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'")
-      class << oci_conn
-        remove_method :write_lob
-      end
-    end
+    @employee.job_id = "0"
+    expect(@employee).not_to be_changed
+  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
+  it "should not update unchanged CLOBs" do
+    @conn = nil
+    @connection = nil
+    @employee = TestEmployee.create!(
+        comments: "initial"
+    )
+    expect(@employee.save!).to be_truthy
+    @employee.reload
+    expect(@employee.comments).to eq("initial")
+
+    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_error
+    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")
+    @employee = TestEmployee.select("#{TestEmployee.quoted_table_name}.*, 24 ranking").first
+    expect { @employee.ranking = 25 }.to_not raise_error
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb

@@ -1,6 +1,7 @@
 describe "OracleEnhancedAdapter emulate OracleAdapter" do
 
   before(:all) do
+    @old_oracle_adapter = nil
     if defined?(ActiveRecord::ConnectionAdapters::OracleAdapter)
       @old_oracle_adapter = ActiveRecord::ConnectionAdapters::OracleAdapter
       ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -210,7 +210,6 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
       hire_date: @today,
       description: "description"
     )
-    empl_id = @employee.id
     @employee.reload
     @employee.first_name = "Second"
     expect {

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -74,7 +74,7 @@ describe "OracleEnhancedAdapter schema dump" do
   describe "table prefixes and suffixes" do
     after(:each) do
       drop_test_posts_table
-      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      @conn.drop_table(ActiveRecord::SchemaMigration.table_name) if @conn.table_exists?(ActiveRecord::SchemaMigration.table_name)
       @conn.drop_table(ActiveRecord::InternalMetadata.table_name) if @conn.table_exists?(ActiveRecord::InternalMetadata.table_name)
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
@@ -493,4 +493,29 @@ describe "OracleEnhancedAdapter schema dump" do
     end
   end
 
+  describe "schema.rb format" do
+    before do
+      create_test_posts_table
+
+      schema_define do
+        create_table :test_comments, force: true do |t|
+          t.string :title
+        end
+
+        add_index :test_comments, :title
+      end
+    end
+
+    it "should be only one blank line between create_table methods in schema dump" do
+      expect(standard_dump).to match(/end\n\n  create_table/)
+    end
+
+    after do
+      schema_define do
+        drop_table :test_comments rescue nil
+      end
+
+      drop_test_posts_table
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -214,7 +214,7 @@ describe "OracleEnhancedAdapter schema definition" do
       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")
+        @conn.insert("INSERT INTO test_employees (first_name) VALUES ('Yasuo')", nil, "id")
         expect(@logger.output(:error)).not_to match(/^Could not log "sql.active_record" event. NoMethodError: undefined method `name' for :returning_id:Symbol/)
         clear_logger
       end
@@ -1107,7 +1107,7 @@ end
             t.virtual :field2
           end
         end
-      }.to raise_error
+      }.to raise_error(RuntimeError, "No virtual column definition found.")
     end
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb

@@ -147,7 +147,7 @@ describe "OracleEnhancedAdapter structure dump" do
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n\"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\) GENERATED ALWAYS AS \(HEXTORAW\(TO_CHAR\(ID\)\)\) VIRTUAL/)
+      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n \"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\) GENERATED ALWAYS AS \(HEXTORAW\(TO_CHAR\(ID\)\)\) VIRTUAL/)
     end
 
     it "should dump unique keys" do
@@ -198,7 +198,7 @@ describe "OracleEnhancedAdapter structure dump" do
         )
       SQL
       dump = ActiveRecord::Base.connection.structure_dump
-      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n\"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\)/)
+      expect(dump).to match(/CREATE TABLE \"BARS\" \(\n \"ID\" NUMBER\(38,0\) NOT NULL,\n \"SUPER\" RAW\(255\)/)
     end
 
     it "should dump table comments" do

data/spec/spec_helper.rb

@@ -24,8 +24,6 @@ elsif RUBY_ENGINE == "jruby"
   puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
-NO_COMPOSITE_PRIMARY_KEYS = true
-
 require "active_record"
 
 require "active_support/core_ext/module/attribute_accessors"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.8.0.beta1
+  version: 1.8.0.rc1
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0.rc
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 description: |
   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.
@@ -75,7 +75,6 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced/column_dumper.rb
 - lib/active_record/connection_adapters/oracle_enhanced/connection.rb
 - lib/active_record/connection_adapters/oracle_enhanced/context_index.rb
-- lib/active_record/connection_adapters/oracle_enhanced/cpk.rb
 - lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
 - lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
@@ -94,6 +93,7 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
 - lib/active_record/oracle_enhanced/type/boolean.rb
 - lib/active_record/oracle_enhanced/type/integer.rb
+- lib/active_record/oracle_enhanced/type/json.rb
 - lib/active_record/oracle_enhanced/type/national_character_string.rb
 - lib/active_record/oracle_enhanced/type/raw.rb
 - lib/active_record/oracle_enhanced/type/string.rb
@@ -102,7 +102,6 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb
@@ -141,7 +140,6 @@ test_files:
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_database_tasks_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb

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

@@ -1,19 +0,0 @@
-module ActiveRecord #:nodoc:
-  module ConnectionAdapters #:nodoc:
-    module OracleEnhancedCpk #:nodoc:
-      # This mightn't be in Core, but count(distinct x,y) doesn't work for me.
-      # Return that not supported if composite_primary_keys gem is required.
-      def supports_count_distinct? #:nodoc:
-        @supports_count_distinct ||= ! defined?(CompositePrimaryKeys)
-      end
-
-      def concat(*columns) #:nodoc:
-        "(#{columns.join('||')})"
-      end
-    end
-  end
-end
-
-ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
-  include ActiveRecord::ConnectionAdapters::OracleEnhancedCpk
-end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -1,111 +0,0 @@
-unless defined?(NO_COMPOSITE_PRIMARY_KEYS)
-
-  describe "OracleEnhancedAdapter composite_primary_keys support" do
-    include SchemaSpecHelper
-
-    before(:all) do
-      if defined?(::ActiveRecord::ConnectionAdapters::OracleAdapter)
-        @old_oracle_adapter = ::ActiveRecord::ConnectionAdapters::OracleAdapter
-        ::ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
-      end
-      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
-      if $cpk_oracle_adapter
-        ::ActiveRecord::ConnectionAdapters::OracleAdapter = $cpk_oracle_adapter
-        $cpk_oracle_adapter = nil
-      end
-      require "composite_primary_keys"
-    end
-
-    after(:all) do
-      # Object.send(:remove_const, 'CompositePrimaryKeys') if defined?(CompositePrimaryKeys)
-      if defined?(::ActiveRecord::ConnectionAdapters::OracleAdapter)
-        $cpk_oracle_adapter = ::ActiveRecord::ConnectionAdapters::OracleAdapter
-        ::ActiveRecord::ConnectionAdapters.send(:remove_const, :OracleAdapter)
-      end
-      if @old_oracle_adapter
-        ::ActiveRecord::ConnectionAdapters::OracleAdapter = @old_oracle_adapter
-        @old_oracle_adapter = nil
-      end
-    end
-
-    describe "do not use count distinct" do
-      before(:all) do
-        schema_define do
-          create_table :job_history, primary_key: [:employee_id, :start_date], force: true do |t|
-            t.integer :employee_id
-            t.date    :start_date
-          end
-        end
-        class ::JobHistory < ActiveRecord::Base
-          set_table_name "job_history"
-          set_primary_keys :employee_id, :start_date
-        end
-      end
-
-      after(:all) do
-        Object.send(:remove_const, "JobHistory") if defined?(JobHistory)
-        schema_define do
-          drop_table :job_history
-        end
-      end
-
-      it "should tell ActiveRecord that count distinct is not supported" do
-        expect(ActiveRecord::Base.connection.supports_count_distinct?).to be_falsey
-      end
-
-      it "should execute correct SQL COUNT DISTINCT statement on table with composite primary keys" do
-        expect { JobHistory.count(distinct: true) }.not_to raise_error
-      end
-    end
-
-    describe "table with LOB" do
-      before(:all) do
-        schema_define do
-          create_table :cpk_write_lobs_test, primary_key: [:type_category, :date_value], force: true do |t|
-            t.string  :type_category, limit: 15, null: false
-            t.date    :date_value, null: false
-            t.text    :results, null: false
-            t.timestamps null: true
-          end
-          create_table :non_cpk_write_lobs_test, force: true do |t|
-            t.date    :date_value, null: false
-            t.text    :results, null: false
-            t.timestamps null: true
-          end
-        end
-        class ::CpkWriteLobsTest < ActiveRecord::Base
-          set_table_name "cpk_write_lobs_test"
-          set_primary_keys :type_category, :date_value
-        end
-        class ::NonCpkWriteLobsTest < ActiveRecord::Base
-          set_table_name "non_cpk_write_lobs_test"
-        end
-      end
-
-      after(:all) do
-        schema_define do
-          drop_table :cpk_write_lobs_test
-          drop_table :non_cpk_write_lobs_test
-        end
-        Object.send(:remove_const, "CpkWriteLobsTest")
-        Object.send(:remove_const, "NonCpkWriteLobsTest")
-      end
-
-      it "should create new record in table with CPK and LOB" do
-        expect {
-          CpkWriteLobsTest.create(type_category: "AAA", date_value: Date.today, results: "DATA " * 10)
-        }.not_to raise_error
-      end
-
-      it "should create new record in table without CPK and with LOB" do
-        expect {
-          NonCpkWriteLobsTest.create(date_value: Date.today, results: "DATA " * 10)
-        }.not_to raise_error
-      end
-    end
-
-    # Other testing was done based on composite_primary_keys tests
-
-  end
-
-end