Merge branch 'dev'

m-abdurrehman · Dec 9, 2019 · 666700a · 666700a
2 parents 973f4fe + 021945f
commit 666700a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## Version 3.7.1
+
+### Changes
+
+- fix for arel count
+
+### Commits
+
+- [cbe4a97](http://github.com/ddnexus/pagy/commit/cbe4a97): Type cast pagy_arel_count value to integer (#207)
+- [973f4fe](http://github.com/ddnexus/pagy/commit/973f4fe): updated link [ci skip]
+
 ## Version 3.7.0
 
 ### Changes

diff --git a/lib/config/pagy.rb b/lib/config/pagy.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.7.0)
+# Pagy initializer file (3.7.1)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

diff --git a/lib/javascripts/pagy.js b/lib/javascripts/pagy.js
@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '3.7.0';
+Pagy.version = '3.7.1';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

diff --git a/lib/pagy.rb b/lib/pagy.rb
@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.7.0'
+class Pagy ; VERSION = '3.7.1'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end

diff --git a/lib/pagy/extras/arel.rb b/lib/pagy/extras/arel.rb
@@ -23,7 +23,7 @@ def pagy_arel_count(collection)
       else
         # COUNT(*) OVER ()
         sql = Arel.star.count.over(Arel::Nodes::Grouping.new([]))
-        collection.unscope(:order).limit(1).pluck(sql).first
+        collection.unscope(:order).limit(1).pluck(sql).first.to_i
       end
     end