query_helper 0.2.30 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03de8ed1f4ad37b3fd8eb07edfedd5829c06e3502e78450fcbea037841a55bd7
-  data.tar.gz: 79598bdaca7ee9073f90858c906a5492c6eec8e4e6e514ddaa8397d0cf0afcc1
+  metadata.gz: b9626c22503b7f257a4276b969a498a017753e879e30b04b6643c618ae8f03d4
+  data.tar.gz: 825fdbf988d8a41abd89d250aa6d56f0add379fced68e630099ea688cde9b586
 SHA512:
-  metadata.gz: 75cf73dd094f480095b4d0e2b8d9ae941d54a817e172dcbc3ddcc270f5c97e8c64e8303d5df8b3b0d876cb3ae5c230426920f329659892574db5889cb0ab1cd4
-  data.tar.gz: 25e7609715272868b5f6baf61a229d704b21cbc97f6a71be5a28126f763f9472088bc396498d60208492a2b582ac17d1994bbd2e8293c685b423c199da864e31
+  metadata.gz: 1ce4589b5783e435ec47b22b2e04b094d8f5da5703b439510b7a9570d8dc0d87d505d2e2fca6125b1c180707bcae9001af9d3f40003c2747966f09a420978237
+  data.tar.gz: 9c8188da6470cd4469a4825e21725cbc1d19b5fcd1f246eb0d86d2dddd589ddcb7be30c8a500a3650b1a61fb2d2a622f6ff41388a8193bacda3544ca3974d81c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.2.30)
+    query_helper (0.3.4)
       activerecord (> 5)
       activesupport (> 5)
       sqlite3
@@ -43,13 +43,13 @@ GEM
       i18n (>= 0.7)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.14.4)
-    nokogiri (1.13.3)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     racc (1.6.0)
@@ -59,7 +59,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.4.1)
       actionpack (= 6.1.4.1)
@@ -89,7 +89,8 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    sqlite3 (1.4.2)
+    sqlite3 (1.6.2)
+      mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)

data/lib/query_helper/associations.rb

@@ -8,12 +8,24 @@ class QueryHelper
     def self.load_associations(payload:, associations: [], as_json_options: {})
       as_json_options ||= {}
       as_json_options[:include] = as_json_options[:include] || json_associations(associations)
-      ActiveRecord::Associations::Preloader.new.preload(payload, associations)
+      begin
+        # Preloader have been changed in Rails 7, which is giving error on upgrade.
+        # This should be updated to latest API once all repos have been upgraded to Rails 7
+        ActiveRecord::Associations::Preloader.new.preload(payload, associations)
+      rescue
+        ActiveRecord::Associations::Preloader.new(records: payload, associations: associations).call
+      end
       payload.as_json(as_json_options)
     end
 
     def self.preload_associations(payload:, preload: [])
-      ActiveRecord::Associations::Preloader.new.preload(payload, preload)
+      begin
+        # Preloader have been changed in Rails 7, which is giving error on upgrade.
+        # This should be updated to latest API once all repos have been upgraded to Rails 7
+        ActiveRecord::Associations::Preloader.new.preload(payload, preload)
+      rescue
+        ActiveRecord::Associations::Preloader.new(records: payload, associations: preload).call
+      end
     end
 
     def self.json_associations(associations)

data/lib/query_helper/sql_manipulator.rb

@@ -26,8 +26,8 @@ class QueryHelper
     end
 
     def build
-      insert_having_clauses()
       insert_qualify_clauses()
+      insert_having_clauses()
       insert_where_clauses()
       insert_select_clauses()
       insert_order_by_and_limit_clause()
@@ -49,7 +49,7 @@ class QueryHelper
 
     def qualify_clauses(index)
       if index == 0
-        "qualified_results AS ( "
+        "WITH qualified_results AS ( "
       else
         ", qualified_results AS ( "
       end

data/lib/query_helper/sql_parser.rb

@@ -114,7 +114,7 @@ class QueryHelper
     end
 
     def insert_where_index
-      group_by_index() || order_by_index() || limit_index() || @sql.length
+      qualify_index() || group_by_index() || order_by_index() || limit_index() || @sql.length
     end
 
     def insert_qualify_index

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.2.30"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.3.4
 platform: ruby
 authors:
 - Patterninc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler