activerecord_views 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777d910ae40ada55060df98887059878cc8ddb8ec65f6d49a890d2de9164810f
-  data.tar.gz: d905c23880139d85f0fb9ec3c00318670a1638351fc8e42bab05656c8d097d2e
+  metadata.gz: 8f6181c027be63e47f0f891651ef16dc6732baf4000d196709d2cbb80f0c8aa2
+  data.tar.gz: f9a5c359c72123e6555cf023ba8aca2b6509f6341d60d239297ebf84a28bde3d
 SHA512:
-  metadata.gz: ed3ac3d78b82bf20501936c0c3f4a30815300da89d2516d9149d37723d977638f06f0c6414a62d1460239da7e94478110bb89ec13459d656d28cbe37ca94e254
-  data.tar.gz: 0f6f5bf130436bc8fcf1a9fd1ad383044bc4a0373dd1f18a56c5691ee20a1eb55d38476e8af294c9daeb740182b520aff7202c4c6b75cc638d46dd12cda26dff
+  metadata.gz: 53c430bb26f03dad6cab94335ae927fefe3a4111dee9b2e322985e6eca85dc68f9c15091199c63f5e4983e36c3e4b906967166e2431f470c46574f55cc8ee990
+  data.tar.gz: 3548136a4b337bc8331a51b150c23bd72548ffb0b114a0dae7c148f000f5faea5cd24e1998e027ff9eca2b8073f234100af3afc3bacb6ae140c80d01ca2f513e

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/tasks/active_record_views.rake

@@ -62,12 +62,27 @@ Rake::Task[schema_rake_task].enhance do
         pg_tasks.send(:remove_sql_header_comments, active_record_views_dump.path)
       end
 
-      File.open filename, 'a' do |io|
-        # Seek to the end to ensure we don't overwrite the existing content
-        io.seek(0, IO::SEEK_END)
-        IO.copy_stream active_record_views_dump, io
+      # 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")
 
-        io.puts 'UPDATE public.active_record_views SET refreshed_at = NULL WHERE refreshed_at IS NOT NULL;'
+      File.open filename, 'a' do |io|
+        io.puts active_record_views_dump_content
       end
     ensure
       active_record_views_dump.close

data/spec/tasks_spec.rb

@@ -79,8 +79,25 @@ 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/m)
-      expect(sql).to match(/UPDATE public\.active_record_views SET refreshed_at = NULL/)
+      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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jason Weathered
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord