activerecord-turntable 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1d03f8216a73b1e732c4c1c22c6eda6d9843661121a2c5c85543ca6da51e32
-  data.tar.gz: e71f85959d36f0dbb806ed287ba9137a45c30645fdfafbf6d845799ab3de3fc0
+  metadata.gz: 0bb7d81afbaa8937a6f248d0b755e7a00da9d5471d5ec235d9c2bf0db14028d9
+  data.tar.gz: a67d03e3df1c3084b488f370a517c63e4d209a2590d40602b5ccbff115221997
 SHA512:
-  metadata.gz: 2bffbb3be5a6d1ccd5f4fb69a7a6c4af0c41f63f56188e6aee394979d9310f37646243ef3e3b035bf28767a2c25b70d4b10bda9544f0070b232364834476a61f
-  data.tar.gz: 72c016be4117d12955f448aba07d3f02c2262fb590e8c3b2361aeae9a307aab3d588520e28da8d3e6cb421b9649e751a05ff901fdfe4a6349577f7505730b466
+  metadata.gz: 8609ab1d338c91ae68e5681b6ac5588b5546177e35793363d0b1caaef156953a44a8cf5716dbb6b8702c7e2a3ccc4ea4a6e1cbdfa12e53492e1ab918c7c7ba17
+  data.tar.gz: 7d917139b63470b12a67e2a3eceaa075845a1510dee2202d067114d3b2ef388bfc8e85fb883b21815f25388c657388707546060055d0a38a6603be02ae499ce7

data/.travis.yml

@@ -28,6 +28,7 @@ gemfile:
   - gemfiles/rails5_1_5.gemfile
   - gemfiles/rails5_1_6.gemfile
   - gemfiles/rails5_2_0.gemfile
+  - gemfiles/rails5_2_1.gemfile
   - gemfiles/rails_edge.gemfile
 
 env:
@@ -40,8 +41,6 @@ services:
 
 before_install:
   - docker run -d --name turntable-katsubushi -p 11212:11212 katsubushi/katsubushi:latest -worker-id 1
-  - gem update --system
-  - gem install bundler --no-doc
 
 before_script:
   - bundle exec rake $SETUP_TASK
@@ -61,10 +60,12 @@ matrix:
       gemfile: gemfiles/rails5_0_7.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/rails5_1_6.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails5_2_1.gemfile
     - rvm: 2.3.7
-      gemfile: gemfiles/rails5_1_6.gemfile
+      gemfile: gemfiles/rails5_2_1.gemfile
     - rvm: 2.4.4
-      gemfile: gemfiles/rails5_1_6.gemfile
+      gemfile: gemfiles/rails5_2_1.gemfile
     - rvm: 2.5.1
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## activerecord-turntable 4.4.0 ##
+
+### Major Changes
+
+* Support activerecord v5.2.1
+
+### Bugfixes
+
+* Fix sql parser error when inserting boolean value with rails version 5.2.0 or later
+
 ## activerecord-turntable 4.3.0 ##
 
 ### Bugfixes

data/Gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", "5.2.0"
+gem "rails", "5.2.1"
 
-gem "actionview", "5.2.0"
-gem "activerecord", "5.2.0"
-gem "activesupport", "5.2.0"
+gem "actionview", "5.2.1"
+gem "activerecord", "5.2.1"
+gem "activesupport", "5.2.1"

data/README.md

@@ -27,7 +27,7 @@ MySQL only.
 Add to Gemfile:
 
 ```ruby
-gem 'activerecord-turntable', '~> 4.3.0'
+gem 'activerecord-turntable', '~> 4.4.0'
 ```
 
 Run a bundle install:

data/activerecord-turntable.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "guard-rubocop"
   spec.add_development_dependency "httpclient", ">= 0"
-  spec.add_development_dependency "mysql2", "~> 0.4.4"
+  spec.add_development_dependency "mysql2", ">= 0.4.4", "< 0.6.0"
   spec.add_development_dependency "onkcop"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"

data/gemfiles/rails5_2_0.gemfile

@@ -5,5 +5,6 @@ gem "railties", "5.2.0"
 gem "activerecord", "5.2.0"
 gem "activesupport", "5.2.0"
 gem "actionview", "5.2.0"
+gem "mysql2", "~> 0.5.2"
 
 gemspec :path => '../'

data/gemfiles/rails5_2_1.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "rails", "5.2.1"
+gem "railties", "5.2.1"
+gem "activerecord", "5.2.1"
+gem "activesupport", "5.2.1"
+gem "actionview", "5.2.1"
+gem "mysql2", "~> 0.5.2"
+
+gemspec :path => '../'

data/lib/active_record/turntable/pool_proxy.rb

@@ -12,7 +12,7 @@ module ActiveRecord::Turntable
     end
 
     delegate :connected?, :checkout_timeout, :automatic_reconnect, :automatic_reconnect=, :checkout_timeout, :checkout_timeout=, :dead_connection_timeout,
-             :spec, :connections, :size, :reaper, :table_exists?, :query_cache_enabled, :enable_query_cache!, :schema_cache, :schema_cache=, to: :proxy
+             :spec, :connections, :size, :reaper, :table_exists?, :query_cache_enabled, :enable_query_cache!, :disable_query_cache!, :schema_cache, :schema_cache=, to: :proxy
 
     %w(columns_hash column_defaults primary_keys).each do |name|
       define_method(name.to_sym) do

data/lib/active_record/turntable/sql_tree_patch.rb

@@ -10,7 +10,7 @@ module SQLTree
 end
 
 class SQLTree::Token
-  extended_keywords = %w(BINARY LIMIT OFFSET INDEX KEY USE FORCE IGNORE)
+  extended_keywords = %w(BINARY LIMIT OFFSET INDEX KEY USE FORCE IGNORE TRUE FALSE)
   KEYWORDS.concat(extended_keywords)
 
   extended_keywords.each do |kwd|
@@ -264,6 +264,34 @@ module SQLTree::Node
 
     class Value
       leaf :escape
+
+      def to_sql(options = {})
+        case value
+        when nil;            'NULL'
+        when true;           'TRUE'
+        when false;          'FALSE'
+        when String;         quote_str(@value)
+        when Numeric;        @value.to_s
+        when Date;           @value.strftime("'%Y-%m-%d'")
+        when DateTime, Time; @value.strftime("'%Y-%m-%d %H:%M:%S'")
+        else raise "Don't know how te represent this value in SQL!"
+        end
+      end
+
+      def self.parse(tokens)
+        case tokens.next
+        when SQLTree::Token::String, SQLTree::Token::Number
+          SQLTree::Node::Expression::Value.new(tokens.current.literal)
+        when SQLTree::Token::NULL
+          SQLTree::Node::Expression::Value.new(nil)
+        when SQLTree::Token::TRUE
+          SQLTree::Node::Expression::Value.new(true)
+        when SQLTree::Token::FALSE
+          SQLTree::Node::Expression::Value.new(false)
+        else
+          raise SQLTree::Parser::UnexpectedToken.new(tokens.current, :literal)
+        end
+      end
     end
 
     class EscapedValue < Value

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "4.3.0".freeze
+    VERSION = "4.4.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -209,16 +209,22 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: onkcop
   requirement: !ruby/object:Gem::Requirement
@@ -539,6 +545,7 @@ files:
 - gemfiles/rails5_1_5.gemfile
 - gemfiles/rails5_1_6.gemfile
 - gemfiles/rails5_2_0.gemfile
+- gemfiles/rails5_2_1.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb