simple-sql 0.4.35 → 0.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e64bdc8330b5c64d7e7e17d44a008b0b54e60c9061f524bd1f66ededde5505a4
-  data.tar.gz: 0f07ebf046e8c136126bf5328d46de1dde14e4257389f490acdf4c1746f8cc0b
+  metadata.gz: a8dc1ec7e4bb737434a4bcd95b612b9e100386bbc2896d67e09b68b6c7946172
+  data.tar.gz: a3cfb7860e3c085514b4e294b7b99773cd2365292ca68e96bc81ede0c10fc8c7
 SHA512:
-  metadata.gz: 95c29b91172bfe37d18607199b7ffd103b54b1cfbafe0ba8a5f4bbb3c70b21ec0357a49783dfeab3de9e04eea536a05513e59a5e68d307bcca186fe8671f5ce0
-  data.tar.gz: 9a673939c8ea707d61a8ef105e684996237198f771e8869bfa9b824e6be591e34ef461243f486af278387f7c25ff7ff74ab43c6bbcf69bba03b26d3b51ad12e1
+  metadata.gz: e3de0a9214dce2e7fc91de037fb58dc4beef47ee066acfdf366e2b6100f1a4592436078d13c34d34cbc102be25c5281b0177aace3b5c36be30dc0ed735e3438f
+  data.tar.gz: fdb5081fae742c348157af72bcb119cc61ad88831f313fa640a64020ff6254c65ba1e662325bd684a92dda27c2d0f3bb40a7c0ef4dd8af82b3b7cdee0fdc59b9

data/lib/simple/sql/result.rb

@@ -34,15 +34,17 @@ class ::Simple::SQL::Result < Array
   #
   # This is filled in when resolving a paginated scope.
   def total_count_estimate
-    @total_count_estimate ||= catch(:total_count_estimate) do
-      scope = @pagination_scope
-      scope_sql = scope.order_by(nil).to_sql(pagination: false)
-      ::Simple::SQL.each("EXPLAIN #{scope_sql}", *scope.args) do |line|
-        next unless line =~ /\brows=(\d+)/
-
-        throw :total_count_estimate, Integer($1)
+    return @total_count_estimate if instance_variable_defined?(:@total_count_estimate)
+    
+    @total_count_estimate = if @pagination_scope
+      catch(:total_count_estimate) do
+        sql = @pagination_scope.order_by(nil).to_sql(pagination: false)
+        ::Simple::SQL.each("EXPLAIN #{sql}", *@pagination_scope.args) do |line|
+          next unless line =~ /\brows=(\d+)/
+          throw :total_count_estimate, Integer($1)
+        end
+        -1
       end
-      -1
     end
   end
 
@@ -50,17 +52,20 @@ class ::Simple::SQL::Result < Array
   #
   # This is filled in when resolving a paginated scope.
   def total_pages_estimate
-    @total_pages_estimate ||= (total_count_estimate * 1.0 / @pagination_scope.per).ceil
+    return @total_pages_estimate if instance_variable_defined?(:@total_pages_estimate)
+    
+    @total_pages_estimate = (total_count_estimate * 1.0 / @pagination_scope.per).ceil if @pagination_scope
   end
 
   # returns the total_count of search hits
   #
   # This is filled in when resolving a paginated scope.
   def total_count
-    @total_count ||= begin
-      scope = @pagination_scope
-      scope_sql = scope.order_by(nil).to_sql(pagination: false)
-      ::Simple::SQL.ask("SELECT COUNT(*) FROM (#{scope_sql}) simple_sql_count", *scope.args)
+    return @total_count if instance_variable_defined?(:@total_count)
+
+    @total_count = if @pagination_scope
+      sql = @pagination_scope.order_by(nil).to_sql(pagination: false)
+      ::Simple::SQL.ask("SELECT COUNT(*) FROM (#{sql}) _total_count", *@pagination_scope.args)
     end
   end
 
@@ -69,7 +74,9 @@ class ::Simple::SQL::Result < Array
   # This is filled in when resolving a paginated scope. It takes
   # into account the scope's "per" option.
   def total_pages
-    @total_pages ||= (total_count * 1.0 / @pagination_scope.per).ceil
+    return @total_pages if instance_variable_defined?(:@total_pages)
+
+    @total_pages = (total_count * 1.0 / @pagination_scope.per).ceil if @pagination_scope
   end
 
   # returns the current page number in a paginated search

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.35"
+    VERSION = "0.4.36"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.35
+  version: 0.4.36
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -267,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: SQL with a simple interface