activerecord_views 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e33c3b91d943b9fec0cf41b263302025ae787d41fe9404724cfd93c0105c73
-  data.tar.gz: 29b11133c94e86c16563083c1176616da9988fe9493fd69e8f2201436edded43
+  metadata.gz: fc8196b50d197fd74c7c92238a69124295490b6a991f1618fae1daf610ad041d
+  data.tar.gz: 235d0e987824299051a1249e9f955a11ccc8966e77ffb0939485797f5285e559
 SHA512:
-  metadata.gz: 194ac35e51118b4d57956d083d5bff2fc859c6b1bcc09ccfde564fa3425dade51caa53835676f676b3c26999b138ee81710a5d5d0c605f90fbdaebf718b0e89f
-  data.tar.gz: a611fff391e863d46580cd6dea1c02e95d14660a3e900212e624a162f9a99a7879ddfe6c5be709a902f44930c9c3c02ebf58cde1b67cd46d23bf141816b392d2
+  metadata.gz: 7f9370196f53175590f98636c67d98885c7a6e0ac29a030baaea0357536e643500eb4f937d06da114a0054b5febd6b91c1c13abcb3f5853118c4e9685ed1ac82
+  data.tar.gz: 3f751a3bbdd5761dff8e3e73d587cdc335a68d9b3d08fbfc3a6b7285f1e5de22236857dfc7f842024a5486db6e6ebb7c41186147d56640c1316f40941e20083a

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.7
+ruby 2.7.7

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'
+end

data/activerecord_views.gemspec

@@ -17,11 +17,10 @@ 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'
-  gem.add_development_dependency 'super_diff'
   gem.add_development_dependency 'combustion', '>= 0.5.1'
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'warning'

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"
 
 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.3'
+  VERSION = '0.1.5'
 end

data/lib/active_record_views.rb

@@ -37,18 +37,12 @@ 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

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,18 +44,32 @@ 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("pg_dump --data-only --no-owner --table=active_record_views #{Shellwords.escape database} >> #{Shellwords.escape active_record_views_dump.path}")
+      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?
 
-      if Gem::Version.new(Rails.version) >= Gem::Version.new("5.1")
-        pg_tasks.send(:remove_sql_header_comments, active_record_views_dump.path)
-      end
+      pg_tasks.send(:remove_sql_header_comments, active_record_views_dump.path)
+
+      active_record_views_dump_content = active_record_views_dump.read
 
       # Substitute out any timestamps that were dumped from the active_record_views table
       #
@@ -75,12 +84,17 @@ Rake::Task[schema_rake_task].enhance do
       #     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")
 
+      active_record_views_dump_content = active_record_views_dump_content
+        .lines
+        .chunk { |line| line.include?("\t") }
+        .flat_map { |is_data, lines| is_data ? lines.sort : lines }
+        .join
+
       File.open filename, 'a' do |io|
         io.puts active_record_views_dump_content
       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
 

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,9 +18,12 @@ Rails.application.config.paths['app/models'] << 'app/models_temp'
 
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
+  config.secret_key_base = 'dummy'
+  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'
 
 RSpec.shared_context 'sql_statements' do
   let(:sql_statements) { [] }
@@ -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,24 +81,14 @@ 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
-    status, headers, body = Rails.application.call(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/',
-      'rack.input' => StringIO.new,
-    )
-    expect(status).to eq 204
-    body.close
-  end
+  status, headers, body = Rails.application.call(
+    'REQUEST_METHOD' => 'GET',
+    'PATH_INFO' => '/',
+    'rack.input' => StringIO.new,
+  )
+  expect(status).to eq 204
+  body.close
 end
 
 def update_file(file, new_content)

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

@@ -62,7 +62,9 @@ describe 'rake tasks' 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'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_1', 'TestView1', 'SELECT 1'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_3', 'TestView3', 'SELECT 3'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_2', 'TestView2', 'SELECT 2'
     end
 
     after do
@@ -79,11 +81,12 @@ describe 'rake tasks' do
       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\t.*\t.*\t\\N$/m)
+      expect(sql).to match(/COPY public\.active_record_views.+test_view_1\tTestView1\t.*\t.*\t\\N$/m)
+      expect(sql).to match(/^test_view_1.+^test_view_2.+^test_view_3/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';"
+      ActiveRecord::Base.connection.execute "UPDATE active_record_views SET refreshed_at = current_timestamp AT TIME ZONE 'UTC' WHERE name = 'test_view_1';"
 
       rake schema_rake_task
 
@@ -96,7 +99,7 @@ describe 'rake tasks' do
       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'")
+      refreshed_ats = ActiveRecord::Base.connection.select_values("SELECT refreshed_at FROM active_record_views WHERE name = 'test_view_1'")
       expect(refreshed_ats).to eq [nil]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jason Weathered
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-12-01 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
@@ -58,20 +58,6 @@ 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
@@ -130,12 +116,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

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: "../"