quick_count 0.1.1 → 0.1.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96ac3ad5c0ecf19aaa83bdda2805c30221b26ae36d19a614aaa637cf2a52dbc
-  data.tar.gz: f42909f6a0a932e98329d4e4676cdc085db7aceac847fcd035746cbfd652439b
+  metadata.gz: 065e672ffe033dc29178202180bd92aa49392f2f4e7adac035df5fa3610f9f11
+  data.tar.gz: e6899dfe52b32fefc5ca800491ddc367736662da824e57c8c4dd7d2eb9282e64
 SHA512:
-  metadata.gz: 30d43a8f2dca676c28c68b8f94fb699f09c9af067f27f8cfe7a9332c6ed322e10ac745130e9e0f21b74157fb9dcdee4b696115b1483f1054eb4e60d992bcd42d
-  data.tar.gz: 0aae2ca316cb80fe2bab834bc2ed95769897db442ab186931d17fa1de2a01d923834eca1beb37518d913409a679177adf949f6a95f2b6cae4d3465046f981cc9
+  metadata.gz: 68e5ba2385e63a7871cbbf1fb5b00106ec8e7b39dd4d3523504caeb06b1183d81d86e1e4cae4a2ce923bc680a3e0bc0759d0d602ff36c32de96f6d4773c85f46
+  data.tar.gz: f3027961d2bbcfc2ab37ebbe5be729603dbd585f7511fb741f26f32213c27cfa7cdc64d8816469fde2f69686ae6a4ce94a7513aa0d57055ed4e60d14a51d2f94

data/lib/count_estimate/active_record.rb

@@ -1,11 +1,12 @@
 require 'active_support/concern'
+require 'pry'
 
 module CountEstimate
   module ActiveRecord
 
     def count_estimate
-      my_statement = ::ActiveRecord::Base.connection.quote(to_sql)
-      result = ::ActiveRecord::Base.connection.execute("SELECT count_estimate(#{my_statement})")
+      my_statement = connection.quote(to_sql)
+      result = connection.execute("SELECT count_estimate(#{my_statement})")
       result[0]["count_estimate"].to_i
     end
 

data/lib/quick_count.rb

@@ -27,49 +27,48 @@ module QuickCount
 private
 
   def self.quick_count_sql(threshold: 500000, schema: 'public')
-    <<-SQL
+    <<~SQL
       CREATE OR REPLACE FUNCTION #{schema}.quick_count(table_name text, threshold bigint default #{threshold}) RETURNS bigint AS
       $func$
       DECLARE count bigint;
       BEGIN
-          EXECUTE 'SELECT
-            CASE
-            WHEN SUM(estimate)::integer < '|| threshold ||' THEN
-              (SELECT COUNT(*) FROM "'|| table_name ||'")
-            ELSE
-              SUM(estimate)::integer
-            END AS count
-          FROM (
-            SELECT
-                ((SUM(child.reltuples::float)/greatest(SUM(child.relpages::float),1))) * (SUM(pg_relation_size(child.oid))::float / (current_setting(''block_size'')::float)) AS estimate
-            FROM pg_inherits
-                JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
-                JOIN pg_class child  ON pg_inherits.inhrelid  = child.oid
-            WHERE parent.relname = '''|| table_name ||'''
-            UNION SELECT (reltuples::float/greatest(relpages::float, 1)) * (pg_relation_size(pg_class.oid)::float / (current_setting(''block_size'')::float)) AS estimate FROM pg_class where relname='''|| table_name ||'''
-          ) AS tables' INTO count;
-          RETURN count;
+        EXECUTE 'SELECT
+          CASE
+          WHEN SUM(estimate)::integer < '|| threshold ||' THEN
+            (SELECT COUNT(*) FROM "'|| table_name ||'")
+          ELSE
+            SUM(estimate)::integer
+          END AS count
+        FROM (
+          SELECT
+              ((SUM(child.reltuples::float)/greatest(SUM(child.relpages::float),1))) * (SUM(pg_relation_size(child.oid))::float / (current_setting(''block_size'')::float)) AS estimate
+          FROM pg_inherits
+              JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
+              JOIN pg_class child  ON pg_inherits.inhrelid  = child.oid
+          WHERE parent.relname = '''|| table_name ||'''
+          UNION SELECT (reltuples::float/greatest(relpages::float, 1)) * (pg_relation_size(pg_class.oid)::float / (current_setting(''block_size'')::float)) AS estimate FROM pg_class where relname='''|| table_name ||'''
+        ) AS tables' INTO count;
+        RETURN count;
       END
       $func$ LANGUAGE plpgsql;
     SQL
   end
 
   def self.count_estimate_sql(schema: 'public')
