activerecord-turntable 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4906bb6f73e98fee1490a6470ec0e6fb5d46e799
-  data.tar.gz: 6304957da987dd1e9315a3a3ce8be4b1bb720bd9
+  metadata.gz: c7d26c10b2a5821aa33e7136734bcf2e5ef25080
+  data.tar.gz: 5a4709f8c44aaf2f2d9ac437c8b1bc3ff679fa1d
 SHA512:
-  metadata.gz: 40b81ab32f081801cffa81d68921fc94b3dd6f62284d9c3cf54081c8f949203c2417c51b7e9d6a93e8bcac557d9124632d706a12eb45023f33a0a6ebaa48e95d
-  data.tar.gz: e99818a708e9b58f6d5924e6af43eb0a0f7446b50c8cfaa3c98a0bdfcb6ca1b281b62e79a39d44c1043629fd1ea08b46c1e1218d8d0200590dd356f782394df7
+  metadata.gz: c990394e1144fc5f7b20fa6c5a9a2a818e8937683676bb0c5752f26582109a17ef43c8548e8645d811884facf0e4a9a4f196a62b4025947dde23fcfcb65bfbfd
+  data.tar.gz: 7afc6bc759ecbe127e720664888576b91c3628990a02c38bdd1cf5f4af8c71dff0e426f211fee76b640d5d5c6de4f7fbcc13509690c5db6b057007340c2d4323

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## activerecord-turntable 2.0.3 ##
+
+### Bugfixes
+
+* Fix parse error on sql with binary string literal: ```x'...'```
+
 ## activerecord-turntable 2.0.2 ##
 
 ### Bugfixes

data/lib/active_record/turntable/sql_tree_patch.rb

@@ -15,6 +15,8 @@ class SQLTree::Token
   const_set('BINARY', Class.new(SQLTree::Token::Keyword))
   const_set('LIMIT', Class.new(SQLTree::Token::Keyword))
   const_set('OFFSET', Class.new(SQLTree::Token::Keyword))
+
+  BINARY_ESCAPE = Class.new(SQLTree::Token).new('x')
 end
 
 class SQLTree::Tokenizer
@@ -25,6 +27,44 @@ class SQLTree::Tokenizer
     end
     handle_token(SQLTree::Token::String.new(string), &block)
   end
+
+  # @note Override to handle x'..' binary string
+  def each_token(&block) # :yields: SQLTree::Token
+
+    while next_char
+      case current_char
+      when /^\s?$/;        # whitespace, go to next character
+      when '(';            handle_token(SQLTree::Token::LPAREN, &block)
+      when ')';            handle_token(SQLTree::Token::RPAREN, &block)
+      when '.';            handle_token(SQLTree::Token::DOT, &block)
+      when ',';            handle_token(SQLTree::Token::COMMA, &block)
+      when /\d/;           tokenize_number(&block)
+      when "'";            tokenize_quoted_string(&block)
+      when 'E', 'x', 'X';  tokenize_possible_escaped_string(&block)
+      when /\w/;           tokenize_keyword(&block)
+      when OPERATOR_CHARS; tokenize_operator(&block)
+      when SQLTree.identifier_quote_char; tokenize_quoted_identifier(&block)
+      end
+    end
+
+    # Make sure to yield any tokens that are still stashed on the queue.
+    empty_keyword_queue!(&block)
+  end
+  alias :each :each_token
+
+  def tokenize_possible_escaped_string(&block)
+    if peek_char == "'"
+      token = case current_char
+              when 'E'
+                SQLTree::Token::STRING_ESCAPE
+              when 'x', 'X'
+                SQLTree::Token::BINARY_ESCAPE
+              end
+      handle_token(token, &block)
+    else
+      tokenize_keyword(&block)
+    end
+  end
 end
 
 module SQLTree::Node
@@ -167,6 +207,65 @@ module SQLTree::Node
         @table.nil? ? quote_field_name(@name) : quote_field_name(@table) + '.' + quote_field_name(@name)
       end
     end
+
+    class EscapedValue < Value
+      def initialize(value, escape = nil)
+        @value = value
+        @escape = escape
+      end
+
+      def to_sql(options = {})
+        case value
+        when nil;            'NULL'
+        when String;         "#{escape_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 escape_string
+        @escape.to_s
+      end
+
+      def self.parse(tokens)
+        escape = tokens.next
+        case tokens.next
+        when SQLTree::Token::String
+          SQLTree::Node::Expression::EscapedValue.new(tokens.current.literal, escape.literal)
+        else
+          raise SQLTree::Parser::UnexpectedToken.new(tokens.current, :literal)
+        end
+      end
+    end
+
+    def self.parse_atomic(tokens)
+      if SQLTree::Token::LPAREN === tokens.peek
+        tokens.consume(SQLTree::Token::LPAREN)
+        expr = self.parse(tokens)
+        tokens.consume(SQLTree::Token::RPAREN)
+        expr
+      elsif tokens.peek.prefix_operator?
+        PrefixOperator.parse(tokens)
+      elsif tokens.peek.variable?
+        if SQLTree::Token::LPAREN === tokens.peek(2)
+          FunctionCall.parse(tokens)
+        elsif SQLTree::Token::DOT === tokens.peek(2)
+          Field.parse(tokens)
+        else
+          Variable.parse(tokens)
+        end
+      elsif SQLTree::Token::STRING_ESCAPE == tokens.peek
+        EscapedValue.parse(tokens)
+      elsif SQLTree::Token::BINARY_ESCAPE == tokens.peek
+        EscapedValue.parse(tokens)
+      elsif SQLTree::Token::INTERVAL === tokens.peek
+        IntervalValue.parse(tokens)
+      else
+        Value.parse(tokens)
+      end
+    end
   end
 
   class InsertQuery < Base

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

data/spec/active_record/turntable/sql_tree_patch_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'active_record/turntable/sql_tree_patch'
+
+describe SQLTree do
+  before(:all) do
+    reload_turntable!(File.join(File.dirname(__FILE__), "../../config/turntable.yml"))
+  end
+
+  context "Insert query with binary string" do
+    subject { SQLTree["INSERT INTO `hogehoge` (`name`) VALUES (x'deadbeef')"] }
+    it { expect { subject }.to_not raise_error }
+    its(:to_sql) { is_expected.to include("x'deadbeef") }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -396,6 +396,7 @@ files:
 - spec/active_record/turntable/sequencer/barrage_spec.rb
 - spec/active_record/turntable/sequencer/mysql_spec.rb
 - spec/active_record/turntable/shard_spec.rb
+- spec/active_record/turntable/sql_tree_patch_spec.rb
 - spec/active_record/turntable/transaction_spec.rb
 - spec/active_record/turntable_spec.rb
 - spec/config/database.yml
@@ -461,6 +462,7 @@ test_files:
 - spec/active_record/turntable/sequencer/barrage_spec.rb
 - spec/active_record/turntable/sequencer/mysql_spec.rb
 - spec/active_record/turntable/shard_spec.rb
+- spec/active_record/turntable/sql_tree_patch_spec.rb
 - spec/active_record/turntable/transaction_spec.rb
 - spec/active_record/turntable_spec.rb
 - spec/config/database.yml