simple-sql 0.5.8 → 0.5.9

data/spec/simple/sql/count_by_groups_spec.rb

@@ -24,7 +24,7 @@ describe "Simple::SQL::Connection::Scope#count_by" do
     end
   end
 
-  describe "fast_count_by" do
+  describe "count_by_estimate" do
     before do
       # 10_000 is chosen "magically". It is large enough to switch to the fast algorithm,
       # but 
@@ -36,9 +36,9 @@ describe "Simple::SQL::Connection::Scope#count_by" do
       create(:user, role_id: 1)
       create(:user, role_id: 1)
 
-      expect(scope.fast_count_by("role_id")).to include(1 => 4)
-      expect(scope.fast_count_by("role_id")).to include(2 => 1)
-      expect(scope.fast_count_by("role_id").keys).to contain_exactly(*all_role_ids)
+      expect(scope.count_by_estimate("role_id")).to include(1 => 4)
+      expect(scope.count_by_estimate("role_id")).to include(2 => 1)
+      expect(scope.count_by_estimate("role_id").keys).to contain_exactly(*all_role_ids)
     end
   end
 end

data/spec/simple/sql/count_spec.rb

@@ -18,12 +18,12 @@ describe "Simple::SQL::Connection::Scope#count" do
 
   describe "fast count" do
     it "counts" do
-      expect(scope.fast_count).to eq(USER_COUNT)
+      expect(scope.count_estimate).to eq(USER_COUNT)
     end
 
     it "evaluates conditions" do
-      expect(scope.where("id < $1", min_user_id).fast_count).to eq(0)
-      expect(scope.where("id <= $1", min_user_id).fast_count).to eq(1)
+      expect(scope.where("id < $1", min_user_id).count_estimate).to eq(0)
+      expect(scope.where("id <= $1", min_user_id).count_estimate).to eq(1)
     end
   end
 end

data/spec/simple/sql/result_count_spec.rb

@@ -10,7 +10,6 @@ describe "Simple::SQL::Result counts" do
     it "counts" do
       result = SQL.all(paginated_scope)
       expect(result.total_count).to eq(USER_COUNT)
-      expect(result.total_pages).to eq(USER_COUNT)
       expect(result.current_page).to eq(1)
     end
   end
@@ -19,8 +18,7 @@ describe "Simple::SQL::Result counts" do
     it "counts fast" do
       result = SQL.all(paginated_scope)
 
-      expect(result.total_fast_count).to eq(USER_COUNT)
-      expect(result.total_fast_pages).to eq(USER_COUNT)
+      expect(result.total_count_estimate).to eq(USER_COUNT)
       expect(result.current_page).to eq(1)
     end
   end
@@ -30,10 +28,8 @@ describe "Simple::SQL::Result counts" do
       result = SQL.all(scope)
 
       expect { result.total_count }.to raise_error(RuntimeError)
-      expect { result.total_pages }.to raise_error(RuntimeError)
       expect { result.current_page }.to raise_error(RuntimeError)
-      expect { result.total_fast_count }.to raise_error(RuntimeError)
-      expect { result.total_fast_pages }.to raise_error(RuntimeError)
+      expect { result.total_count_estimate }.to raise_error(RuntimeError)
     end
   end
 
@@ -46,11 +42,7 @@ describe "Simple::SQL::Result counts" do
       result = SQL.all(paginated_scope)
 
       expect(result.total_count).to eq(0)
-      expect(result.total_pages).to eq(1)
-
-      expect(result.total_fast_count).to eq(0)
-      expect(result.total_fast_pages).to eq(1)
-
+      expect(result.total_count_estimate).to eq(0)
       expect(result.current_page).to eq(1)
     end
   end

data/spec/simple/sql/scope_spec.rb

@@ -235,7 +235,6 @@ describe "Simple::SQL::Connection::Scope" do
         result = SQL.all(scope.paginate(per: 1, page: 1))
 
         expect(result).to eq([[1, 2]])
-        expect(result.total_pages).to eq(2)
         expect(result.current_page).to eq(1)
         expect(result.total_count).to eq(2)
       end
@@ -246,7 +245,6 @@ describe "Simple::SQL::Connection::Scope" do
         result = SQL.all(scope.paginate(per: 2, page: 2))
 
         expect(result).to eq([])
-        expect(result.total_pages).to eq(1)
         expect(result.current_page).to eq(2)
         expect(result.total_count).to eq(2)
       end
@@ -255,7 +253,6 @@ describe "Simple::SQL::Connection::Scope" do
         result = SQL.all(scope.paginate(per: 2, page: 1))
 
         expect(result).to eq([[1, 2], [1, 2]])
-        expect(result.total_pages).to eq(1)
         expect(result.current_page).to eq(1)
         expect(result.total_count).to eq(2)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -193,6 +193,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/db_restore
 - bin/pg
 - bin/rake
 - config/console-init.rb
@@ -231,6 +232,7 @@ files:
 - scripts/stats
 - scripts/watch
 - simple-sql.gemspec
+- spec/fixtures/booktown.sql
 - spec/manual/threadtest.rb
 - spec/simple/sql/all_into_spec.rb
 - spec/simple/sql/ask_spec.rb
@@ -281,6 +283,7 @@ signing_key:
 specification_version: 4
 summary: SQL with a simple interface
 test_files:
+- spec/fixtures/booktown.sql
 - spec/manual/threadtest.rb
 - spec/simple/sql/all_into_spec.rb
 - spec/simple/sql/ask_spec.rb