-    <<-SQL
-        CREATE OR REPLACE FUNCTION #{schema}.count_estimate(query text) RETURNS integer AS
-        $func$
-        DECLARE
-            rec   record;
-            rows  integer;
-        BEGIN
-            FOR rec IN EXECUTE 'EXPLAIN ' || query LOOP
-                rows := substring(rec."QUERY PLAN" FROM ' rows=([[:digit:]]+)');
-                EXIT WHEN rows IS NOT NULL;
-            END LOOP;
-
-            RETURN rows;
-        END
-        $func$ LANGUAGE plpgsql;
+    <<~SQL
+      CREATE OR REPLACE FUNCTION #{schema}.count_estimate(query text) RETURNS integer AS
+      $func$
+      DECLARE
+        rec   record;
+        rows  integer;
+      BEGIN
+        FOR rec IN EXECUTE 'EXPLAIN ' || query LOOP
+          rows := substring(rec."QUERY PLAN" FROM ' rows=([[:digit:]]+)');
+          EXIT WHEN rows IS NOT NULL;
+        END LOOP;
+        RETURN rows;
+      END
+      $func$ LANGUAGE plpgsql;
     SQL
   end
 

data/lib/quick_count/active_record.rb

@@ -8,7 +8,7 @@ module QuickCount
 
       def quick_count(threshold: nil)
         threshold = threshold ? ", #{threshold}" : nil
-        result = ::ActiveRecord::Base.connection.execute("SELECT quick_count('#{table_name}'#{threshold})")
+        result = connection.execute("SELECT quick_count('#{table_name}'#{threshold})")
         result[0]["quick_count"].to_i
       end
 

data/lib/quick_count/version.rb

@@ -1,3 +1,3 @@
 module QuickCount
-  VERSION = "0.1.1"
+  VERSION = "0.1.2-1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quick_count
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2.pre.1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -68,58 +68,58 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Installs two database functions, `quick_count` and `count_estimate` for
   getting count estimations on large tables
 email:
@@ -132,10 +132,8 @@ files:
 - LICENSE
 - README.md
 - lib/count_estimate/active_record.rb
-- lib/count_estimate/active_record/relation.rb
 - lib/quick_count.rb
 - lib/quick_count/active_record.rb
-- lib/quick_count/active_record/base.rb
 - lib/quick_count/railtie.rb
 - lib/quick_count/version.rb
 homepage: https://github.com/TwilightCoders/quick_count
@@ -155,12 +153,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Quickly get an accurate count estimation for large tables.

data/lib/count_estimate/active_record/relation.rb

@@ -1,15 +0,0 @@
-require 'active_support/concern'
-
-module CountEstimate
-  module ActiveRecord
-    module Relation
-
-      def count_estimate
-        my_statement = ::ActiveRecord::Base.connection.quote(to_sql)
-        result = ::ActiveRecord::Base.connection.execute("SELECT count_estimate(#{my_statement})")
-        result[0]["count_estimate"].to_i
-      end
-
-    end
-  end
-end

data/lib/quick_count/active_record/base.rb

@@ -1,20 +0,0 @@
-require 'active_support/concern'
-
-module QuickCount
-  module ActiveRecord
-    module Base
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-
-        def quick_count(threshold: nil)
-          threshold = threshold ? ", #{threshold}" : nil
-          result = ::ActiveRecord::Base.connection.execute("SELECT quick_count('#{table_name}'#{threshold})")
-          result[0]["quick_count"].to_i
-        end
-
-      end
-
-    end
-  end
-end