Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/query_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def view_query
def execute_query
query = build_query()
@results = @model.find_by_sql([query, @bind_variables]) # Execute Sql Query
@results = @results.first if @single_record # Return a single result if requested
@results = @single_record ? @results.first : @results

determine_count()
preload_associations()
Expand Down Expand Up @@ -250,16 +250,18 @@ def determine_count
end

def load_associations
@results = Associations.load_associations(
payload: @results,
result = Associations.load_associations(
payload: Array(@results),
associations: @associations,
as_json_options: @as_json_options
)

@results = @single_record ? result.first : result
end

def preload_associations
Associations.preload_associations(
payload: @results,
payload: Array(@results),
preload: @preload
)
end
Expand Down
Loading