effective_datatables 4.39.1 → 4.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92dbd778d7e5b63be5dfedb7137193290c21da8d1b119d7ff92e5c06474dc032
-  data.tar.gz: f044c7be5c129b36c2f437f7e7acca2fa2cecc1d1aec5e101dfa86e7debbd2d5
+  metadata.gz: 12e01bd82fc2bf197109050265f20948617f7b0e57fac56c9d83cdf0469fd080
+  data.tar.gz: 043e49461b97e3d496b5556e4c14da0ce72249a6b03108bf66482c003f0e5d54
 SHA512:
-  metadata.gz: 79f406c3eb58b786a935addd180a35c9fec5638277aea6f5280fda9f649ec714c07bb9a15fba9e45aadcdff7a7cf128f3d01a651a8af6e70b66f388b35e32097
-  data.tar.gz: ba94caf90dca5d5f69bf38c6297e5f523cea245b14b17707783a6a3d56f8c41acdeab0bd56da8475efc17e7bb5300ff1883cfa023a2fdb846e7720e5ccb0d85a
+  metadata.gz: 7a8c9b8745fcb7a477bff5ab7bc9699303a28edd8d616845f852fe949205c910b6e6e2bc453f7bd6e76105488b9e35cebbf9c42de7d4ca506eaf62777501b2a9
+  data.tar.gz: 77cc02b1405a176616ab8780e1afc21ad14f54244ccaadf4aa6575178b73c3bab28e51c4b506ffa1a6f1cf1f9a8263c2cfd2bfec823df352078c8a2c98ad2524

data/app/controllers/effective/datatables_controller.rb

@@ -67,18 +67,19 @@ module Effective
         EffectiveDatatables.authorize!(self, :update, @resource)
 
         attribute = @datatable.columns[:_reorder][:reorder]
+        column = @resource.class.arel_table[attribute]
         old_index = params[:reorder][:old].to_i
         new_index = params[:reorder][:new].to_i
 
         @resource.class.transaction do
           if new_index > old_index
-            @datatable.collection.where("#{attribute} > ? AND #{attribute} <= ?", old_index, new_index).update_all("#{attribute} = #{attribute} - 1")
+            @datatable.collection.where(column.gt(old_index).and(column.lteq(new_index))).update_all(attribute => column - 1)
             @resource.update_column(attribute, new_index)
             @resource.touch
           end
 
           if old_index > new_index
-            @datatable.collection.where("#{attribute} >= ? AND #{attribute} < ?", new_index, old_index).update_all("#{attribute} = #{attribute} + 1")
+            @datatable.collection.where(column.gteq(new_index).and(column.lt(old_index))).update_all(attribute => column + 1)
             @resource.update_column(attribute, new_index)
             @resource.touch
           end
@@ -88,7 +89,7 @@ module Effective
       rescue Effective::AccessDenied => e
         render(status: :unauthorized, body: 'Access Denied')
       rescue Exception => e
-        render(status: :error, body: 'Unexpected Error')
+        render(status: :internal_server_error, body: 'Unexpected Error')
       end
 
     end

data/app/models/effective/datatable_column_tool.rb

@@ -44,8 +44,12 @@ module Effective
     def order_column(collection, direction, column, sql_column)
       Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}" if EffectiveDatatables.debug
 
-      if column[:sql_as_column]
-        collection.order(Arel.sql("#{sql_column} #{datatable.effective_resource.sql_direction(direction)}"))
+      if column[:as] == :reorder && sql_column == column[:reorder]
+        attribute = collection.arel_table[column[:reorder]]
+        collection.order(direction.to_s.downcase == 'desc' ? attribute.desc : attribute.asc)
+      elsif column[:sql_as_column]
+        expression = Arel.sql(sql_column.to_s)
+        collection.order(direction.to_s.downcase == 'desc' ? expression.desc : expression.asc)
       else
         Effective::Resource.new(collection)
           .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column], limit: datatable.limit)
@@ -99,12 +103,7 @@ module Effective
       when Hash
         count.size  # This represents the number of displayed datatable rows, not the sum all groups (which might be more)
       else
-        if collection.klass.connection.respond_to?(:unprepared_statement)
-          collection_sql = collection.klass.connection.unprepared_statement { collection.to_sql }
-          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").rows[0][0] rescue 1)
-        else
-          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").rows[0][0] rescue 1)
-        end.to_i
+        (collection.klass.unscoped.from(collection, :datatables_total_count).count(:all) rescue 1).to_i
       end
     end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.39.1'.freeze
+  VERSION = '4.39.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.39.1
+  version: 4.39.2
 platform: ruby
 authors:
 - Code and Effect