blazer 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dea9967abfcc8db6f94dfb2b7ef522d367264aacd7b104259aaf48b3894035f
-  data.tar.gz: 84fa8ea6616dbcf0be9c7af3fe85d22085f4b75bf8b87f04d6eb7c62225ea24e
+  metadata.gz: 256b02c0d10eeb150659e7ebc1ac2f954d80668d2c615dd70fbd17c059adc66b
+  data.tar.gz: 19e6f582ee5e62df742d1fd2be4495a6fd60a5f8f11c2b880deef70fa71e4ce9
 SHA512:
-  metadata.gz: 4d1ca32f82a4d973c9cd3aaf89ce12af78c6147fc9a939280cb3f6edadf144dd190597d43f893e34b0b116cbdcec6d60eabe947cc719e1e4d9ecc641f3de0369
-  data.tar.gz: 26983796db57b66e9de5f49c971d5b2d2c467aa449d2e632afa7119abd57153bbc39266eeba26a7ed40fdcf23a30323c871649e91be270e48673050c3cee2df3
+  metadata.gz: 8b02fd069ed3fdde9b1a59e1b13a29c63eca1977f6f8028f1b1270fb8f60ab4b1a5feefcd3e283c5d88968782a46f783e19cda44985f4381c1334770bed95d5a
+  data.tar.gz: b1ea01aaf738562070e1a5ffb7b02fd20f63f3734897b6a202aa7f193a2f914786f11b81fc0895718420e2798b1136ba0620aa3f2b91fbe6e5bbe6ac9433c502

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 2.4.5 (2021-09-15)
+
+- Improved fix for some forked queries not appearing on home page
+
 ## 2.4.4 (2021-09-15)
 
-- Fixed issue with forked queries not appearing on home page
+- Fixed issue with some forked queries not appearing on home page
 
 ## 2.4.3 (2021-07-27)
 

data/README.md

@@ -975,14 +975,6 @@ override_csp: true
 
 ## Upgrading
 
-### 2.4.4
-
-Due to a bug, newly forked queries stopped appearing on the home page when archiving was enabled. To restore them, run:
-
-```ruby
-Blazer::Query.where(status: nil).update_all(status: "active")
-```
-
 ### 2.3
 
 To archive queries, create a migration

data/app/controllers/blazer/queries_controller.rb

@@ -71,7 +71,7 @@ module Blazer
         @sql_errors << error if error
       end
 
-      @query.update!(status: "active") if @query.try(:status) == "archived"
+      @query.update!(status: "active") if @query.respond_to?(:status) && @query.status.in?(["archived", nil])
 
       Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
 
@@ -179,8 +179,8 @@ module Blazer
       if params[:commit] == "Fork"
         @query = Blazer::Query.new
         @query.creator = blazer_user if @query.respond_to?(:creator)
-        @query.status = "active" if @query.respond_to?(:status)
       end
+      @query.status = "active" if @query.respond_to?(:status)
       unless @query.editable?(blazer_user)
         @query.errors.add(:base, "Sorry, permission denied")
       end

data/app/models/blazer/query.rb

@@ -8,7 +8,7 @@ module Blazer
 
     validates :statement, presence: true
 
-    scope :active, -> { column_names.include?("status") ? where(status: "active") : all }
+    scope :active, -> { column_names.include?("status") ? where(status: ["active", nil]) : all }
     scope :named, -> { where.not(name: "") }
 
     def to_param

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.4.4"
+  VERSION = "2.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Andrew Kane