storey 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d868102f5a1ce14a7d937639ab4cda6b59ed9d10be52bee5ce219d46cadddfc
-  data.tar.gz: b6d1ae7e3276463d5fed292024f5d2ea19be909d5fa9075bc4e731a5d1127fda
+  metadata.gz: 077fb1249a3bf984d1613b1351468cebf881bde2ac2e4f299d3b9d17a877d0e5
+  data.tar.gz: 38f7315acb1dcb9c3545a64dca60e67105d6b8520cd276ae1dec8997b4028ec7
 SHA512:
-  metadata.gz: 9838fa46e3d3c84c17e2994587759db404ca47e6bbb1dc666bf76cc9c79348d6fad7dc677cfd5967af376d385e4eb3532eed4f2eb7d50a078788dcc3eb87a82b
-  data.tar.gz: 8d45a6ad1b0cac2f3a3b708b070684b7ff3134b8b41a7e38fbc8b4c135f27f91ab45bb363d48dfc4cc9b5723e9b18574f794ce7c6ed546dde20279bc81f5d4a7
+  metadata.gz: 3d5cc746a06923f49fe9226c8183aaf9a68293a6639a24108fc3b161ab15bf78342bf7124ffa1ac9ded5f4055b75d01be1f815cb67cae65013b6ce12d41b32e6
+  data.tar.gz: 1418cbe848c0e891c5e7c70f05ac5384b79946b9cc878b1e92e918032fbfa36cef8a5209fe89c0a3dcbcea19262cd0a4aea9fcec9e5a3d60d156e2ba36401784

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.1] - 2018-07-04
+### Fixed
+- Fix copying of schemas in when ActiveRecord caches queries
+
 ## [2.1.0] - 2018-07-04
 ### Added
 - Print duplication stdout for debugging

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.0)
+    storey (2.1.1)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.0)
+    storey (2.1.1)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    storey (2.1.0)
+    storey (2.1.1)
       easy_class_to_instance_method (~> 0.0.2)
       gem_config
       pg

data/lib/storey/duplicator.rb

@@ -96,20 +96,18 @@ module Storey
     def copy_source_schema_migrations
       ::Storey.switch @target_schema do
         source_schema_migrations.each do |version|
-          unless target_schema_migrations.include?(version)
-            command = "INSERT INTO schema_migrations (version) VALUES ('#{version}');"
-            ::ActiveRecord::Base.connection.execute command
-          end
+          ActiveRecord::SchemaMigration.where(version: version).
+            first_or_create!
         end
       end
     end
 
     def source_schema_migrations
-      GetMigrationVersions.(@source_schema)
+      @source_schema_migrations ||= GetMigrationVersions.(@source_schema)
     end
 
     def target_schema_migrations
-      GetMigrationVersions.(@target_schema)
+      @target_schema_migrations ||= GetMigrationVersions.(@target_schema)
     end
 
     def replace_occurrences

data/lib/storey/get_migration_versions.rb

@@ -9,11 +9,13 @@ module Storey
     private
 
     def self.migration_versions
-      if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.2")
-        ::ActiveRecord::Migrator.get_all_versions
-      else
-        ::ActiveRecord::Base.connection.migration_context.
-          get_all_versions
+      ActiveRecord::Base.connection.uncached do
+        if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.2")
+          ::ActiveRecord::Migrator.get_all_versions
+        else
+          ::ActiveRecord::Base.connection.migration_context.
+            get_all_versions
+        end
       end
     end
 

data/lib/storey/version.rb

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

data/spec/lib/storey_spec.rb

@@ -13,4 +13,19 @@ RSpec.describe Storey do
     end
   end
 
+  describe ".switch" do
+    it "does not cache between switches" do
+      Storey.create("s1") do
+        2.times {|n| Post.create(name: n.to_s) }
+      end
+
+      Storey.create("s2") do
+        3.times {|n| Post.create(name: n.to_s) }
+      end
+
+      Storey.switch("s1") { expect(Post.count).to eq 2 }
+      Storey.switch("s2") { expect(Post.count).to eq 3 }
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -14,6 +14,12 @@ 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!

data/spec/storey/duplicator_spec.rb

@@ -27,6 +27,20 @@ describe Storey::Duplicator do
       expect(Dir[source_dump_dir]).to be_empty
       expect(Dir[target_dump_dir]).to be_empty
     end
+
+    it "does not used cached schema migration versions when copying" do
+      s1_versions_count = nil
+      Storey.create("s1") do
+        s1_versions_count = ActiveRecord::SchemaMigration.count
+      end
+
+      duplicator = described_class.new('s1', 's2')
+      duplicator.perform!
+
+      Storey.switch("s2") do
+        expect(ActiveRecord::SchemaMigration.count).to eq s1_versions_count
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ramon Tayag