activerecord-oracle_enhanced-adapter 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73094ef54aa9a2de8339c36bcc8ac13f4c57eb65
-  data.tar.gz: b7b35ded1d9bbfe4381828c13fdcf3c64403f894
+  metadata.gz: 8d1b4bd554898d5bc0e1eb9d5d5ee7d234132c11
+  data.tar.gz: 96f3480896225af451693db4d8eb4554e3ad2ab9
 SHA512:
-  metadata.gz: 662edf53de71588e9bbd306de4d9a8e9ee69cecf6cee88db77d138213fc5e359198bb2828b9e383041e1b394c6d94cb678e95779c8b90701bad179ced9e65259
-  data.tar.gz: ed56d147a8dc254a47be094c803748673e249e4f187b9b01a37ab8ded2171366cb20ea3dae6018083a6a4e33766f7d41d4eca5432a2eb2270b1b4bde8143126d
+  metadata.gz: ee52bda6c519c796a33671a46e0f15ed64e138c20212977e22cae620e1ac98d825d9091de20314fc58db1beca058671cc5eb6aa6c62e2d8f3fba47575b3c073d
+  data.tar.gz: a8851fbdf4b8fdac1faf736f7e4be8a086ec7ad84ad94764c7c635b9a0b8bab0bbcd2f1dc1a00a937e6673ec1dca5143efc617c8daddc038526ed680ff29f572

data/History.md

@@ -1,3 +1,11 @@
+## 1.7.3 / 2016-10-03
+
+* Changes and bug fixes
+ * Respect `ActiveRecord::Base.default_timezone = :utc` rather than connection `time_zone` value [#755, #998]
+
+* Known issues
+ * No changes since 1.7.0.rc1
+
 ## 1.7.2 / 2016-09-19
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.3

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.2"
+  s.version = "1.7.3"
 
   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-09-19}
+  s.date = %q{2016-10-03}
   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/oci_connection.rb

@@ -350,7 +350,11 @@ module ActiveRecord
         conn.non_blocking = true if async
         conn.prefetch_rows = prefetch_rows
         conn.exec "alter session set cursor_sharing = #{cursor_sharing}" rescue nil
-        conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
+        if ActiveRecord::Base.default_timezone == :local
+          conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
+        elsif ActiveRecord::Base.default_timezone == :utc
+          conn.exec "alter session set time_zone = '+00:00'"
+        end
         conn.exec "alter session set current_schema = #{schema}" unless schema.blank?
 
         # Initialize NLS parameters

data/spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb

@@ -110,6 +110,33 @@ describe "OracleEnhancedConnection" do
     end
   end
 
+  describe "default_timezone" do
+    before(:all) do
+      ActiveRecord::Base.establish_connection(CONNECTION_WITH_TIMEZONE_PARAMS)
+      ActiveRecord::Schema.define do
+        create_table :posts, :force => true do |t|
+          t.timestamps null: false
+        end
+      end
+      class ::Post < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, "Post")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should respect default_timezone = :utc than time_zone setting" do
+      # it expects that ActiveRecord::Base.default_timezone = :utc
+      ActiveRecord::ConnectionAdapters::OracleEnhancedConnection.create(CONNECTION_WITH_TIMEZONE_PARAMS)
+      post = Post.create!
+      created_at = post.created_at
+      expect(post).to eq(Post.find_by!(created_at: created_at))
+    end
+
+  end
+
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     describe "create JDBC connection" do

data/spec/spec_helper.rb

@@ -143,6 +143,16 @@ CONNECTION_WITH_SCHEMA_PARAMS = {
   :schema => DATABASE_SCHEMA
 }
 
+CONNECTION_WITH_TIMEZONE_PARAMS = {
+  :adapter => "oracle_enhanced",
+  :database => DATABASE_NAME,
+  :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
+  :username => DATABASE_USER,
+  :password => DATABASE_PASSWORD,
+  :time_zone => "Europe/Riga"
+}
+
 SYS_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord