pattern_query_helper 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e0f634c8e36cce3943e085bf9a0bd461f9e8cded7fa8b28ba84e606bba50fe
-  data.tar.gz: 2bc96a37d492f6733a370d3c5f86696dae953056a261bcd2de9787589bd02e34
+  metadata.gz: 10af9c203e320ad1961805cf826cb69ca3e29173cdd64355bca34c8e08eda8b7
+  data.tar.gz: e19a35f891552bebc7663aebc8b0c20304176886a5ec98bd8b8dbed0d5d616d5
 SHA512:
-  metadata.gz: f6e697f89bc109f2c120998d662106340fb78db4c319ca898ee9e86fe7aebdaaa2dd9e6881b8686128b34d377b58893ab3ce31e9e09b00d89bef05efea1b629f
-  data.tar.gz: c14a371a3224a4d80d00c5da3f78e821d37d2a0ed1625dff40e3727adea536f7bf8f585a837887a9be90ec8009b8bc831bb5796d8bf24f68d331c73060e2a9cd
+  metadata.gz: 17251b8221f337b28bbbcb14e7706d7f306a6bfee68267e6e3c3b3e536a2435e1d619b74bead4ab82c59b14610f34d5604d48517def8d116dc6991fd9323ca24
+  data.tar.gz: b31780c640f830a060999ded53ce25f28aa672d6142e976c2e4bc6b4f9bf707cf0547db2d28bdf4b8e45952a68ce50d2f3d97b17bc92440b443a7e61bc0587e7

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
+dist: xenial
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.1
+  - 2.4.5
 before_install: gem install bundler -v 1.16.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pattern_query_helper (0.2.6)
+    pattern_query_helper (0.2.8)
       activerecord (~> 5.0)
       kaminari (~> 1.1.1)
 

data/lib/pattern_query_helper/filtering.rb

@@ -2,7 +2,7 @@ module PatternQueryHelper
   class Filtering
     def self.create_filters(filters, valid_columns_map=nil, symbol_prefix="")
       filters ||= {}
-      filter_string = "true = true"
+      all_conditions = []
       filter_params = {}
       filter_array = []
       filters.each do |filter_attribute, criteria|
@@ -54,8 +54,9 @@ module PatternQueryHelper
               raise ArgumentError.new("Invalid operator code '#{operator_code}' on '#{filter_attribute}' filter")
           end
           filter_column = modified_filter_column || filter_column
-          filter_string = "#{filter_string} and #{filter_column} #{operator}"
-          filter_string << " :#{filter_symbol}" unless filter_symbol_already_embedded or filter_symbol.blank?
+          condition = "#{filter_column} #{operator}"
+          condition << " :#{filter_symbol}" unless filter_symbol_already_embedded or filter_symbol.blank?
+          all_conditions << condition
           filter_params["#{filter_symbol}"] = criterion unless filter_symbol.blank?
           filter_array << {
             column: filter_attribute,
@@ -66,6 +67,9 @@ module PatternQueryHelper
         end
       end
 
+      filter_string = ""
+      filter_string = "where " + all_conditions.join("\n and ") unless all_conditions.empty?
+
       {
         filter_string: filter_string,
         filter_params: filter_params,

data/lib/pattern_query_helper/sql.rb

@@ -1,14 +1,12 @@
 module PatternQueryHelper
   class Sql
+    QUERY_COUNT_COLUMN = "_query_full_count".freeze
     def self.sql_query(config)
       model = config[:model]
-      query = config[:query]
       query_params = config[:query_params] || {}
       page = config[:page]
       per_page = config[:per_page]
-      filter_string = config[:filter_string]
       filter_params = config[:filter_params] || {}
-      sort_string = config[:sort_string]
 
       if page && per_page
         query_params[:limit] = per_page
@@ -16,46 +14,44 @@ module PatternQueryHelper
         limit = "limit :limit offset :offset"
       end
 
+      full_count_join = "cross join (select count(*) as #{QUERY_COUNT_COLUMN} from filtered_query) as filtered_query_count" if page || per_page
       query_params = query_params.merge(filter_params).symbolize_keys
-      sort_string = "order by #{sort_string}" if !sort_string.blank?
-      filter_string = "where #{filter_string}" if !filter_string.blank?
 
       sql = %(
-          with query as (#{query})
-          select *
-          from query
-          #{filter_string}
-          #{sort_string}
-          #{limit}
-        )
+        with filtered_query as (#{filtered_query(config)})
+        select *
+        from filtered_query
+        #{full_count_join}
+        #{limit}
+      )
 
       model.find_by_sql([sql, query_params])
     end
 
-    def self.sql_query_count(config)
-      model = config[:model]
+    def self.sql_query_count(sql_query_results)
+      sql_query_results.empty? ? 0 : sql_query_results.first[QUERY_COUNT_COLUMN]
+    end
+
+    def self.single_record_query(config)
+      results = sql_query(config)
+      results.first
+    end
+
+    private
+
+    def self.filtered_query(config)
       query = config[:query]
-      query_params = config[:query_params] || {}
       filter_string = config[:filter_string]
-      filter_params = config[:filter_params] || {}
-
-      query_params = query_params.merge(filter_params).symbolize_keys
-      filter_string = "where #{filter_string}" if !filter_string.blank?
+      sort_string = config[:sort_string]
+      sort_string = "order by #{sort_string}" if !sort_string.blank?
 
-      count_sql = %(
+      sql = %(
           with query as (#{query})
-          select count(*) as count
+          select *
           from query
           #{filter_string}
+          #{sort_string}
         )
-
-      model.find_by_sql([count_sql, query_params]).first["count"]
-    end
-
-    def self.single_record_query(config)
-      results = sql_query(config)
-      results.first
     end
-
   end
 end

data/lib/pattern_query_helper/version.rb

@@ -1,3 +1,3 @@
 module PatternQueryHelper
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/pattern_query_helper.rb

@@ -39,7 +39,8 @@ module PatternQueryHelper
 
     data = PatternQueryHelper::Sql.sql_query(query_config)
     data = PatternQueryHelper::Associations.load_associations(data, query_helpers[:associations], query_helpers[:as_json])
-    count = PatternQueryHelper::Sql.sql_query_count(query_config)
+    count = PatternQueryHelper::Sql.sql_query_count(data)
+    data.map! { |d| d.except(PatternQueryHelper::Sql::QUERY_COUNT_COLUMN) } if query_config[:page] or query_config[:per_page]
     pagination = PatternQueryHelper::Pagination.create_pagination_payload(count, query_helpers[:pagination])
 
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattern_query_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Evan McDaniel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler