activerecord-oracle_enhanced-adapter 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1b4bd554898d5bc0e1eb9d5d5ee7d234132c11
-  data.tar.gz: 96f3480896225af451693db4d8eb4554e3ad2ab9
+  metadata.gz: 124c0346c9616607a37e143f3cd4dcbd8a6413d5
+  data.tar.gz: 23188503c1dcf33c756b3f2d9eff3e858505b21b
 SHA512:
-  metadata.gz: ee52bda6c519c796a33671a46e0f15ed64e138c20212977e22cae620e1ac98d825d9091de20314fc58db1beca058671cc5eb6aa6c62e2d8f3fba47575b3c073d
-  data.tar.gz: a8851fbdf4b8fdac1faf736f7e4be8a086ec7ad84ad94764c7c635b9a0b8bab0bbcd2f1dc1a00a937e6673ec1dca5143efc617c8daddc038526ed680ff29f572
+  metadata.gz: 7f87365212531e4c7e038977482a7a879dd105711444b690881856f1a85485c2d8654d21235045b6bf455bd6199db1d90ac89d55239c1cdc0b4e39461c4198aa
+  data.tar.gz: ceaad6ba9776513ad0faaf760eb7c9fde8f0d0ff0db712f93bbe989437c183688eaecc9d453d1d91d2b59345320e395854aea07b0ab13db6e899af8aaaf70846

data/Gemfile

@@ -2,12 +2,12 @@ source 'http://rubygems.org'
 
 group :development do
   gem 'rspec', '~> 3.3'
-  gem 'rdoc'
+  gem 'rdoc', '~> 5.0.0.beta2'
   gem 'rake'
 
   gem 'activerecord',   github: 'rails/rails', branch: '5-0-stable'
   gem 'rack',           github: 'rack/rack', branch: 'master'
-  gem 'arel',           github: 'rails/arel', branch: 'master'
+  gem 'arel',           github: 'rails/arel', branch: '7-1-stable'
 
   gem 'ruby-plsql', '>=0.5.0'
 

data/History.md

@@ -1,3 +1,25 @@
+## 1.7.4 / 2016-10-14
+
+* Changes and bug fixes
+
+ * Bump Arel 7.1.4 or higher [#1010, #848, #946]
+ * NoMethodError: undefined method `write' for nil:NilClass for serialized column [#798, #1007]
+ * Quote table name in disable_referential_integrity [#1012, #1014]
+ * Rails 5 : undefined method `to_i' for #<Arel::Nodes::BindParam:0x00000002c92910> [#848, rails/arel#438, rails/arel#450]
+ * Add UPGRADE section : Upgrade Rails 4.2 or older version to Rails 5 [#1011, #993]
+ * add docker to RUNNING_TEST.md [#1006]
+ * Add executable test cases using Minitest or RSpec [#1002]
+
+* Known issues
+
+ - Only with JRuby
+ * Rails 5 : explain should explain query with binds got Java::JavaSql::SQLException: Invalid column index [#908]
+    * Workaround: execute explain without bind or use CRuby
+ - CRuby and JRuby
+ * Rails 5 : custom methods for create record when exception is raised in after_create callback fails [#944]
+ * Rails 5 : specs need update to emulate_booleans_from_strings [#942]
+ * #998 causes regression for `TIMESTAMP WITH LOCAL TIME ZONE` [#1001]
+
 ## 1.7.3 / 2016-10-03
 
 * Changes and bug fixes

data/README.md

@@ -619,6 +619,30 @@ development:
   )"
 ```
 
+UPGRADE
+---------------
+### Upgrade Rails 4.2 or older version to Rails 5
+
+If your Oracle table columns have been created for Rails `:datetime` attributes in Rails 4.2 or earlier,
+they need to migrate to `:datetime` in Rails 5 using one of two following ways:
+
+* Rails migration code example:
+```ruby
+change_column :posts, :created_at, :datetime
+change_column :posts, :updated_at, :datetime
+```
+
+or
+
+* SQL statement example
+```sql
+ALTER TABLE "POSTS" MODIFY "CREATED_AT" TIMESTAMP
+ALTER TABLE "POSTS" MODIFY "UPDATED_AT" TIMESTAMP
+```
+
+In Rails 5 without running this migration or sql statement, 
+these attributes will be handled as Rails `:date` type.
+
 TROUBLESHOOTING
 ---------------
 

data/RUNNING_TESTS.md

@@ -13,6 +13,39 @@ If you are getting ORA-12520 errors when running tests then it means that Oracle
 
 to increase process limit and then restart the database (this will be necessary if Oracle XE will be used as default processes limit is 40).
 
+### Docker
+If no Oracle database with SYS and SYSTEM user access is available, try the docker approach.
+
+Install [Docker](https://docker.github.io/engine/installation/)
+
+Pull [docker-oracle-xe-11g](https://hub.docker.com/r/wnameless/oracle-xe-11g/) image from docker hub
+
+    docker pull wnameless/oracle-xe-11g
+
+Start a Oracle database docker container with mapped ports. Use port `49161` to access the database.
+
+    docker run -d -p 49160:22 -p 49161:1521 wnameless/oracle-xe-11g
+
+Check connection to the database with `sqlplus`. The user is `system`, the password is `oracle`.
+
+    sqlplus64 system/oracle@localhost:49161
+
+The oracle enhanced configuration file `spec/spec_config.yaml` should look like:
+
+```yaml
+# copy this file to spec/config.yaml and set appropriate values
+# you can also use environment variables, see spec_helper.rb
+database:
+  name:         'xe'
+  host:         'localhost'
+  port:         49161
+  user:         'oracle_enhanced'
+  password:     'oracle_enhanced'
+  sys_password: 'oracle'
+  non_default_tablespace: 'SYSTEM'
+  timezone: 'Europe/Riga'
+```
+
 Ruby versions
 -------------
 
@@ -40,7 +73,7 @@ Running tests
 * Install necessary gems with
 
         bundle install
-        
+
 * Configure database credentials in one of two ways:
     * copy spec/spec_config.yaml.template to spec/config.yaml and modify as needed
     * set required environment variables (see DATABASE_NAME in spec_helper.rb)

data/VERSION

@@ -1 +1 @@
-1.7.3
+1.7.4

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.7.3"
+  s.version = "1.7.4"
 
   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-10-03}
+  s.date = %q{2016-10-14}
   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.
 }
@@ -88,7 +88,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "spec/spec_helper.rb"
   ]
   s.add_runtime_dependency(%q<activerecord>, ["~> 5.0.0"])
-  s.add_runtime_dependency(%q<arel>, ["~> 7.1.0"])
+  s.add_runtime_dependency(%q<arel>, ["~> 7.1.4"])
   s.add_runtime_dependency(%q<ruby-plsql>, [">= 0.5.0"])
   s.license = 'MIT'
 end

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

@@ -434,12 +434,12 @@ module ActiveRecord
           old_constraints = select_all(sql_constraints)
           begin
             old_constraints.each do |constraint|
-              execute "ALTER TABLE #{constraint["table_name"]} DISABLE CONSTRAINT #{constraint["constraint_name"]}"
+              execute "ALTER TABLE #{quote_table_name(constraint["table_name"])} DISABLE CONSTRAINT #{quote_table_name(constraint["constraint_name"])}"
             end
             yield
           ensure
             old_constraints.each do |constraint|
-              execute "ALTER TABLE #{constraint["table_name"]} ENABLE CONSTRAINT #{constraint["constraint_name"]}"
+              execute "ALTER TABLE #{quote_table_name(constraint["table_name"])} ENABLE CONSTRAINT #{quote_table_name(constraint["constraint_name"])}"
             end
           end
         end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -700,7 +700,7 @@ 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.nil?  || (value == '')
+          next if value.blank?
           if klass.attribute_types[col.name].is_a? ActiveRecord::Type::Serialized
             value = klass.attribute_types[col.name].serialize(value)
           end
@@ -960,8 +960,8 @@ module ActiveRecord
         @@do_not_prefetch_primary_key[table_name] = nil
 
         table_cols = <<-SQL.strip.gsub(/\s+/, ' ')
-          SELECT cols.column_name AS name, cols.data_type AS sql_type, 
-                 cols.data_default, cols.nullable, cols.virtual_column, cols.hidden_column, 
+          SELECT cols.column_name AS name, cols.data_type AS sql_type,
+                 cols.data_default, cols.nullable, cols.virtual_column, cols.hidden_column,
                  cols.data_type_owner AS sql_type_owner,
                  DECODE(cols.data_type, 'NUMBER', data_precision,
                                    'FLOAT', data_precision,

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -30,7 +30,7 @@ describe "OracleEnhancedAdapter establish connection" do
     ActiveRecord::Base.connection.reconnect!
     expect(ActiveRecord::Base.connection).to be_active
   end
-  
+
 end
 
 describe "OracleEnhancedAdapter" do
@@ -40,7 +40,7 @@ describe "OracleEnhancedAdapter" do
   before(:all) do
     ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
   end
-  
+
   describe "ignore specified table columns" do
     before(:all) do
       @conn = ActiveRecord::Base.connection
@@ -377,19 +377,19 @@ describe "OracleEnhancedAdapter" do
       expect(@adapter.valid_table_name?("aBc")).to be_falsey
       expect(@adapter.valid_table_name?("abC")).to be_falsey
     end
-    
+
     it "should not be valid for names > 30 characters" do
       expect(@adapter.valid_table_name?("a" * 31)).to be_falsey
     end
-    
+
     it "should not be valid for schema names > 30 characters" do
       expect(@adapter.valid_table_name?(("a" * 31) + ".validname")).to be_falsey
     end
-    
+
     it "should not be valid for database links > 128 characters" do
       expect(@adapter.valid_table_name?("name@" + "a" * 129)).to be_falsey
     end
-    
+
     it "should not be valid for names that do not begin with alphabetic characters" do
       expect(@adapter.valid_table_name?("1abc")).to be_falsey
       expect(@adapter.valid_table_name?("_abc")).to be_falsey
@@ -457,7 +457,7 @@ describe "OracleEnhancedAdapter" do
 
       cc = CamelCase.create!(:name => "Foo", :foo => 2)
       expect(cc.id).not_to be_nil
-    
+
       expect(@conn.tables).to include("CamelCase")
     end
 
@@ -719,8 +719,6 @@ describe "OracleEnhancedAdapter" do
       @employee.create!(sort_order: i+=1, first_name: 'Steven',  last_name: 'Rogers')
       @employee.create!(sort_order: i+=1, first_name: 'Bruce',   last_name: 'Banner')
       @employee.create!(sort_order: i+=1, first_name: 'Natasha', last_name: 'Romanova')
-      @oracle11g_or_lower  = !! @conn.select_value(
-        "select * from product_component_version where product like 'Oracle%' and to_number(substr(version,1,2)) <= 11")
     end
 
     after(:all) do
@@ -742,7 +740,6 @@ describe "OracleEnhancedAdapter" do
     end
 
     it "should return the records starting from offset n with offset(n)" do
-      skip "Skipped until #848 or rails/arel#438 resolved " if @oracle11g_or_lower
       expect(@employee.order(:sort_order).first.first_name).to eq("Peter")
       expect(@employee.order(:sort_order).offset(0).first.first_name).to eq("Peter")
       expect(@employee.order(:sort_order).offset(1).first.first_name).to eq("Tony")
@@ -773,4 +770,50 @@ describe "OracleEnhancedAdapter" do
       expect(@conn.valid_type?(:foobar)).to be false
     end
   end
+
+  describe 'serialized column' do
+    before(:all) do
+      schema_define do
+        create_table :test_serialized_columns do |t|
+          t.text :serialized
+        end
+      end
+      class ::TestSerializedColumn < ActiveRecord::Base
+        serialize :serialized, Array
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_serialized_columns
+      end
+      Object.send(:remove_const, 'TestSerializedColumn')
+      ActiveRecord::Base.table_name_prefix = nil
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    end
+
+    before(:each) do
+      set_logger
+    end
+
+    after(:each) do
+      clear_logger
+    end
+
+    it 'should serialize' do
+      new_value = 'new_value'
+      serialized_column = TestSerializedColumn.new
+
+      expect(serialized_column.serialized).to eq([])
+      serialized_column.serialized << new_value
+      expect(serialized_column.serialized).to eq([new_value])
+      serialized_column.save
+      expect(serialized_column.save!).to eq(true)
+
+      serialized_column.reload
+      expect(serialized_column.serialized).to eq([new_value])
+      serialized_column.serialized = []
+      expect(serialized_column.save!).to eq(true)
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -917,11 +917,16 @@ end
           t.string :body, :limit => 4000
           t.references :test_post, :foreign_key => true
         end
+        create_table "test_Mixed_Comments", :force => true do |t|
+          t.string :body, :limit => 4000
+          t.references :test_post, :foreign_key => true
+        end
       end
     end
 
     after(:each) do
       schema_define do
+        drop_table "test_Mixed_Comments" rescue nil
         drop_table :test_comments rescue nil
         drop_table :test_posts rescue nil
       end
@@ -933,6 +938,7 @@ end
       end.to raise_error(ActiveRecord::InvalidForeignKey)
       @conn.disable_referential_integrity do
         expect do
+          @conn.execute "INSERT INTO \"test_Mixed_Comments\" (id, body, test_post_id) VALUES (2, 'test', 2)"
           @conn.execute "INSERT INTO test_comments (id, body, test_post_id) VALUES (2, 'test', 2)"
           @conn.execute "INSERT INTO test_posts (id, title) VALUES (2, 'test')"
         end.not_to raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord