storey 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077fb1249a3bf984d1613b1351468cebf881bde2ac2e4f299d3b9d17a877d0e5
-  data.tar.gz: 38f7315acb1dcb9c3545a64dca60e67105d6b8520cd276ae1dec8997b4028ec7
+  metadata.gz: fe9182b67b4f2738c91562f6366b59c15f7c5db272cdc32fd837ec1159cc753a
+  data.tar.gz: b61703b7b12878c85a3a9fbcf1cd0af5208c612f153ce8f25e8e7fe70aef6053
 SHA512:
-  metadata.gz: 3d5cc746a06923f49fe9226c8183aaf9a68293a6639a24108fc3b161ab15bf78342bf7124ffa1ac9ded5f4055b75d01be1f815cb67cae65013b6ce12d41b32e6
-  data.tar.gz: 1418cbe848c0e891c5e7c70f05ac5384b79946b9cc878b1e92e918032fbfa36cef8a5209fe89c0a3dcbcea19262cd0a4aea9fcec9e5a3d60d156e2ba36401784
+  metadata.gz: 75fc2bdc24f43a52a7376fcd4db66484c0e53d01f06f6a65002d3a3eaa2f997867153d572dc1d032e2992979a76ba6d3d14e1234e8f3ec8fa65eeed040dd834a
+  data.tar.gz: 67d233bff3fdb58629cc15d5cc244182514e5810a23a5c5607a1b230714eb759425b113bbce776fe1eaaff5f0dd6c3b9fdcdc41d34d91524f945497324d494a3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.2] - 2018-08-14
+### Fixed
+- Instances when queries are cached between switches
+
 ## [2.1.1] - 2018-07-04
 ### Fixed
 - Fix copying of schemas in when ActiveRecord caches queries

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.1)
+    storey (2.1.2)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg
@@ -153,4 +153,4 @@ DEPENDENCIES
   storey!
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.1)
+    storey (2.1.2)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg
@@ -152,4 +152,4 @@ DEPENDENCIES
   storey!
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.1)
+    storey (2.1.2)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg
@@ -160,4 +160,4 @@ DEPENDENCIES
   storey!
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/lib/storey.rb

@@ -150,6 +150,7 @@ module Storey
       switch original_schema
       result
     else
+      ::ActiveRecord::Base.connection.query_cache.clear
       reset and return if name.blank? || name == 'public'
       path = self.schema_search_path_for(name)
 

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/lib/storey_spec.rb

@@ -25,6 +25,18 @@ RSpec.describe Storey do
 
       Storey.switch("s1") { expect(Post.count).to eq 2 }
       Storey.switch("s2") { expect(Post.count).to eq 3 }
+
+      Storey.switch("s1")
+      expect(Post.count).to eq 2
+
+      Storey.switch("s2")
+      expect(Post.count).to eq 3
+
+      Storey.create "foobar"
+      Storey.switch "foobar"
+      Storey.switch { Post.create }
+      expect(Post.count).to be_zero
+      Storey.switch { expect(Post.count).to eq 1 }
     end
   end
 

data/spec/spec_helper.rb

@@ -14,12 +14,6 @@ require 'pry'
 RSpec.configure do |config|
   config.order = 'random'
 
-  config.before(:suite) do
-    # Enable query cache so we can catch unexpected behaviour with AR
-    # caching
-    ActiveRecord::Base.connection.enable_query_cache!
-  end
-
   config.before(:each) do
     # We don't want configuration to leak into other tests
     Storey.reload_config!
@@ -54,6 +48,10 @@ RSpec.configure do |config|
     ENV['STEP'] = ENV['VERSION'] = nil
     Rails.application.config.active_record.schema_format = :ruby
     Storey::Migrator.migrate_all
+
+    # Enable query cache so we can catch unexpected behaviour with AR
+    # caching
+    ActiveRecord::Base.connection.enable_query_cache!
   end
 end
 

data/spec/storey/switch_spec.rb

@@ -82,8 +82,8 @@ describe Storey, "#switch" do
       it "should execute the block in the default schema" do
         Storey.switch "foobar"
         Storey.switch { Post.create }
-        Post.count.should be_zero
-        Storey.switch { Post.count.should == 1 }
+        expect(Post.count).to be_zero
+        Storey.switch { expect(Post.count).to eq 1 }
       end
 
       it "should return to the schema that the app was previously in" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails