activerecord_views 0.0.17 → 0.1.1

data/spec/active_record_views_spec.rb

@@ -20,6 +20,28 @@ describe ActiveRecordViews do
       SQL
     end
 
+    def test_view_populated?
+      value = connection.select_value(<<~SQL)
+        SELECT ispopulated
+        FROM pg_matviews
+        WHERE schemaname = 'public' AND matviewname = 'test'
+      SQL
+
+      if Rails::VERSION::MAJOR < 5
+        value = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+      end
+
+      value
+    end
+
+    def test_view_refreshed_at
+      connection.select_value(<<~SQL)
+        SELECT refreshed_at
+        FROM active_record_views
+        WHERE name = 'test'
+      SQL
+    end
+
     def test_materialized_view_sql
       connection.select_value(<<-SQL.squish).try(&:squish)
         SELECT definition
@@ -92,14 +114,14 @@ describe ActiveRecordViews do
         it 'updates view with compatible change' do
           create_test_view 'select 2 as id'
           expect(test_view_sql).to eq 'SELECT 2 AS id;'
-          expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '4'
+          expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 4
         end
 
         describe 'changes incompatible with CREATE OR REPLACE' do
           it 'updates view with new column added before existing' do
             create_test_view "select 'foo'::text as name, 3 as id"
             expect(test_view_sql).to eq "SELECT 'foo'::text AS name, 3 AS id;"
-            expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '6'
+            expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 6
           end
 
           it 'fails to update view if column used by dependant view is removed' do
@@ -107,7 +129,7 @@ describe ActiveRecordViews do
               create_test_view "select 'foo'::text as name"
             }.to raise_error ActiveRecord::StatementInvalid, /column test.id does not exist/
             expect(test_view_sql).to eq 'SELECT 1 AS id;'
-            expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '2'
+            expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 2
           end
         end
 
@@ -120,6 +142,21 @@ describe ActiveRecordViews do
             expect(view_names).to match_array %w[unmanaged]
           end
 
+          it 'support being ran inside a transaction' do
+            expect(ActiveRecordViews).to receive(:without_transaction).at_least(:once).and_wrap_original do |original, *args, &block|
+              original.call(*args) do |new_connection|
+                new_connection.execute 'SET statement_timeout = 1000'
+                block.call(new_connection)
+              end
+            end
+
+            connection.transaction requires_new: true do
+              expect {
+                ActiveRecordViews.drop_all_views connection
+              }.to change { view_names }
+            end
+          end
+
           it 'errors if an unmanaged view depends on a managed view' do
             connection.execute 'CREATE VIEW unmanaged AS SELECT * from dependant2a'
 
@@ -213,6 +250,28 @@ describe ActiveRecordViews do
         create_test_view 'select 1 as foo, 2 as bar, 3 as baz', materialized: false, unique_columns: [:foo, 'bar']
       }.to raise_error ArgumentError, 'unique_columns option requires view to be materialized'
     end
+
+    it 'supports resetting all materialised views' do
+      class ResetMaterializeViewTestModel < ActiveRecord::Base
+        self.table_name = 'test'
+        is_view 'select 123 as id', materialized: true
+      end
+      ResetMaterializeViewTestModel.refresh_view!
+
+      expect {
+        ActiveRecordViews.reset_materialized_views
+      }.to change { test_view_populated? }.to(false)
+        .and change { test_view_refreshed_at }.to(nil)
+    end
+  end
+
+  describe '.drop_all_views' do
+    let(:connection) { ActiveRecord::Base.connection }
+
+    it 'does nothing when no views have been defined' do
+      ActiveRecordViews.drop_all_views connection
+      expect(view_names).to match_array %w[]
+    end
   end
 
   describe '.without_transaction' do

data/spec/internal/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require './spec/support/silence_warnings.rb'
 require 'combustion'
 
 Combustion::Database.instance_eval do
@@ -9,7 +10,11 @@ end
 
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
-  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
+  config.log_level = :debug
+  config.active_record.schema_format = ENV.fetch('SCHEMA_FORMAT', 'sql').to_sym
+  if ENV['SKIP_MODEL_EAGER_LOAD']
+    config.eager_load_paths -= Rails.application.config.paths['app/models'].to_a
+  end
 end
 
 load 'active_record/railties/databases.rake'

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

