activerecord_views 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846f267566c95c8e6adc3a7dc503e0aaefa83d48dcd5c27b865f6ff60dc70bc0
-  data.tar.gz: be109db5a85a682c00244c2ff52d7f29cefb72d20b54ea03431937d04355bdcb
+  metadata.gz: e64bd87ba9a26795e83b579cc0047078b712c46f7e63be89f9ba7a5aad7de6d7
+  data.tar.gz: a7039933d362f05912e01469ee20f7b66f30004d9e1b036b33e8cc73b8641ce0
 SHA512:
-  metadata.gz: 530ed043fe22df67d38ce2a5ce63f65af5617f2ead4e0de329fe47fe6f0072c25f837861f90f222af24e084d43516785a182125becd0b06e81409d930215a0c0
-  data.tar.gz: ea5cacee78d55faaaa1aed554c34317a43d156f71f5bc017de4a9031df8c3432b0b785da335efdc85b67ee1dcc68ce064fc1bdc707d8214912a8fd69b0281052
+  metadata.gz: 2fa8934e9212705d81769c05fcb6271dd42f6baa2dc7525c11a8a78166c65bfb46482fc50caa96d525c182aabf746663fab4431e57c1fb7cae2fcfa35c580fa0
+  data.tar.gz: f7f9b27dbe7a1b47c77592cae929f6f2b6cfa2c83cbcbd298eb84d521521eba5f0196cbdb475097fd875558747c7e05ffd77390a57efff3077fabc918cb7d8f7

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.7
+ruby 2.7.5

data/Appraisals

@@ -1,17 +1,3 @@
-appraise 'rails4_2' do
-  gem 'rails', '~> 4.2.0'
-  gem "pg", "< 0.21"
-end
-
-appraise 'rails5_0' do
-  gem 'rails', '~> 5.0.0'
-  gem "pg", "< 1.0"
-end
-
-appraise 'rails5_1' do
-  gem 'rails', '~> 5.1.0'
-end
-
 appraise 'rails5_2' do
   gem 'rails', '~> 5.2.0'
 end
@@ -23,3 +9,7 @@ end
 appraise 'rails6_1' do
   gem 'rails', '~> 6.1.0'
 end
+
+appraise 'rails7_0' do
+  gem 'rails', '~> 7.0.0.rc1'
+end

data/activerecord_views.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activerecord', ['>= 4.2', '< 6.2']
+  gem.add_dependency 'activerecord', ['>= 5.2', '< 7.1']
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'rspec-rails', '>= 2.14'

data/gemfiles/{rails5_1.gemfile → rails7_0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 7.0.0.rc1"
 
 gemspec path: "../"

data/lib/active_record_views/checksum_cache.rb

@@ -6,11 +6,7 @@ module ActiveRecordViews
     end
 
     def init_state_table!
-      table_exists = if Rails::VERSION::MAJOR >= 5
-        @connection.data_source_exists?('active_record_views')
-      else
-        @connection.table_exists?('active_record_views')
-      end
+      table_exists = @connection.data_source_exists?('active_record_views')
 
       if table_exists && !@connection.column_exists?('active_record_views', 'class_name')
         @connection.begin_transaction

data/lib/active_record_views/extension.rb

@@ -70,10 +70,6 @@ module ActiveRecordViews
           raise ArgumentError, 'not a materialized view'
         end
 
-        if Rails::VERSION::MAJOR < 5
-          value = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
-        end
-
         value
       end
 

data/lib/active_record_views/railtie.rb

@@ -8,19 +8,11 @@ module ActiveRecordViews
       end
 
       unless app.config.cache_classes
-        if app.respond_to?(:reloader)
-          app.reloader.before_class_unload do
-            ActiveRecordViews.reload_stale_views!
-          end
-          app.executor.to_run do
-            ActiveRecordViews.reload_stale_views!
-          end
-        else
-          ActiveSupport.on_load :action_controller do
-            ActionDispatch::Callbacks.before do
-              ActiveRecordViews.reload_stale_views!
-            end
-          end
+        app.reloader.before_class_unload do
+          ActiveRecordViews.reload_stale_views!
+        end
+        app.executor.to_run do
+          ActiveRecordViews.reload_stale_views!
         end
       end
     end

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.1.0'
+  VERSION = '0.1.4'
 end

data/lib/active_record_views.rb

@@ -37,24 +37,18 @@ module ActiveRecordViews
   end
 
   def self.without_transaction(connection)
-    in_transaction = if connection.respond_to? :transaction_open?
-      connection.transaction_open?
-    else
-      !connection.outside_transaction?
-    end
-
     states = Thread.current[:active_record_views_without_transaction] ||= {}
 
     begin
       if states[connection]
         yield states[connection]
-      elsif in_transaction
+      elsif connection.transaction_open?
         begin
           temp_connection = connection.pool.checkout
           states[temp_connection] = states[connection] = temp_connection
           yield temp_connection
         ensure
-          connection.pool.checkin temp_connection
+          connection.pool.checkin temp_connection if temp_connection
           states[temp_connection] = states[connection] = nil
         end
       else

data/lib/tasks/active_record_views.rake

@@ -9,25 +9,20 @@ end
 schema_rake_task = Gem::Version.new(Rails.version) >= Gem::Version.new("6.1") ? 'db:schema:dump' : 'db:structure:dump'
 
 Rake::Task[schema_rake_task].enhance do
-  table_exists = if Rails::VERSION::MAJOR >= 5
-    ActiveRecord::Base.connection.data_source_exists?('active_record_views')
-  else
-    ActiveRecord::Base.connection.table_exists?('active_record_views')
-  end
+  table_exists = ActiveRecord::Base.connection.data_source_exists?('active_record_views')
 
   if schema_rake_task == 'db:structure:dump'
     ActiveRecord::Base.schema_format = :sql
   end
 
-  if table_exists && ActiveRecord::Base.schema_format == :sql
-    tasks = ActiveRecord::Tasks::DatabaseTasks
+  schema_format = if ActiveRecord.respond_to?(:schema_format)
+    ActiveRecord.schema_format
+  else
+    ActiveRecord::Base.schema_format
+  end
 
-    filename = case
-    when tasks.respond_to?(:dump_filename)
-      tasks.dump_filename('primary')
-    else
-      tasks.schema_file
-    end
+  if table_exists && schema_format == :sql
+    tasks = ActiveRecord::Tasks::DatabaseTasks
 
     config = if ActiveRecord::Base.configurations.respond_to?(:configs_for)
       if Rails.version.start_with?('6.0.')
@@ -49,15 +44,56 @@ Rake::Task[schema_rake_task].enhance do
       config.fetch('database')
     end
 
+    filename = case
+    when tasks.respond_to?(:schema_dump_path)
+      tasks.schema_dump_path(config)
+    when tasks.respond_to?(:dump_filename)
+      tasks.dump_filename('primary')
+    else
+      tasks.schema_file
+    end
+
     pg_tasks = tasks.send(:class_for_adapter, adapter).new(config)
-    pg_tasks.send(:set_psql_env)
+    psql_env = if pg_tasks.respond_to?(:psql_env, true)
+      pg_tasks.send(:psql_env)
+    else
+      pg_tasks.send(:set_psql_env)
+      {}
+    end
+
+    begin
+      active_record_views_dump = Tempfile.open("active_record_views_dump.sql")
+      require 'shellwords'
+      system(psql_env, "pg_dump --data-only --no-owner --table=active_record_views #{Shellwords.escape database} >> #{Shellwords.escape active_record_views_dump.path}")
+      raise 'active_record_views metadata dump failed' unless $?.success?
 
-    require 'shellwords'
-    system("pg_dump --data-only --table=active_record_views #{Shellwords.escape database} >> #{Shellwords.escape filename}")
-    raise 'active_record_views metadata dump failed' unless $?.success?
+      pg_tasks.send(:remove_sql_header_comments, active_record_views_dump.path)
 
-    File.open filename, 'a' do |io|
-      io.puts 'UPDATE public.active_record_views SET refreshed_at = NULL WHERE refreshed_at IS NOT NULL;'
+      # Substitute out any timestamps that were dumped from the active_record_views table
+      #
+      # Before:
+      #
+      #     COPY public.active_record_views (name, class_name, checksum, options, refreshed_at) FROM stdin;
+      #     test_view       TestView        42364a017b73ef516a0eca9827e6fa00623257ee        {"dependencies":[]}     2021-10-26 02:49:12.247494
+      #     \.
+      #
+      # After:
+      #
+      #     COPY public.active_record_views (name, class_name, checksum, options, refreshed_at) FROM stdin;
+      #     test_view       TestView        42364a017b73ef516a0eca9827e6fa00623257ee        {"dependencies":[]}     \N
+      #     \.
+      active_record_views_dump_content = active_record_views_dump.read
+      if active_record_views_dump_content !~ /^COPY public.active_record_views \(.+, refreshed_at\) FROM stdin;$/
+        raise 'refreshed_at is not final column'
+      end
+      active_record_views_dump_content.gsub!(/\t\d\d\d\d-\d\d-\d\d.*$/, "\t\\N")
+
+      File.open filename, 'a' do |io|
+        io.puts active_record_views_dump_content
+      end
+    ensure
+      active_record_views_dump.close
+      active_record_views_dump.unlink
     end
   end
 end

data/spec/active_record_views_checksum_cache_spec.rb

@@ -5,11 +5,7 @@ describe ActiveRecordViews::ChecksumCache do
 
   describe 'initialisation' do
     def metadata_table_exists?
-      if Rails::VERSION::MAJOR >= 5
-        connection.data_source_exists?('active_record_views')
-      else
-        connection.table_exists?('active_record_views')
-      end
+      connection.data_source_exists?('active_record_views')
     end
 
     context 'no existing table' do

data/spec/active_record_views_extension_spec.rb

@@ -8,11 +8,7 @@ describe ActiveRecordViews::Extension do
 
     def view_exists?(name)
       connection = ActiveRecord::Base.connection
-      if connection.respond_to?(:view_exists?)
-        connection.view_exists?(name)
-      else
-        connection.table_exists?(name)
-      end
+      connection.view_exists?(name)
     end
 
     it 'creates database views from heredocs' do
@@ -119,7 +115,7 @@ describe ActiveRecordViews::Extension do
         end
       RB
 
-      with_reloader do
+      Rails.application.reloader.wrap do
         expect(DeletedFileTestModel.first.name).to eq 'delete test'
       end
 
@@ -133,11 +129,9 @@ describe ActiveRecordViews::Extension do
         .and change { view_exists?('deleted_file_test_models') }.from(true).to(false)
       test_request # second request does not `drop_view` again
 
-      if Rails::VERSION::MAJOR >= 5
-        expect {
-          DeletedFileTestModel.first.name
-        }.to raise_error NameError, 'uninitialized constant DeletedFileTestModel'
-      end
+      expect {
+        DeletedFileTestModel.first.name
+      }.to raise_error NameError, 'uninitialized constant DeletedFileTestModel'
     end
 
     it 'does not create if database view is initially up to date' do

data/spec/active_record_views_spec.rb

@@ -27,10 +27,6 @@ describe ActiveRecordViews do
         WHERE schemaname = 'public' AND matviewname = 'test'
       SQL
 
-      if Rails::VERSION::MAJOR < 5
-        value = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
-      end
-
       value
     end
 
@@ -333,5 +329,16 @@ describe ActiveRecordViews do
         original_connection.pool.checkin original_connection_2
       end
     end
+
+    it 'does not attempt to checkin when checkout fails' do
+      expect(original_connection.pool).to receive(:checkout).and_raise PG::ConnectionBad
+      expect(original_connection.pool).to_not receive(:checkin)
+
+      expect {
+        original_connection.transaction do
+          ActiveRecordViews.without_transaction(original_connection) { }
+        end
+      }.to raise_error PG::ConnectionBad
+    end
   end
 end

data/spec/internal/Rakefile

@@ -12,6 +12,9 @@ Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
   config.log_level = :debug
   config.active_record.schema_format = ENV.fetch('SCHEMA_FORMAT', 'sql').to_sym
+  if Gem::Version.new(Rails.version) >= Gem::Version.new("6.1")
+    config.active_record.legacy_connection_handling = false
+  end
   if ENV['SKIP_MODEL_EAGER_LOAD']
     config.eager_load_paths -= Rails.application.config.paths['app/models'].to_a
   end

data/spec/spec_helper.rb

@@ -18,6 +18,9 @@ Rails.application.config.paths['app/models'] << 'app/models_temp'
 
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
+  if Gem::Version.new(Rails.version) >= Gem::Version.new("6.1")
+    config.active_record.legacy_connection_handling = false
+  end
 end
 require 'rspec/rails'
 require 'super_diff/rspec-rails'
@@ -50,12 +53,7 @@ RSpec.configure do |config|
   config.before do
     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
+    Rails.application.reloader.reload!
 
     connection = ActiveRecord::Base.connection
 
@@ -83,16 +81,8 @@ RSpec.configure do |config|
   config.include_context 'sql_statements'
 end
 
-def with_reloader(&block)
-  if Rails.application.respond_to?(:reloader)
-    Rails.application.reloader.wrap(&block)
-  else
-    block.call
-  end
-end
-
 def test_request
-  with_reloader do
+  Rails.application.reloader.wrap do
     status, headers, body = Rails.application.call(
       'REQUEST_METHOD' => 'GET',
       'PATH_INFO' => '/',

data/spec/support/silence_warnings.rb

@@ -1,23 +1,6 @@
 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

@@ -77,8 +77,27 @@ describe 'rake tasks' do
 
       expect(File.exist?('spec/internal/db/schema.rb')).to eq false
       sql = File.read('spec/internal/db/structure.sql')
-      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(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\t.*\t.*\t\\N$/m)
+    end
+
+    it 'clears refreshed_at values' do
+      ActiveRecord::Base.connection.execute "UPDATE active_record_views SET refreshed_at = current_timestamp AT TIME ZONE 'UTC' WHERE name = 'test_view';"
+
+      rake schema_rake_task
+
+      ActiveRecord::Base.clear_all_connections!
+
+      system 'dropdb activerecord_views_test'
+      raise unless $?.success?
+      system 'createdb activerecord_views_test'
+      raise unless $?.success?
+      system 'psql -X -q -o /dev/null -f spec/internal/db/structure.sql activerecord_views_test'
+      raise unless $?.success?
+
+      refreshed_ats = ActiveRecord::Base.connection.select_values("SELECT refreshed_at FROM active_record_views WHERE name = 'test_view'")
+      expect(refreshed_ats).to eq [nil]
     end
 
     it 'does not write structure.sql when `schema_format = :ruby`', if: schema_rake_task != 'db:structure:dump' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Jason Weathered
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -130,12 +130,10 @@ files:
 - README.markdown
 - Rakefile
 - activerecord_views.gemspec
-- gemfiles/rails4_2.gemfile
-- gemfiles/rails5_0.gemfile
-- gemfiles/rails5_1.gemfile
 - gemfiles/rails5_2.gemfile
 - gemfiles/rails6_0.gemfile
 - gemfiles/rails6_1.gemfile
+- gemfiles/rails7_0.gemfile
 - lib/active_record_views.rb
 - lib/active_record_views/checksum_cache.rb
 - lib/active_record_views/database_cleaner/truncation_extension.rb
@@ -185,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord

data/gemfiles/rails4_2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-gem "pg", "< 0.21"
-
-gemspec path: "../"

data/gemfiles/rails5_0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-gem "pg", "< 1.0"
-
-gemspec path: "../"