activerecord_views 0.0.20 → 0.1.3

data/spec/tasks_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe 'rake tasks' do
-  def rake(task_name, production: false)
-    system(*%W[
+  def rake(task_name, env: {})
+    system(env, *%W[
       rake
       -f spec/internal/Rakefile
       #{task_name}
-      RAILS_ENV=#{production ? 'production' : 'development'}
     ])
     raise unless $?.success?
   end
@@ -28,10 +27,16 @@ describe 'rake tasks' do
 
     it 'creates database views in production mode' do
       expect(view_names).to be_empty
-      rake 'db:migrate', production: true
+      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'
@@ -45,24 +50,61 @@ describe 'rake tasks' do
 
       it 'drops unregistered views in production mode' do
         expect(view_names).to include 'old_view'
-        rake 'db:migrate', production: true
+        rake 'db:migrate', env: {'RAILS_ENV' => 'production'}
         expect(view_names).to_not include 'old_view'
       end
     end
   end
 
-  describe 'db:structure:dump' do
-    it 'copies over activerecord_views data' do
+  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'
-      rake 'db:structure:dump'
 
+      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')
-      FileUtils.rm_f '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)
+    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
+      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.20
+  version: 0.1.3
 platform: ruby
 authors:
 - Jason Weathered
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.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,6 +123,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -105,6 +134,8 @@ files:
 - 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,19 +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/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
@@ -153,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.1.6
+signing_key:
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord
 test_files:
@@ -171,11 +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/config/routes.rb
 - spec/spec_helper.rb
+- spec/support/silence_warnings.rb
 - spec/tasks_spec.rb

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

@@ -1,5 +0,0 @@
-unless ActiveRecordViews::Extension.currently_migrating?
-  class MissingFileTestModel < ActiveRecord::Base
-    is_view
-  end
-end