activerecord_views 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c0f7297c9900d6d2ce6e803a35eca6a8015c84
-  data.tar.gz: 5a5874b77eec4404e21b2a2ac07bc9a78e2ff0cd
+  metadata.gz: 373526856a79d7a2d2c97de39373d0a9a791e70c
+  data.tar.gz: 942cecdc3e31f8417166778362f19567ce16774f
 SHA512:
-  metadata.gz: f58e18bb2e9ae78e98b127074038856bf4a94273d482022d5ab38fc5f7bac2be9e1deb0f989ba32c9040019008c1dcf49247ef7a4c5de56ae5b2b2283d9df584
-  data.tar.gz: 8d38a7027e201afa5f6884792b4da2e2957400d2b0908525d838c29cf03d019c0f02646f97fed8e0b88b94cd3420b617881ee1c5b187c1cdbea399198b45ca8e
+  metadata.gz: 18d20a0204d37764802b32ef58fd532f8c39cd6ad82b786eb55c4b2d3bd298fa67a84afac9bedb3cb6ca58fd45e280bac0d3852f11d3f92f53625a5f4f4fe653
+  data.tar.gz: 68d3db12c7ea7c8cdaafb1391efab4a9f5a59ad579069ca8246ed47abf1c028b48ffa41b16a2eadfbfacfbe7194e10a9cc9222f5c01def2576c39830e708e69f

data/README.markdown

@@ -102,10 +102,10 @@ end
 
 Note: If your view has a single column as the unique key, you can also tell ActiveRecord about it by adding `self.primary_key = :account_id` in your model file. This is required for features such as `.find` and `.find_each` to work.
 
-Once you have defined the unique columns for the view, you can then use `concurrent: true` when refreshing:
+Once you have defined the unique columns for the view, you can then use `concurrent: true` to force a concurrent refresh or `concurrent: :auto` to concurrently refresh when possible:
 
 ```ruby
-AccountBalance.refresh_view! concurrent: true
+AccountBalance.refresh_view! concurrent: :auto
 ```
 
 ## Pre-populating views in Rails development mode

data/lib/active_record_views/extension.rb

@@ -36,7 +36,19 @@ module ActiveRecordViews
 
       def refresh_view!(options = {})
         options.assert_valid_keys :concurrent
-        connection.execute "REFRESH MATERIALIZED VIEW#{' CONCURRENTLY' if options[:concurrent]} #{connection.quote_table_name self.table_name};"
+
+        concurrent = case options[:concurrent]
+        when nil, false
+          false
+        when true
+          true
+        when :auto
+          view_populated? && ActiveRecordViews.supports_concurrent_refresh?(connection)
+        else
+          raise ArgumentError, 'invalid concurrent option'
+        end
+
+        connection.execute "REFRESH MATERIALIZED VIEW#{' CONCURRENTLY' if concurrent} #{connection.quote_table_name self.table_name};"
       end
 
       def view_populated?

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/active_record_views.rb

@@ -185,9 +185,13 @@ module ActiveRecordViews
     end
 
     dependencies = get_view_dependencies(connection, name)
+    cache = ActiveRecordViews::ChecksumCache.new(connection)
+    dependency_metadata = {}
 
     dependencies.reverse.each do |dependency_name, _, _, _|
       execute_drop_view connection, dependency_name
+      dependency_metadata[dependency_name] = cache.get(dependency_name)
+      cache.set dependency_name, nil
     end
 
     yield
@@ -199,6 +203,7 @@ module ActiveRecordViews
         raise unless e.missing_name?(class_name)
         options = JSON.load(options_json).symbolize_keys
         execute_create_view connection, dependency_name, definition, options
+        cache.set dependency_name, dependency_metadata[dependency_name]
       end
     end
   end

data/spec/active_record_views_extension_spec.rb

@@ -97,6 +97,14 @@ describe ActiveRecordViews::Extension do
       expect(ModifiedB.first.attributes.except(nil)).to eq('new_name' => 22)
     end
 
+    it 'successfully restores dependant view when temporarily dropping dependency' do
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_as', 'DependencyA', 'SELECT 42 AS foo, 1 AS id;'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'dependency_bs', 'DependencyB', 'SELECT * FROM dependency_as;'
+
+      expect(DependencyA.first.id).to eq 2
+      expect(DependencyB.first.id).to eq 2
+    end
+
     it 'errors if more than one argument is specified' do
       expect {
         class TooManyArguments < ActiveRecord::Base
@@ -166,5 +174,27 @@ describe ActiveRecordViews::Extension do
       MaterializedViewRefreshTestModel.refresh_view!
       MaterializedViewConcurrentRefreshTestModel.refresh_view! concurrent: true
     end
+
+    it 'supports opportunistically refreshing materialized views concurrently' do
+      class MaterializedViewAutoRefreshTestModel < ActiveRecord::Base
+        is_view 'SELECT 1 AS id;', materialized: true, unique_columns: [:id]
+      end
+
+      expect(ActiveRecord::Base.connection).to receive(:execute).with('REFRESH MATERIALIZED VIEW "materialized_view_auto_refresh_test_models";').once.and_call_original
+      expect(ActiveRecord::Base.connection).to receive(:execute).with('REFRESH MATERIALIZED VIEW CONCURRENTLY "materialized_view_auto_refresh_test_models";').once.and_call_original
+
+      MaterializedViewAutoRefreshTestModel.refresh_view! concurrent: :auto
+      MaterializedViewAutoRefreshTestModel.refresh_view! concurrent: :auto
+    end
+
+    it 'raises an error when refreshing materialized views with invalid concurrent option' do
+      class MaterializedViewInvalidRefreshTestModel < ActiveRecord::Base
+        is_view 'SELECT 1 AS id;', materialized: true, unique_columns: [:id]
+      end
+
+      expect {
+        MaterializedViewAutoRefreshTestModel.refresh_view! concurrent: :blah
+      }.to raise_error ArgumentError, 'invalid concurrent option'
+    end
   end
 end

data/spec/internal/app/models/dependency_a.rb

@@ -0,0 +1,3 @@
+class DependencyA < ActiveRecord::Base
+  is_view 'SELECT 2 AS id;'
+end

data/spec/internal/app/models/dependency_b.rb

@@ -0,0 +1,3 @@
+class DependencyB < ActiveRecord::Base
+  is_view 'SELECT * FROM dependency_as;'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jason Weathered
@@ -115,6 +115,8 @@ files:
 - spec/active_record_views_checksum_cache_spec.rb
 - spec/active_record_views_extension_spec.rb
 - spec/active_record_views_spec.rb
+- spec/internal/app/models/dependency_a.rb
+- spec/internal/app/models/dependency_b.rb
 - spec/internal/app/models/erb_test_model.rb
 - spec/internal/app/models/erb_test_model.sql.erb
 - spec/internal/app/models/external_file_test_model.rb
@@ -156,6 +158,8 @@ test_files:
 - spec/active_record_views_checksum_cache_spec.rb
 - spec/active_record_views_extension_spec.rb
 - spec/active_record_views_spec.rb
+- spec/internal/app/models/dependency_a.rb
+- spec/internal/app/models/dependency_b.rb
 - spec/internal/app/models/erb_test_model.rb
 - spec/internal/app/models/erb_test_model.sql.erb
 - spec/internal/app/models/external_file_test_model.rb