From 564122802d155d1a14ed836d68b3219e79fd9d35 Mon Sep 17 00:00:00 2001
From: Artem Napolskih <napolskih@gmail.com>
Date: Mon, 13 Nov 2017 09:49:59 +0500
Subject: [PATCH 1/3] chore: remove hstore dependency

---
 Gemfile                        | 3 +++
 dip.yml                        | 3 ++-
 redis_counters-dumpers.gemspec | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fa75df1..09d4e4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'activerecord-postgres-hstore', require: false
+gem 'simple_hstore_accessor', '~> 0.2', require: false
+
 gemspec
diff --git a/dip.yml b/dip.yml
index 6a4b96a..b050a00 100644
--- a/dip.yml
+++ b/dip.yml
@@ -42,5 +42,6 @@ interaction:
 provision:
   - docker volume create --name bundler_data
   - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
-  - dip bundle install --full-index
+  - dip clean
+  - dip bundle install
   - dip appraisal install
diff --git a/redis_counters-dumpers.gemspec b/redis_counters-dumpers.gemspec
index 59fd276..02031b3 100644
--- a/redis_counters-dumpers.gemspec
+++ b/redis_counters-dumpers.gemspec
@@ -23,8 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redis-namespace', '>= 1.3'
   spec.add_runtime_dependency 'callbacks_rb', '>= 0.0.1'
   spec.add_runtime_dependency 'redis_counters', '>= 1.3'
-  spec.add_runtime_dependency 'activerecord-postgres-hstore'
-  spec.add_runtime_dependency 'simple_hstore_accessor', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'

From bd94a94ab291697bd0bbf8b56576847b7a37f40a Mon Sep 17 00:00:00 2001
From: Artem Napolskih <napolskih@gmail.com>
Date: Mon, 13 Nov 2017 09:51:07 +0500
Subject: [PATCH 2/3] fix: specs for redis_counters 1.5

---
 spec/internal/db/schema.rb                     | 4 ++--
 spec/lib/redis_counters/dumpers/engine_spec.rb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/internal/db/schema.rb b/spec/internal/db/schema.rb
index be49301..d6d06ec 100644
--- a/spec/internal/db/schema.rb
+++ b/spec/internal/db/schema.rb
@@ -27,7 +27,7 @@
     t.hstore :params
   end
 
-  add_index :stats_by_days, [:record_id, :column_id, :date], unique: true
+  add_index :stats_by_days, [:record_id, :column_id, :date, :params], unique: true, name: :uq
 
   create_table :stats_totals do |t|
     t.integer :record_id, null: false
@@ -37,7 +37,7 @@
     t.hstore :params
   end
 
-  add_index :stats_totals, [:record_id, :column_id], unique: true
+  add_index :stats_totals, [:record_id, :column_id, :params], unique: true
 
   create_table :stats_agg_totals do |t|
     t.integer :record_id, null: false
diff --git a/spec/lib/redis_counters/dumpers/engine_spec.rb b/spec/lib/redis_counters/dumpers/engine_spec.rb
index fc354de..308b0e8 100644
--- a/spec/lib/redis_counters/dumpers/engine_spec.rb
+++ b/spec/lib/redis_counters/dumpers/engine_spec.rb
@@ -26,6 +26,7 @@
         key_fields :record_id, :column_id, :params
         increment_fields :hits
         map :hits, to: :value
+        map :params, to: "COALESCE(params, '')"
       end
 
       destination do

From 1c79931dc7fec9216752904fcce1d5dc85707fcf Mon Sep 17 00:00:00 2001
From: Artem Napolskih <napolskih@gmail.com>
Date: Mon, 13 Nov 2017 09:52:34 +0500
Subject: [PATCH 3/3] Release 1.2.0

---
 lib/redis_counters/dumpers/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redis_counters/dumpers/version.rb b/lib/redis_counters/dumpers/version.rb
index 9f70df4..74bd5f8 100644
--- a/lib/redis_counters/dumpers/version.rb
+++ b/lib/redis_counters/dumpers/version.rb
@@ -1,5 +1,5 @@
 module RedisCounters
   module Dumpers
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end