query_helper 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e18fef49ee5e918c533ad632c3f01a6a6748a751675dc4d917e898072ab391
-  data.tar.gz: 6125eac1ac5f019ff7e686a19abe78824fe96f3cec110f02abc8f727d847cc18
+  metadata.gz: ee722b53cba3c6bbb0657b9102e0f5a46bf15d8f8d4c661b2acd7ff1374e8b9f
+  data.tar.gz: c8749dbd254d793f8c864cd7fc85cbf6d38d8738ad8493fc54970c3e169e5915
 SHA512:
-  metadata.gz: 4a945428a4dcc38487353461705dd52e9ef5e46acf7f81b5d3a871a3161d588ed36022cf5c313d6451ba837c25b0ea47cc7f90ccee57512034d8cae89da8bdb3
-  data.tar.gz: 94ffe7976b315a38557ea21ab9faa52e8ad24a61a9f30d2c52520f63c9bd6b1385a7d756a3bc801e9fd8328a136703151ea3868fa4afe995ca51ac5a50ac078d
+  metadata.gz: 25116ab59d1f2f3f95a6741f5f17f9864436da4690f89e6ef12d770c16ecf0195eaae20c24b10cdb028e94fbac4bd1ed0317eac8985abba69cf575e02ed975ff
+  data.tar.gz: 0e734d5bbbcadfbbb734f9b8986d97eb85e81273901aeae90780523eb08a6aa8b9edbb10b930fb3623ee12d653b8185e4e034e89d458c33ce632ae1dc144609f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_helper (0.1.6)
+    query_helper (0.1.8)
       activerecord (~> 5.0)
       activesupport (~> 5.0)
 

data/lib/query_helper.rb

@@ -13,7 +13,8 @@ require "query_helper/invalid_query_error"
 
 class QueryHelper
 
-  attr_accessor :model, :query, :bind_variables, :sql_filter, :sql_sort, :page, :per_page, :single_record, :associations, :as_json_options, :executed_query, :api_payload, :preload
+  attr_accessor :model, :bind_variables, :sql_filter, :sql_sort, :page, :per_page, :single_record, :associations, :as_json_options, :executed_query, :api_payload, :preload
+  attr_reader :query
 
   def initialize(
     model: nil, # the model to run the query against
@@ -30,8 +31,8 @@ class QueryHelper
     api_payload: false, # Return the paginated payload or simply return the result array
     preload: [] # preload activerecord associations - used instead of `associations` when you don't want them included in the payload
   )
-    @model = model
-    @query = query
+    @query = query.class < ActiveRecord::Relation ? query.to_sql : query
+    @model = query.class < ActiveRecord::Relation ? query.model : model
     @bind_variables = bind_variables
     @sql_filter = sql_filter
     @sql_sort = sql_sort
@@ -65,8 +66,8 @@ class QueryHelper
     custom_mappings: nil,
     preload: []
   )
-    @model = model if model
-    @query = query if query
+    @query = query.class < ActiveRecord::Relation ? query.to_sql : query if query
+    @model = query.class < ActiveRecord::Relation ? query.model : model if model || query
     @bind_variables.merge!(bind_variables)
     filters.each{ |f| add_filter(**f) }
     @associations = @associations | associations
@@ -81,10 +82,17 @@ class QueryHelper
     @sql_filter.filter_values["comparate"] = { operator_code => criterion }
   end
 
-  def build_query
-    # Correctly set the query and model based on query type
-    determine_query_type()
+  def query=(value)
+    if value.class < ActiveRecord::Relation
+      @query = value.to_sql
+      @model = value.model
+    else
+      @query = value
+    end
+    return ""
+  end
 
+  def build_query
     # Create column maps to be used by the filter and sort objects
     column_maps = create_column_maps()
 
@@ -146,19 +154,6 @@ class QueryHelper
         data: @results }
     end
 
-    def determine_query_type
-      # If a custom sql string is passed in, make sure a valid model is passed in as well
-      if @query.class == String
-        raise InvalidQueryError.new("a valid model must be included to run a custom SQL query") unless @model < ActiveRecord::Base
-      # If an active record query is passed in, find the model and sql from the query
-      elsif @query.class < ActiveRecord::Relation
-        @model ||= @query.model
-        @query = @query.to_sql
-      else
-        raise InvalidQueryError.new("unable to determine query type")
-      end
-    end
-
     def determine_count
       # Determine total result count (unpaginated)
       if @single_record

data/lib/query_helper/version.rb

@@ -1,3 +1,3 @@
 class QueryHelper
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Evan McDaniel