fix: bug with ordering when mixing column and scope sorting

Author: ProGM

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project made by Monade Team are documented in this file. For info refer to team@monade.io
 
+## [0.4.2] - 2025-06-03
+### Fixed
+- Bug when mixing scope and column-based ordering
+
 ## [0.4.1] - 2025-02-28
 ### Fixed
 - Unsupported keys passed to `query_by` are simply ignored with a debug log, instead of an error log

lib/active_queryable.rb

@@ -219,7 +219,7 @@ def queryable_parse_order_scope(params, query)
         if current_query.respond_to?(scope, true)
           current_query.public_send(scope, v)
         else
-          current_query.order(params)
+          current_query.order({ k => v })
         end
       end || query
     end

lib/active_queryable/version.rb

@@ -2,5 +2,5 @@
 
 module ActiveQueryable
   # @return [String] the version of the gem
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

spec/active_queryable/ordering_spec.rb

@@ -15,4 +15,9 @@
     query = Person.query_by(sort: '-article_title', per: 'all')
     expect(query.to_sql).to include('ORDER BY "articles"."title" DESC')
   end
+
+  it 'order by column and scope mixed' do
+    query = Person.query_by(sort: 'name,-article_title', per: 'all')
+    expect(query.to_sql).to include('ORDER BY "people"."name" ASC, "articles"."title" DESC')
+  end
 end