@@ -1,3 +1,7 @@
 class ErbTestModel < ActiveRecord::Base
+  def self.test_erb_method
+    'ERB method'
+  end
+
   is_view
 end

data/spec/internal/app/models/erb_test_model.sql.erb

@@ -1 +1 @@
-SELECT 1 AS id, '<%= "ERB" %> file'::text AS name;
+SELECT 1 AS id, '<%= test_erb_method %> file'::text AS name;

data/spec/internal/config/database.yml

@@ -1,4 +1,9 @@
-test:
+test: &test
   adapter: postgresql
   database: activerecord_views_test
   min_messages: warning
+  advisory_locks: <%= !Rails.version.start_with?('6.0.') %>
+development:
+  <<: *test
+production:
+  <<: *test

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root to: -> (env) { [204, {}, []] }
+end

data/spec/spec_helper.rb

@@ -2,22 +2,60 @@ require 'bundler'
 Bundler.setup
 
 require 'rails/version'
-$VERBOSE = true unless Rails::VERSION::MAJOR < 4
+$VERBOSE = true
+
+require './spec/support/silence_warnings.rb'
 
 require 'combustion'
 require 'active_record_views'
+
+FileUtils.mkdir_p 'spec/internal/db'
+File.write 'spec/internal/db/schema.rb', ''
+
+TEST_TEMP_MODEL_DIR = Rails.root + 'spec/internal/app/models_temp'
+FileUtils.mkdir_p TEST_TEMP_MODEL_DIR
+Rails.application.config.paths['app/models'] << 'app/models_temp'
+
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
-  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
 end
 require 'rspec/rails'
+require 'super_diff/rspec-rails'
+
+RSpec.shared_context 'sql_statements' do
+  let(:sql_statements) { [] }
+
+  let!(:sql_statements_subscription) do
+    ActiveSupport::Notifications.subscribe('sql.active_record') do |_, _, _, _, details|
+      sql_statements << details.fetch(:sql)
+    end
+  end
+
+  after do
+    ActiveSupport::Notifications.unsubscribe sql_statements_subscription
+  end
+end
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
+  config.filter_run_when_matching focus: true
+  config.filter_run_excluding skip: true
+  config.example_status_persistence_file_path = 'tmp/examples.txt'
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_doubled_constant_names = true
+    mocks.verify_partial_doubles = true
+  end
 
   config.before do
-    ActionDispatch::Reloader.cleanup!
-    ActionDispatch::Reloader.prepare!
+    FileUtils.rm_rf Dir["spec/internal/app/models_temp/*"]
+
+    if Rails::VERSION::MAJOR >= 5
+      Rails.application.reloader.reload!
+    else
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+    end
 
     connection = ActiveRecord::Base.connection
 
@@ -42,24 +80,26 @@ RSpec.configure do |config|
     end
   end
 
+  config.include_context 'sql_statements'
 end
 
-def test_request
-  begin
-    Rails.application.call({'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/'})
-  rescue ActionController::RoutingError
+def with_reloader(&block)
+  if Rails.application.respond_to?(:reloader)
+    Rails.application.reloader.wrap(&block)
+  else
+    block.call
   end
 end
 
-def with_temp_sql_dir
-  Dir.mktmpdir do |temp_dir|
-    begin
-      old_sql_load_path = ActiveRecordViews.sql_load_path
-      ActiveRecordViews.sql_load_path = [temp_dir] + old_sql_load_path
-      yield temp_dir
-    ensure
-      ActiveRecordViews.sql_load_path = old_sql_load_path
-    end
+def test_request
+  with_reloader do
+    status, headers, body = Rails.application.call(
+      'REQUEST_METHOD' => 'GET',
+      'PATH_INFO' => '/',
+      'rack.input' => StringIO.new,
+    )
+    expect(status).to eq 204
+    body.close
   end
 end
 
@@ -92,3 +132,11 @@ def without_dependency_checks
 ensure
   allow(ActiveRecordViews).to receive(:check_dependencies).and_call_original
 end
+
+def without_create_enabled
+  old_enabled = ActiveRecordViews::Extension.create_enabled
+  ActiveRecordViews::Extension.create_enabled = false
+  yield
+ensure
+  ActiveRecordViews::Extension.create_enabled = old_enabled
+end

data/spec/support/silence_warnings.rb

@@ -0,0 +1,23 @@
+require 'warning'
+require 'rails/version'
+
+case Rails::VERSION::STRING
+when /^4\.2\./
+  Warning.ignore(%r{lib/(active_support/core_ext|action_dispatch/middleware)/.+: warning: (method redefined|previous definition)})
+  Warning.ignore(%r{lib/active_support/core_ext/.+: warning: BigDecimal.new is deprecated})
+  Warning.ignore(%r{lib/arel/visitors/informix.rb:\d+: warning: assigned but unused variable})
+  Warning.ignore(%r{lib/active_record/connection_adapters/.+: warning: deprecated Object#=~ is called on Integer})
+  Warning.ignore(%r{Inheriting from Rack::Session::Abstract::ID is deprecated})
+when /^5\.0\./
+  Warning.ignore(%r{lib/(active_support/core_ext|action_view)/.+: warning: (method redefined|previous definition)})
+  Warning.ignore(%r{lib/arel/visitors/informix.rb:\d+: warning: assigned but unused variable})
+  Warning.ignore(%r{lib/action_view/.+: warning: `\*' interpreted as argument prefix})
+when /^5\.1\./
+  Warning.ignore(%r{lib/(active_support/core_ext)/.+: warning: (method redefined|previous definition)})
+  Warning.ignore(%r{lib/arel/visitors/informix.rb:\d+: warning: assigned but unused variable})
+  Warning.ignore(%r{lib/active_record/.+/schema_statements.rb:\d+: (warning: in `drop_table': the last argument was passed as a single Hash|warning: although a splat keyword arguments here)})
+end
+
+Warning.process do |_warning|
+  :raise
+end

data/spec/tasks_spec.rb

@@ -1,17 +1,93 @@
 require 'spec_helper'
 
-describe 'rake db:structure:dump' do
-  it 'copies over activerecord_views data' do
-    ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
-
-    FileUtils.rm_f 'spec/internal/db/structure.sql'
-    system("rake -f spec/internal/Rakefile db:structure:dump")
+describe 'rake tasks' do
+  def rake(task_name, env: {})
+    system(env, *%W[
+      rake
+      -f spec/internal/Rakefile
+      #{task_name}
+    ])
     raise unless $?.success?
+  end
+
+  describe 'db:migrate' do
+    def view_names
+      ActiveRecord::Base.connection.select_values(<<~SQL.squish)
+        SELECT table_name
+        FROM information_schema.views
+        WHERE table_schema = 'public'
+      SQL
+    end
+
+    it 'does not create any database views' do
+      expect(view_names).to be_empty
+      rake 'db:migrate'
+      expect(view_names).to be_empty
+    end
+
+    it 'creates database views in production mode' do
+      expect(view_names).to be_empty
+      rake 'db:migrate', env: {'RAILS_ENV' => 'production'}
+      expect(view_names).to_not be_empty
+    end
+
+    it 'does nothing in production mode without models' do
+      expect(view_names).to be_empty
+      rake 'db:migrate', env: {'RAILS_ENV' => 'production', 'SKIP_MODEL_EAGER_LOAD' => 'true'}
+      expect(view_names).to be_empty
+    end
+
+    context 'with unregistered view' do
+      before do
+        ActiveRecordViews.create_view ActiveRecord::Base.connection, 'old_view', 'OldView', 'SELECT 42 AS id'
+      end
+
+      it 'does not drop unregistered views' do
+        expect(view_names).to include 'old_view'
+        rake 'db:migrate'
+        expect(view_names).to include 'old_view'
+      end
+
+      it 'drops unregistered views in production mode' do
+        expect(view_names).to include 'old_view'
+        rake 'db:migrate', env: {'RAILS_ENV' => 'production'}
+        expect(view_names).to_not include 'old_view'
+      end
+    end
+  end
+
+  schema_rake_task = Gem::Version.new(Rails.version) >= Gem::Version.new("6.1") ? 'db:schema:dump' : 'db:structure:dump'
+  describe schema_rake_task do
+    before do
+      FileUtils.rm_f 'spec/internal/db/schema.rb'
+      FileUtils.rm_f 'spec/internal/db/structure.sql'
+
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
+    end
+
+    after do
+      FileUtils.rm_f 'spec/internal/db/schema.rb'
+      FileUtils.rm_f 'spec/internal/db/structure.sql'
+
+      File.write 'spec/internal/db/schema.rb', ''
+    end
+
+    it 'copies over activerecord_views data' do
+      rake schema_rake_task
+
+      expect(File.exist?('spec/internal/db/schema.rb')).to eq false
+      sql = File.read('spec/internal/db/structure.sql')
+      expect(sql).to match(/CREATE TABLE public\.schema_migrations/)
+      expect(sql).to match(/CREATE VIEW public\.test_view/)
+      expect(sql).to match(/COPY public\.active_record_views.+test_view\tTestView/m)
+      expect(sql).to match(/UPDATE public\.active_record_views SET refreshed_at = NULL/)
+    end
 
-    sql = File.read('spec/internal/db/structure.sql')
-    FileUtils.rm_f 'spec/internal/db/structure.sql'
+    it 'does not write structure.sql when `schema_format = :ruby`', if: schema_rake_task != 'db:structure:dump' do
+      rake schema_rake_task, env: {'SCHEMA_FORMAT' => 'ruby'}
 
-    expect(sql).to match(/COPY public\.active_record_views.+test_view\tTestView/m)
-    expect(sql).to match(/UPDATE public\.active_record_views SET refreshed_at = NULL/)
+      expect(File.exist?('spec/internal/db/schema.rb')).to eq true
+      expect(File.exist?('spec/internal/db/structure.sql')).to eq false
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason Weathered
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: super_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +100,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - jason@jasoncodes.com
 executables: []
@@ -95,16 +123,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - activerecord_views.gemspec
-- gemfiles/rails3_2.gemfile
-- gemfiles/rails4_0.gemfile
-- gemfiles/rails4_1.gemfile
 - gemfiles/rails4_2.gemfile
+- gemfiles/rails5_0.gemfile
+- gemfiles/rails5_1.gemfile
+- gemfiles/rails5_2.gemfile
+- gemfiles/rails6_0.gemfile
+- gemfiles/rails6_1.gemfile
 - lib/active_record_views.rb
 - lib/active_record_views/checksum_cache.rb
 - lib/active_record_views/database_cleaner/truncation_extension.rb
@@ -126,20 +157,20 @@ files:
 - spec/internal/app/models/external_file_test_model.rb
 - spec/internal/app/models/external_file_test_model.sql
 - spec/internal/app/models/heredoc_test_model.rb
-- spec/internal/app/models/missing_file_test_model.rb
 - spec/internal/app/models/modified_a.rb
 - spec/internal/app/models/modified_b.rb
 - spec/internal/app/models/namespace/test_model.rb
 - spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
-- spec/internal/db/schema.rb
+- spec/internal/config/routes.rb
 - spec/spec_helper.rb
+- spec/support/silence_warnings.rb
 - spec/tasks_spec.rb
 homepage: http://github.com/jasoncodes/activerecord_views
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,9 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord
 test_files:
@@ -172,12 +202,12 @@ test_files:
 - spec/internal/app/models/external_file_test_model.rb
 - spec/internal/app/models/external_file_test_model.sql
 - spec/internal/app/models/heredoc_test_model.rb
-- spec/internal/app/models/missing_file_test_model.rb
 - spec/internal/app/models/modified_a.rb
 - spec/internal/app/models/modified_b.rb
 - spec/internal/app/models/namespace/test_model.rb
 - spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
-- spec/internal/db/schema.rb
+- spec/internal/config/routes.rb
 - spec/spec_helper.rb
+- spec/support/silence_warnings.rb
 - spec/tasks_spec.rb