activerecord-turntable 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa472cf634328899013e975790cca934f62d5b34
-  data.tar.gz: 345bb3bc47f17141e12dfe9a0b2179d4e8db5f07
+  metadata.gz: 1d9d385f15413261bc87c1e2444193c53a9ee657
+  data.tar.gz: '009577b936eded2be655a3b850787a14dfd03cbf'
 SHA512:
-  metadata.gz: 9996e3262e5887a1ec95e6355dac2f3d3aaaa5d10e580dbc1e7e6ffcdfedc8af75cd6cc7cbef9f0551961cc38d25123c883d42e4a6e10f0f0ee34a327d915b91
-  data.tar.gz: f47e0368705ac7b0073721544feef5838aca511c7c26464957e173700a8ef73ec9f3d0741706384bb792e271149a6e27355d4d1481ed8bf275c7d75f8fe383d1
+  metadata.gz: ce1c55a07c1b94377e206d4cf97b2fbb961bb0bf1025d0150c540771eff0fa56df3f0360741b4102aaef698c5913da463fc459c23016b7c28c699fac79e5c548
+  data.tar.gz: e74cfd821f2c84ddeec7a950335a017f8cc058cece9daee3ce2f5c3a67a3969009a5486714cd822eef412c6f01f595e001f8685f1bce4cdb82f750951ea008e5

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.3
   - ruby-head
 gemfile:
   - gemfiles/rails4_0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## activerecord-turntable 2.4.0 ##
+
+### Incompatible Change
+
+* Drop support for ruby 1.9.3
+
+### Bugfix
+
+* Update activerecord 4.2 patches
+  * Fixes optimistic locking with a serialized column causes JSON::Error.
+
 ## activerecord-turntable 2.3.3 ##
 
 ### Bugfix

data/Rakefile

@@ -62,6 +62,7 @@ namespace :turntable do
           t.belongs_to :user, :null => false
           t.integer    :hp,   :null => false, :default => 0
           t.integer    :mp,   :null => false, :default => 0
+          t.text       :data
           t.integer    :lock_version, :null => false, :default => 0
           t.datetime   :deleted_at, :default => nil
           t.timestamps

data/activerecord-turntable.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency "activerecord",  ">= 4.0.0", "< 5.0"
   spec.add_runtime_dependency "activesupport", ">= 4.0.0", "< 5.0"
@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mysql2"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "rack", "< 2"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "fabrication"
@@ -47,6 +47,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "pry-byebug"
   end
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "listen", "= 3.0.6"
   spec.add_development_dependency "coveralls"
 
   if RUBY_PLATFORM =~ /darwin/

data/lib/active_record/turntable/active_record_ext/abstract_adapter.rb

@@ -7,13 +7,14 @@ module ActiveRecord::Turntable
         protected
 
         # @note override for logging current shard name
-        def log(sql, name = "SQL", binds = [])
+        def log(sql, name = "SQL", binds = [], statement_name = nil)
           @instrumenter.instrument(
                                    "sql.active_record",
-                                   :sql           => sql,
-                                   :name          => name,
-                                   :connection_id => object_id,
-                                   :binds         => binds,
+                                   :sql            => sql,
+                                   :name           => name,
+                                   :connection_id  => object_id,
+                                   :statement_name => statement_name,
+                                   :binds          => binds,
                                    :turntable_shard_name => turntable_shard_name) { yield }
         rescue Exception => e
           message = "#{e.class.name}: #{e.message}: #{sql} : #{turntable_shard_name}"

data/lib/active_record/turntable/active_record_ext/locking_optimistic.rb

@@ -122,10 +122,10 @@ module ActiveRecord::Turntable
                 relation = self.class.unscoped
 
                 condition_scope = relation.where(
-                  relation.table[self.class.primary_key].eq(id).and(
-                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
-                  )
+                  self.class.primary_key => id,
+                  lock_col => previous_lock_value,
                 )
+
                 if klass.turntable_enabled? and klass.primary_key != klass.turntable_shard_key.to_s
                   condition_scope = condition_scope.where(
                     relation.table[klass.turntable_shard_key].eq(
@@ -134,13 +134,12 @@ module ActiveRecord::Turntable
                   )
                 end
 
-                stmt = condition_scope.arel.compile_update(
-                  arel_attributes_with_values_for_update(attribute_names),
-                  self.class.primary_key
+                affected_rows = condition_scope.update_all(
+                  Hash[attributes_for_update(attribute_names).map do |name|
+                    [name, _read_attribute(name)]
+                  end]
                 )
 
-                affected_rows = self.class.connection.update stmt
-
                 unless affected_rows == 1
                   raise ActiveRecord::StaleObjectError.new(self, "update")
                 end

data/lib/active_record/turntable/active_record_ext/schema_dumper.rb

@@ -32,14 +32,20 @@ module ActiveRecord::Turntable
           if pkcol
             if pk != 'id'
               tbl.print %Q(, primary_key: "#{pk}")
+            elsif pkcol.sql_type == 'bigint'
+              tbl.print ", id: :bigserial"
             elsif pkcol.sql_type == 'uuid'
               tbl.print ", id: :uuid"
-              tbl.print %Q(, default: "#{pkcol.default_function}") if pkcol.default_function
+              tbl.print %Q(, default: "#{pkcol.default_function.inspect}")
             end
           else
             tbl.print ", id: false"
           end
-          tbl.print ", force: true"
+          if Util.earlier_than_ar42?
+            tbl.print ", force: true"
+          else
+            tbl.print ", force: :cascade"
+          end
           tbl.puts " do |t|"
 
           # then dump all non-primary key columns

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.3.3"
+    VERSION = "2.4.0"
   end
 end

data/spec/active_record/turntable/active_record_ext/locking_optimistic_spec.rb

@@ -10,10 +10,14 @@ describe ActiveRecord::Turntable::ActiveRecordExt::LockingOptimistic do
     truncate_shard
   end
 
-  before do
+  before(:each) do
     ActiveRecord::Base.turntable_config.instance_variable_get(:@config)[:raise_on_not_specified_shard_update] = true
   end
 
+  after(:each) do
+    ActiveRecord::Base.turntable_config.instance_variable_get(:@config)[:raise_on_not_specified_shard_update] = false
+  end
+
   let!(:user_status) do
     user_status = UserStatus.new(user_id: 1)
     user_status.id = 10
@@ -25,4 +29,13 @@ describe ActiveRecord::Turntable::ActiveRecordExt::LockingOptimistic do
     subject { user_status.update_attributes(hp: 20) }
     it { expect { subject }.to change(user_status, :lock_version).by(1) }
   end
+
+  describe "Json serialized column is saved" do
+    before do
+      user_status.update_attributes(data: {foo: 'bar'})
+      user_status.reload
+    end
+    subject { user_status.data }
+    it { expect { subject }.to_not raise_error }
+  end
 end

data/spec/models/user_status.rb

@@ -3,4 +3,5 @@ class UserStatus < ActiveRecord::Base
   turntable :user_cluster, :user_id
   sequencer :user_seq
   belongs_to :user
+  serialize :data, JSON
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,30 +153,30 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +289,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -464,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -472,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord sharding extension
@@ -524,4 +538,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
-has_rdoc: