activerecord-oracle_enhanced-adapter 6.1.0 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5985d7537ecc79468e80b7ecddf9c8a52309719db665c0b904cb2d04994eb99
-  data.tar.gz: 0e01cd4d37d2cd9a3f1a48f33b9cdcc9b9adc340a186415cfccb13975693bd3a
+  metadata.gz: 4027e6bfee36159c451bc40038402f66298fd8a5fb90a00b63c9c12b407fd7b2
+  data.tar.gz: 6515b4272b7b84d14ee1b9280b6357608075091a3779013c8d011177b130a2ac
 SHA512:
-  metadata.gz: 58000a64e1d069d9058848a5ecf33474c8ef09ebb7ecf660d9169b5cc4b4a1911e3f8b72f24011801885c333930c378252a8f2bba5ac4051806acde9093a1af3
-  data.tar.gz: 0c21d8db90ff52720800a717b47f776abf91eded32aec137141e1510453d1eea21e31f291a771df17d7a5957873f2d5479ada8a96aeb4eb24420598080157cfa
+  metadata.gz: b3806da0e1d87fe593e90b7256c40699448483ab21dc8da9a3dbb829b7431f264ad6ae11a823d300a226d4c6e2eda1145656e2ed95dcbc9d049dd9a97be530fa
+  data.tar.gz: 668740aad129f15b371627f5fe60370a3f09ebfe08bdebe70a325ad6637c3523682daab1984986bccc6798b6a8e7ee760fc79d9155871209d9e063120ee87e71

data/History.md

@@ -1,3 +1,59 @@
+## 6.1.5 / 2021-12-07
+
+* Changes and bug fixes
+  * get root cause if something went wrong with jdbc.OracleDriver [#2180 #2181]
+
+* CI
+  * Bump CRuby versions at Travis CI for release61 branch [#2192]
+
+## 6.1.4 / 2021-04-01
+
+* Changes and bug fixes
+  * Support use of ojdbc11.jar [#2155, #2168]
+  * Add missing default granted permission "ulimited tablespace" [#2156, #2167]
+  * Prevent from including ojdbc8.jar file to gem file [#2163, #2164, #2165]
+  * Oracle enhanced adapter 6.1.3 has been yanked since #2163
+
+* CI
+  * Allow-failure CI against jruby-head for release61 branch [#2166]
+
+## 6.1.3 / 2021-03-31
+
+* Changes and bug fixes
+  * Address FrozenError (can't modify frozen Hash): error [#2139 #2151 #2160]
+
+* CI
+  * CI against JRuby 9.2.15.0 [#2150]
+
+## 6.1.2 / 2021-02-10
+* Changes and bug fixes
+  * Fixed ORA-01935: missing user or role name with config read issue [#1943 #2135, #2142]
+
+## 6.1.1 / 2021-01-14
+
+* Changes and bug fixes
+  * Remove /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ hint for all_synonyms [#2110, #2119]
+  * Fix write_lobs Invalid byte sequence in UTF-8 [#2097, #2111]
+  * Ensure FKs are properly included in structure dumps [#2109, #2113]
+
+* CI
+  * CI against JRuby 9.2.14.0 [#2085]
+  * CI against Ruby 3.0.0 [#2091, #2092]
+  * Address Travis CI warnings and bump Ubuntu version to 20.04 [#2086]
+  * Exclude `ruby-head` and `ruby-debug` until minitest allows Ruby 3.1 #2094, #2095
+  * CI against Ruby 3.0.0 at Travis CI [#2093]
+
+## 6.1.0 / 2020-12-15
+
+* Changes and bug fixes
+  * Support Rails 6.1.0
+  * Update bug report templates for Oracle enhanced adapter 6.1 [#2063]
+  * Use released version of rake [#2065 #2066]
+  * Add /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ hint to address slow SCHEMA queries [#2055, #2068]
+  * `build_subselect` does not have ordering [#2070]
+  * Remove `visit_Arel_Nodes_NotIn` and `visit_Arel_Nodes_In` visitors [#2075, #2077]
+  * `NOT IN` clause needs separated by `AND` [#2079, #2081]
+
 ## 6.1.0.rc1 / 2020-11-03
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-6.1.0
+6.1.5

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

@@ -34,7 +34,7 @@ module ActiveRecord
               table_owner, table_name = default_owner, real_name
             end
             sql = <<~SQL.squish
-              SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ owner, table_name, 'TABLE' name_type
+              SELECT owner, table_name, 'TABLE' name_type
               FROM all_tables
               WHERE owner = '#{table_owner}'
                 AND table_name = '#{table_name}'

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

@@ -254,9 +254,11 @@ module ActiveRecord
           columns.each do |col|
             value = attributes[col.name]
             # changed sequence of next two lines - should check if value is nil before converting to yaml
-            next if value.blank?
+            next unless value
             if klass.attribute_types[col.name].is_a? Type::Serialized
               value = klass.attribute_types[col.name].serialize(value)
+              # value can be nil after serialization because ActiveRecord serializes [] and {} as nil
+              next unless value
             end
             uncached do
               unless lob_record = select_one(sql = <<~SQL.squish, "Writable Large Object")

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

@@ -17,19 +17,19 @@ module ActiveRecord
             print "Please provide the SYSTEM password for your Oracle installation (set ORACLE_SYSTEM_PASSWORD to avoid this prompt)\n>"
             $stdin.gets.strip
           }
-          establish_connection(@config.merge("username" => "SYSTEM", "password" => system_password))
+          establish_connection(@config.merge(username: "SYSTEM", password: system_password))
           begin
-            connection.execute "CREATE USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
+            connection.execute "CREATE USER #{@config[:username]} IDENTIFIED BY #{@config[:password]}"
           rescue => e
             if /ORA-01920/.match?(e.message) # user name conflicts with another user or role name
-              connection.execute "ALTER USER #{@config['username']} IDENTIFIED BY #{@config['password']}"
+              connection.execute "ALTER USER #{@config[:username]} IDENTIFIED BY #{@config[:password]}"
             else
               raise e
             end
           end
 
           OracleEnhancedAdapter.permissions.each do |permission|
-            connection.execute "GRANT #{permission} TO #{@config['username']}"
+            connection.execute "GRANT #{permission} TO #{@config[:username]}"
           end
         end
 
@@ -46,7 +46,7 @@ module ActiveRecord
         def structure_dump(filename, extra_flags)
           establish_connection(@config)
           File.open(filename, "w:utf-8") { |f| f << connection.structure_dump }
-          if @config["structure_dump"] == "db_stored_code"
+          if @config[:structure_dump] == "db_stored_code"
             File.open(filename, "a") { |f| f << connection.structure_dump_db_stored_code }
           end
         end

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

@@ -16,7 +16,8 @@ begin
   # Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
   # 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)
+  # Oracle 21c provides ojdbc11.jar for Java 11 and above
+  ojdbc_jars = %w(ojdbc11.jar ojdbc8.jar ojdbc7.jar ojdbc6.jar)
 
   if !ENV_JAVA["java.class.path"]&.match?(Regexp.new(ojdbc_jars.join("|")))
     # On Unix environment variable should be PATH, on Windows it is sometimes Path
@@ -42,9 +43,9 @@ begin
     java.lang.System.set_property("oracle.net.tns_admin", ENV["TNS_ADMIN"])
   end
 
-rescue LoadError, NameError
+rescue LoadError, NameError => e
   # JDBC driver is unavailable.
-  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars.join(' or ') } library."
+  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars.join(' or ') } library.\n#{e.class}:#{e.message}"
 end
 
 module ActiveRecord
@@ -98,6 +99,8 @@ module ActiveRecord
               @raw_connection = @raw_connection.underlying_connection
             end
 
+            # Workaround FrozenError (can't modify frozen Hash):
+            config = config.dup
             config[:driver] ||= @raw_connection.meta_data.connection.java_class.name
             username = @raw_connection.meta_data.user_name
           else

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

@@ -10,14 +10,11 @@ module ActiveRecord
 
         def quote_column_name(name) #:nodoc:
           name = name.to_s
-          self.class.quoted_column_names[name] ||= begin
-            # if only valid lowercase column characters in name
-            if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
-              "\"#{name.upcase}\""
-            else
-              # remove double quotes which cannot be used inside quoted identifier
-              "\"#{name.gsub('"', '')}\""
-            end
+          self.class.quoted_column_names[name] ||= if /\A[a-z][a-z_0-9\$#]*\Z/.match?(name)
+            "\"#{name.upcase}\""
+          else
+            # remove double quotes which cannot be used inside quoted identifier
+            "\"#{name.gsub('"', '')}\""
           end
         end
 

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

@@ -76,7 +76,7 @@ module ActiveRecord
         # get synonyms for schema dump
         def synonyms
           result = select_all(<<~SQL.squish, "SCHEMA")
-            SELECT /*+ OPTIMIZER_FEATURES_ENABLE('11.2.0.2') */ synonym_name, table_owner, table_name
+            SELECT synonym_name, table_owner, table_name
             FROM all_synonyms where owner = SYS_CONTEXT('userenv', 'current_schema')
           SQL
 

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

@@ -55,8 +55,9 @@ module ActiveRecord #:nodoc:
             structure << structure_dump_column_comments(table_name)
           end
 
-          join_with_statement_token(structure) << structure_dump_fk_constraints
-          join_with_statement_token(structure) << structure_dump_views
+          join_with_statement_token(structure) <<
+            structure_dump_fk_constraints <<
+            structure_dump_views
         end
 
         def structure_dump_column(column) #:nodoc:

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -226,7 +226,7 @@ module ActiveRecord
       #   ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.permissions =
       #   ["create session", "create table", "create view", "create sequence", "create trigger", "ctxapp"]
       cattr_accessor :permissions
-      self.permissions = ["create session", "create table", "create view", "create sequence"]
+      self.permissions = ["unlimited tablespace", "create session", "create table", "create view", "create sequence"]
 
       ##
       # :singleton-method:

data/spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb

@@ -16,11 +16,11 @@ describe "Oracle Enhanced adapter database tasks" do
         ActiveRecord::Tasks::DatabaseTasks.create(new_user_config)
       end
     end
-    xit "creates user" do
+    it "creates user" do
       query = "SELECT COUNT(*) FROM dba_users WHERE UPPER(username) = '#{new_user_config[:username].upcase}'"
       expect(ActiveRecord::Base.connection.select_value(query)).to eq(1)
     end
-    xit "grants permissions defined by OracleEnhancedAdapter.persmissions" do
+    it "grants permissions defined by OracleEnhancedAdapter.persmissions" do
       query = "SELECT COUNT(*) FROM DBA_SYS_PRIVS WHERE GRANTEE = '#{new_user_config[:username].upcase}'"
       permissions_count = ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.permissions.size
       expect(ActiveRecord::Base.connection.select_value(query)).to eq(permissions_count)

data/spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb

@@ -66,7 +66,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ALTER TABLE TEST_POSTS
         ADD CONSTRAINT fk_test_post_foo FOREIGN KEY (foo_id) REFERENCES foos(id)
       SQL
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i)
     end
@@ -86,7 +86,7 @@ describe "OracleEnhancedAdapter structure dump" do
         ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
       SQL
 
-      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump = ActiveRecord::Base.connection.structure_dump
       expect(dump.split('\n').length).to eq(1)
       expect(dump).to match(/ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i)
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -479,6 +479,45 @@ describe "OracleEnhancedAdapter" do
     end
   end
 
+  describe "Binary lob column" do
+    before(:all) do
+      schema_define do
+        create_table :test_binary_columns do |t|
+          t.binary :attachment
+        end
+      end
+      class ::TestBinaryColumn < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_binary_columns
+      end
+      Object.send(:remove_const, "TestBinaryColumn")
+      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache!
+    end
+
+    before(:each) do
+      set_logger
+    end
+
+    after(:each) do
+      clear_logger
+    end
+
+    it "should serialize with non UTF-8 data" do
+      binary_value = +"Hello \x93\xfa\x96\x7b"
+      binary_value.force_encoding "UTF-8"
+
+      binary_column_object = TestBinaryColumn.new
+      binary_column_object.attachment = binary_value
+
+      expect(binary_column_object.save!).to eq(true)
+    end
+  end
+
   describe "quoting" do
     before(:all) do
       schema_define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.5
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -137,38 +137,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/active_record/oracle_enhanced/type/dirty_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
-- spec/active_record/oracle_enhanced/type/raw_spec.rb
-- spec/active_record/oracle_enhanced/type/float_spec.rb
-- spec/active_record/oracle_enhanced/type/decimal_spec.rb
-- spec/active_record/oracle_enhanced/type/character_string_spec.rb
-- spec/active_record/oracle_enhanced/type/boolean_spec.rb
-- spec/active_record/oracle_enhanced/type/json_spec.rb
-- spec/active_record/oracle_enhanced/type/binary_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
-- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
-- spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/active_record/oracle_enhanced/type/text_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_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/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
-- spec/support/create_oracle_enhanced_users.sql
-- spec/support/alter_system_user_password.sql
-- spec/support/alter_system_set_open_cursors.sql
+- spec/active_record/oracle_enhanced/type/binary_spec.rb
+- spec/active_record/oracle_enhanced/type/boolean_spec.rb
+- spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/decimal_spec.rb
+- spec/active_record/oracle_enhanced/type/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/float_spec.rb
+- spec/active_record/oracle_enhanced/type/integer_spec.rb
+- spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
 - spec/spec_config.yaml.template
 - spec/spec_helper.rb
+- spec/support/alter_system_set_open_cursors.sql
+- spec/support/alter_system_user_password.sql
+- spec/support/create_oracle_enhanced_users.sql