Skip to content

Commit 192f58a

Browse files
Merge pull request #58 from patterninc/missing_keywords
fix: missing keywords: :records, :associations for single_record
2 parents 1c1e17b + 4cc1c1d commit 192f58a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

lib/query_helper.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def view_query
171171
def execute_query
172172
query = build_query()
173173
@results = @model.find_by_sql([query, @bind_variables]) # Execute Sql Query
174-
@results = @results.first if @single_record # Return a single result if requested
174+
@results = @single_record ? @results.first : @results
175175

176176
determine_count()
177177
preload_associations()
@@ -250,16 +250,18 @@ def determine_count
250250
end
251251

252252
def load_associations
253-
@results = Associations.load_associations(
254-
payload: @results,
253+
result = Associations.load_associations(
254+
payload: Array(@results),
255255
associations: @associations,
256256
as_json_options: @as_json_options
257257
)
258+
259+
@results = @single_record ? result.first : result
258260
end
259261

260262
def preload_associations
261263
Associations.preload_associations(
262-
payload: @results,
264+
payload: Array(@results),
263265
preload: @preload
264266
)
265267
end

0 commit comments

Comments
 (0)