activerecord-oracle_enhanced-adapter 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124c0346c9616607a37e143f3cd4dcbd8a6413d5
-  data.tar.gz: 23188503c1dcf33c756b3f2d9eff3e858505b21b
+  metadata.gz: dbee32f7aef3920b9639b3f19172e4aeae188b8a
+  data.tar.gz: d5d3f5ae44a57a8e41d967a580c4d9374bee1502
 SHA512:
-  metadata.gz: 7f87365212531e4c7e038977482a7a879dd105711444b690881856f1a85485c2d8654d21235045b6bf455bd6199db1d90ac89d55239c1cdc0b4e39461c4198aa
-  data.tar.gz: ceaad6ba9776513ad0faaf760eb7c9fde8f0d0ff0db712f93bbe989437c183688eaecc9d453d1d91d2b59345320e395854aea07b0ab13db6e899af8aaaf70846
+  metadata.gz: bf3c243fccd4ec5457803b12ab1e9466c5fbc2f60733ad8ed909ba4159071bb5c0bae6b74b9cd0b961a3f719ab14cdab73cca1a581338247cd30fb6ced3c187f
+  data.tar.gz: 08b07678d01763e02d12ebef563c0579afe4e9691a2ce49f7bcdf78be09b43e9b3945ee229cb4759e4efffd19c188f7ac411f0c51a70794cb583693b4022a625

data/History.md

@@ -1,3 +1,23 @@
+## 1.7.5 / 2016-11-06
+
+* Changes and bug fixes
+
+ * Multi insert is not supported [#1016]
+ * Use `default_timezone = :local` to handle `TIMESTAMP WITH LOCAL TIME ZONE` [#1001, #1019]
+ * Address Rails 5 : custom methods for create record when exception is raised in `after_create` callback fails [#944, #1023]
+ * Using the gem in non-rails apps [#1026]
+ * Support connection strings in `DATABASE_URL1 [#1032, #1035]
+ * Rebuild primary key index to `default_tablespaces[:index]` [#1028]
+ * Address `Java::JavaSql::SQLException: Missing IN or OUT parameter at index:: 3:` [#1030, #1033]
+
+* 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 : specs need update to emulate_booleans_from_strings [#942]
+
 ## 1.7.4 / 2016-10-14
 
 * Changes and bug fixes

data/README.md

@@ -200,6 +200,12 @@ environment variable, note that the adapter name uses a dash instead of an under
 DATABASE_URL=oracle-enhanced://localhost/XE
 ```
 
+You can also specify a connection string via the `DATABASE_URL`, as long as it doesn't have any whitespace:
+
+```bash
+DATABASE_URL=oracle-enhanced://user:secret@connection-string/(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=xe)))
+```
+
 If you deploy JRuby on Rails application in Java application server that supports JNDI connections then you can specify JNDI connection as well:
 
 ```yml

data/RUNNING_TESTS.md

@@ -75,7 +75,7 @@ Running tests
         bundle install
 
 * Configure database credentials in one of two ways:
-    * copy spec/spec_config.yaml.template to spec/config.yaml and modify as needed
+    * copy spec/spec_config.yaml.template to spec/spec_config.yaml and modify as needed
     * set required environment variables (see DATABASE_NAME in spec_helper.rb)
 
 * Run tests with

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.7.5

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.4"
+  s.version = "1.7.5"
 
   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-14}
+  s.date = %q{2016-11-06}
   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.
 }

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

@@ -109,8 +109,9 @@ module ActiveRecord
           host, port = config[:host], config[:port]
           privilege = config[:privilege] && config[:privilege].to_s
 
-          # connection using TNS alias
-          if database && !host && !config[:url] && ENV['TNS_ADMIN']
+          # connection using TNS alias, or connection-string from DATABASE_URL
+          using_tns_alias = !host && !config[:url] && ENV['TNS_ADMIN']
+          if database && (using_tns_alias || host == 'connection-string')
             url = "jdbc:oracle:thin:@#{database}"
           else
             unless database.match(/^(\:|\/)/)

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

@@ -332,8 +332,11 @@ module ActiveRecord
         # get session time_zone from configuration or from TZ environment variable
         time_zone = config[:time_zone] || ENV['TZ']
 
+        # using a connection string via DATABASE_URL
+        connection_string = if host == 'connection-string'
+          database
         # connection using host, port and database name
-        connection_string = if host || port
+        elsif host || port
           host ||= 'localhost'
           host = "[#{host}]" if host =~ /^[^\[].*:/  # IPv6
           port ||= 1521
@@ -344,7 +347,6 @@ module ActiveRecord
         else
           database
         end
-
         conn = OCI8.new username, password, connection_string, privilege
         conn.autocommit = true
         conn.non_blocking = true if async

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

@@ -85,6 +85,7 @@ module ActiveRecord
           end
           td.indexes.each { |c,o| add_index table_name, c, o }
 
+          rebuild_primary_key_index_to_default_tablespace(table_name, options)
         end
 
         def create_table_definition(*args)
@@ -504,6 +505,22 @@ module ActiveRecord
           "#{table_name.to_s[0,table_name_length-4]}_pkt"
         end
 
+        def rebuild_primary_key_index_to_default_tablespace(table_name, options)
+          tablespace = default_tablespace_for(:index)
+
+          return unless tablespace
+
+          index_name = Base.connection.select_value(
+            "SELECT index_name FROM all_constraints
+                WHERE table_name = #{quote(table_name.upcase)}
+                AND constraint_type = 'P'
+                AND owner = SYS_CONTEXT('userenv', 'current_schema')")
+
+          return unless index_name
+
+          execute("ALTER INDEX #{quote_column_name(index_name)} REBUILD TABLESPACE #{tablespace}")
+        end
+
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -483,6 +483,10 @@ module ActiveRecord
         true
       end
 
+      def supports_multi_insert?
+        false
+      end
+
       #:stopdoc:
       DEFAULT_NLS_PARAMETERS = {
         :nls_calendar            => nil,
@@ -1161,11 +1165,17 @@ module ActiveRecord
         offset: nil
       ) # :nodoc:
         result = from_clause + join_clause + where_clause + having_clause
-        if offset
+        if RUBY_ENGINE == 'jruby' && !supports_fetch_first_n_rows_and_offset? && offset && limit
           result << offset
-        end
-        if limit
           result << limit
+          result << offset
+        else
+          if offset
+            result << offset
+          end
+          if limit
+            result << limit
+          end
         end
         result
       end

data/lib/activerecord-oracle_enhanced-adapter.rb

@@ -1,20 +1,22 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class OracleEnhancedRailtie < ::Rails::Railtie
-      rake_tasks do
-        load 'active_record/connection_adapters/oracle_enhanced/database_tasks.rb'
-      end
+if defined?(Rails)
+  module ActiveRecord
+    module ConnectionAdapters
+      class OracleEnhancedRailtie < ::Rails::Railtie
+        rake_tasks do
+          load 'active_record/connection_adapters/oracle_enhanced/database_tasks.rb'
+        end
 
-      ActiveSupport.on_load(:active_record) do
-        require 'active_record/connection_adapters/oracle_enhanced_adapter'
+        ActiveSupport.on_load(:active_record) do
+          require 'active_record/connection_adapters/oracle_enhanced_adapter'
+
+          # Cache column descriptions between requests in test and production environments
+          if Rails.env.test? || Rails.env.production?
+            ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
+          end
 
-        # Cache column descriptions between requests in test and production environments
-        if Rails.env.test? || Rails.env.production?
-          ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.cache_columns = true
         end
 
       end
-
     end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -137,6 +137,23 @@ describe "OracleEnhancedConnection" do
 
   end
 
+  describe 'with host="connection-string"' do
+    let(:username) { CONNECTION_PARAMS[:username] }
+    let(:password) { CONNECTION_PARAMS[:password] }
+    let(:connection_string) { "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=#{DATABASE_HOST})(PORT=#{DATABASE_PORT})))(CONNECT_DATA=(SERVICE_NAME=#{DATABASE_NAME})))" }
+    let(:params) { { username: username, password: password, host: 'connection-string', database: connection_string } }
+
+    it 'uses the database param as the connection string' do
+      if ORACLE_ENHANCED_CONNECTION == :jdbc
+        expect(java.sql.DriverManager).to receive(:getConnection).with("jdbc:oracle:thin:@#{connection_string}", anything).and_call_original
+      else
+        expect(OCI8).to receive(:new).with(username, password, connection_string, nil).and_call_original
+      end
+      conn = ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(params)
+      expect(conn).to be_active
+    end
+  end
+
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     describe "create JDBC connection" do

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -475,7 +475,8 @@ end
 
 describe "OracleEnhancedAdapter timestamp with timezone support" do
   before(:all) do
-    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.default_timezone = :local
+    ActiveRecord::Base.establish_connection(CONNECTION_WITH_TIMEZONE_PARAMS)
     @conn = ActiveRecord::Base.connection
     @conn.execute <<-SQL
       CREATE TABLE test_employees (
@@ -504,6 +505,7 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
   after(:all) do
     @conn.execute "DROP TABLE test_employees"
     @conn.execute "DROP SEQUENCE test_employees_seq"
+    ActiveRecord::Base.default_timezone = :utc
   end
 
   it "should set TIMESTAMP columns type as datetime" do
@@ -518,13 +520,11 @@ describe "OracleEnhancedAdapter timestamp with timezone support" do
       class ::TestEmployee < ActiveRecord::Base
         self.primary_key = "employee_id"
       end
-      ActiveRecord::Base.default_timezone = :local
     end
 
     after(:all) do
       Object.send(:remove_const, "TestEmployee")
       ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
-      ActiveRecord::Base.default_timezone = :utc
     end
 
     it "should return Time value from TIMESTAMP columns" do

data/spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb

@@ -186,7 +186,7 @@ describe "OracleEnhancedAdapter custom methods for create, update and destroy" d
     expect {
       @employee.save
     }.to raise_error("Make the transaction rollback")
-    expect(@employee.id).to eq(nil)
+    expect(@employee.new_record?).to be_truthy
     expect(TestEmployee.count).to eq(employees_count)
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -804,6 +804,53 @@ end
     end
   end
 
+  describe "primary key in table definition" do
+    before do
+      @conn = ActiveRecord::Base.connection
+
+      class ::TestPost < ActiveRecord::Base
+      end
+    end
+
+    it 'should use default tablespace for primary key' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = nil
+      schema_define do
+        create_table :test_posts, :force => true
+      end
+
+      index_name = @conn.select_value(
+        "SELECT index_name FROM all_constraints
+            WHERE table_name = 'TEST_POSTS'
+            AND constraint_type = 'P'
+            AND owner = SYS_CONTEXT('userenv', 'current_schema')")
+
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_indexes WHERE index_name = '#{index_name}'")).to eq('USERS')
+    end
+
+    it 'should use non default tablespace for primary key' do
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = DATABASE_NON_DEFAULT_TABLESPACE
+      schema_define do
+        create_table :test_posts, :force => true
+      end
+
+      index_name = @conn.select_value(
+        "SELECT index_name FROM all_constraints
+            WHERE table_name = 'TEST_POSTS'
+            AND constraint_type = 'P'
+            AND owner = SYS_CONTEXT('userenv', 'current_schema')")
+
+      expect(TestPost.connection.select_value("SELECT tablespace_name FROM user_indexes WHERE index_name = '#{index_name}'")).to eq(DATABASE_NON_DEFAULT_TABLESPACE)
+    end
+
+    after do
+      Object.send(:remove_const, "TestPost")
+      schema_define do
+        drop_table :test_posts rescue nil
+      end
+      ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.default_tablespaces[:index] = nil
+    end
+  end
+
   describe "foreign key in table definition" do
     before(:each) do
       schema_define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord