simple-sql 0.4.36 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8dc1ec7e4bb737434a4bcd95b612b9e100386bbc2896d67e09b68b6c7946172
-  data.tar.gz: a3cfb7860e3c085514b4e294b7b99773cd2365292ca68e96bc81ede0c10fc8c7
+  metadata.gz: eb4ff06bf7f2aeba2ded053177b20b1db9630ee1f2534672e9bb5616a1d6ad93
+  data.tar.gz: 9ec867c270c8e4b263e61b0e222748d663021a40da6e650f2b072165e66eef21
 SHA512:
-  metadata.gz: e3de0a9214dce2e7fc91de037fb58dc4beef47ee066acfdf366e2b6100f1a4592436078d13c34d34cbc102be25c5281b0177aace3b5c36be30dc0ed735e3438f
-  data.tar.gz: fdb5081fae742c348157af72bcb119cc61ad88831f313fa640a64020ff6254c65ba1e662325bd684a92dda27c2d0f3bb40a7c0ef4dd8af82b3b7cdee0fdc59b9
+  metadata.gz: 4ecf49aa237ba87bb1cab4aa026eb3ce7dbaf123e0b161a0d9fd997e47aaf46bdba454a1f85f864ac8e85bd733ffd805fdc97df0d6981764ddb32642b5e24829
+  data.tar.gz: 8d54d93bcbfb5c06ce8be25264bf3b1f10cf0eb0039b60ea05350d0b2da23d1888d561ead99eddd984400b0cb3c6d48ada81f4bcc81a9ba6859c4a482383c904

data/lib/simple/sql/result.rb

@@ -35,17 +35,8 @@ class ::Simple::SQL::Result < Array
   # This is filled in when resolving a paginated scope.
   def total_count_estimate
     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
-    end
+
+    @total_count_estimate = _total_count_estimate
   end
 
   # returns the estimated total number of pages of search hits
@@ -53,7 +44,7 @@ class ::Simple::SQL::Result < Array
   # This is filled in when resolving a paginated scope.
   def total_pages_estimate
     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
 
@@ -63,10 +54,7 @@ class ::Simple::SQL::Result < Array
   def total_count
     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
+    @total_count = _total_count
   end
 
   # returns the total number of pages of search hits
@@ -104,4 +92,23 @@ class ::Simple::SQL::Result < Array
       @pagination_scope = scope
     end
   end
+
+  def _total_count_estimate
+    return unless @pagination_scope
+
+    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+)/
+      return Integer($1)
+    end
+
+    -1
+  end
+
+  def _total_count
+    return unless @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

data/lib/simple/sql/version.rb

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

data/lib/simple/sql.rb

@@ -35,6 +35,11 @@ module Simple
       Connection.create(database_url)
     end
 
+    # deprecated
+    def configuration
+      Config.parse_url(Config.determine_url)
+    end
+
     # -- default connection ---------------------------------------------------
 
     DEFAULT_CONNECTION_KEY = :"Simple::SQL.default_connection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.4.37
 platform: ruby
 authors:
 - radiospiel