RubyGems - activetokyocabinet - Versions diffs - 0.1.3 → 0.1.4 - Mend

activetokyocabinet 0.1.3 → 0.1.4

Files changed (11) hide show

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb +32 -0
data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb +37 -1
data/lib/active_tokyocabinet/sqlparser.tab.rb +232 -216
data/lib/active_tokyocabinet/sqlparser.y +16 -9
data/lib/active_tokyocabinet/tdb.rb +4 -0
data/spec/spec_helper.rb +53 -20
data/spec/tcspec2ttspec.sh +2 -0
data/spec/tokyocabinet_spec.rb +481 -0
data/spec/tokyotyrant_spec.rb +481 -0
metadata +4 -2
data/spec/activetokyocabinet_spec.rb +0 -260

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb CHANGED Viewed

@@ -60,6 +60,38 @@ module ActiveRecord
         File.join(@config[:database], table_name + ".tct")
       end
       private :tdbpath
+      def setindex(table_name, name, type)
+        type = {
+          :lexical => TokyoCabinet::TDB::ITLEXICAL,
+          :decimal => TokyoCabinet::TDB::ITDECIMAL,
+          :token   => TokyoCabinet::TDB::ITTOKEN,
+          :qgram   => TokyoCabinet::TDB::ITQGRAM,
+          :void    => TokyoCabinet::TDB::ITVOID,
+          :keep    => TokyoCabinet::TDB::ITKEEP,
+        }.fetch(type)
+        name = name.to_s
+        path = tdbpath(table_name)
+        tdb = TokyoCabinet::TDB::new
+        unless tdb.open(path, TokyoCabinet::TDB::OWRITER | TokyoCabinet::TDB::OCREAT)
+          ecode = tdb.ecode
+          raise "%s: %s" % [tdb.errmsg(ecode), path]
+        end
+        begin
+          unless tdb.setindex(name, type)
+            ecode = tdb.ecode
+            raise "%s: %s" % [tdb.errmsg(ecode), path]
+          end
+        ensure
+          unless tdb.close
+            ecode = tdb.ecode
+            raise tdb.errmsg(ecode)
+          end
+        end
+      end
     end
   end
 end

data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb CHANGED Viewed

@@ -58,7 +58,7 @@ module ActiveRecord
           unless tdb.open(host, port, timeout)
             ecode = tdb.ecode
-            raise "%s: %s" % [tdb.errmsg(ecode), path]
+            raise "%s: %s:%s" % [tdb.errmsg(ecode), host, port]
           end
         end
@@ -66,6 +66,42 @@ module ActiveRecord
         @connection[table_name] = tdb
       end
       private :tdbopen
+      def setindex(table_name, name, type)
+        type = {
+          :lexical => TokyoTyrant::RDBTBL::ITLEXICAL,
+          :decimal => TokyoTyrant::RDBTBL::ITDECIMAL,
+          :token   => TokyoTyrant::RDBTBL::ITTOKEN,
+          :qgram   => TokyoTyrant::RDBTBL::ITQGRAM,
+          :opt     => TokyoTyrant::RDBTBL::ITOPT,
+          :void    => TokyoTyrant::RDBTBL::ITVOID,
+          :keep    => TokyoTyrant::RDBTBL::ITKEEP,
+        }.fetch(type)
+        name = name.to_s
+        unless (tdb = @connection[table_name])
+          host, port, timeout = @database.fetch(table_name).values_at(:host, :port, :timeout)
+          tdb = TokyoTyrant::RDBTBL::new
+          unless tdb.open(host, port, timeout)
+            ecode = tdb.ecode
+            raise "%s: %s:%s" % [tdb.errmsg(ecode), host, port]
+          end
+        end
+        begin
+          unless tdb.setindex(name, type)
+            ecode = tdb.ecode
+            raise "%s: %s:%s" % [tdb.errmsg(ecode), host, port]
+          end
+        ensure
+          unless tdb.close
+            ecode = tdb.ecode
+            raise tdb.errmsg(ecode)
+          end
+        end
+      end
     end
   end
 end

data/lib/active_tokyocabinet/sqlparser.tab.rb CHANGED Viewed

@@ -13,7 +13,7 @@ module ActiveTokyoCabinet
 class SQLParser < Racc::Parser
-module_eval(<<'...end sqlparser.y/module_eval...', 'sqlparser.y', 198)
+module_eval(<<'...end sqlparser.y/module_eval...', 'sqlparser.y', 205)
 def initialize(obj)
   src = obj.is_a?(IO) ? obj.read : obj.to_s
@@ -26,7 +26,7 @@ def scan
   until @ss.eos?
     if (tok = @ss.scan /\s+/)
       # nothing to do
-    elsif (tok = @ss.scan /(?:BW|EW|INCALL|INCANY|INC|IN|EQANY|REGEXP|BETWEEN|FTS|FTSALL|FTSANY|FTSEX)\b/i)
+    elsif (tok = @ss.scan /(?:BW|EW|INCALL|INCANY|INC|IN|ANYONE|REGEXP|BT|BETWEEN|FTS|FTSAND|FTSOR|FTSEX)\b/i)
       yield tok.upcase.to_sym, tok
     elsif (tok = @ss.scan /(?:>=|<=|>|<|=)/)
       yield tok, tok
@@ -75,7 +75,7 @@ def tccond(op, expr)
     :QCSTRAND
   when 'INCANY'
     :QCSTROR
-  when 'IN', 'EQANY'
+  when 'IN', 'ANYONE'
     expr.all? {|i| i.kind_of?(Numeric) } ? :QCNUMOREQ : :QCSTROREQ
   when 'REGEXP'
     :QCSTRRX
@@ -87,13 +87,13 @@ def tccond(op, expr)
     :QCNUMLT
   when '<='
     :QCNUMLE
-  when 'BETWEEN'
+  when 'BT', 'BETWEEN'
     :QCNUMBT
   when 'FTS'
     :QCFTSPH
-  when 'FTSALL'
+  when 'FTSAND'
     :QCFTSAND
-  when 'FTSANY'
+  when 'FTSOR'
     :QCFTSOR
   when 'FTSEX'
     :QCFTSEX
@@ -123,170 +123,174 @@ private :tcordertype
 ##### State transition tables begin ###
 racc_action_table = [
-    72,    75,    34,    62,    63,    26,    10,    10,    34,    54,
-    64,    34,    64,    10,    42,    79,    81,    83,    85,    68,
-    69,    71,    73,    74,    76,    77,    78,    80,    82,    84,
-    67,    96,    10,     2,    10,    47,    64,    37,     9,    94,
-    61,   120,   116,   115,    46,    46,    19,    59,    15,    10,
-    86,    34,    10,     1,    57,    58,     4,    10,    10,    26,
-   114,   114,   114,    10,    59,    10,    59,    32,    59,    10,
-    59,    57,    58,    57,    58,    57,    58,    57,    58,    59,
-    86,    59,    88,    89,    88,    91,    57,    58,    57,    58,
-    28,    93,    27,    43,    95,    25,    10,   100,   101,    23,
-   100,   104,    10,    21,   109,   110,    10,   109,    14,    13,
-    12,   117,   119,    10,    10 ]
+    74,    77,    96,    80,    63,    64,    26,    34,    34,    56,
+    10,    65,    10,    88,    65,    98,    83,    85,    87,    69,
+    71,    72,    75,    76,    78,    79,    81,    82,    84,    86,
+    68,    70,    60,     2,    10,    49,    65,    10,     8,    58,
+    59,    62,   119,   120,    47,    47,   125,    20,    38,    15,
+    10,    10,    10,    34,     1,    34,    88,     4,    10,    10,
+    90,    27,   118,   118,    10,    10,   118,    60,    42,    60,
+    90,    60,    92,    60,    58,    59,    58,    59,    58,    59,
+    58,    59,    60,    93,    60,    32,    60,    95,    60,    58,
+    59,    58,    59,    58,    59,    58,    59,    10,    28,    97,
+    27,    43,    25,   103,   104,    10,    10,   107,    23,    10,
+   111,   112,   114,    10,   112,    21,    14,    13,    12,   122,
+   124,    10,   103 ]
 racc_action_check = [
-    49,    49,    29,    46,    46,    18,    32,    26,    35,    38,
-    64,    40,    86,    42,    29,    49,    49,    49,    49,    49,
-    49,    49,    49,    49,    49,    49,    49,    49,    49,    49,
-    49,    70,    64,     0,    86,    34,    47,    27,     0,    65,
-    44,   113,   107,   106,    34,    47,     9,    70,     9,    25,
-    65,    24,    27,     0,    70,    70,     0,    34,    47,    44,
-   113,   107,   106,     9,    96,    28,    93,    22,    43,    21,
-   104,    96,    96,    93,    93,    43,    43,   104,   104,    62,
-    50,   114,    53,    54,    55,    61,    62,    62,   114,   114,
-    20,    63,    19,    31,    66,    16,    14,    87,    88,    13,
-    90,    91,    12,    11,    99,   100,   101,   103,     4,     3,
-     2,   109,   111,     1,    89 ]
+    51,    51,    66,    51,    47,    47,    17,    35,    36,    39,
+    42,    88,    27,    66,    65,    73,    51,    51,    51,    51,
+    51,    51,    51,    51,    51,    51,    51,    51,    51,    51,
+    51,    51,    73,     0,    88,    34,    49,    65,     0,    73,
+    73,    44,   109,   110,    34,    49,   117,     8,    28,     8,
+    26,    32,    25,    24,     0,    29,    52,     0,    34,    49,
+    54,    44,   109,   110,    28,     8,   117,   107,    29,    95,
+    55,    98,    56,    63,   107,   107,    95,    95,    98,    98,
+    63,    63,    43,    62,   111,    22,    80,    64,   118,    43,
+    43,   111,   111,    80,    80,   118,   118,    21,    20,    67,
+    19,    31,    16,    89,    90,    14,    92,    93,    13,    12,
+   100,   102,   103,   104,   105,    11,     4,     3,     2,   112,
+   115,     1,    91 ]
 racc_action_pointer = [
-    31,    87,   107,   109,   100,   nil,   nil,   nil,   nil,    37,
-   nil,    80,    76,    99,    70,   nil,    87,   nil,   -19,    88,
-    82,    43,    63,   nil,    39,    23,   -19,    26,    39,   -10,
-   nil,    79,   -20,   nil,    31,    -4,   nil,   nil,     4,   nil,
-    -1,   nil,   -13,    48,    35,   nil,   -11,    32,   nil,   -14,
-    64,   nil,   nil,    65,    73,    67,   nil,   nil,   nil,   nil,
-   nil,    79,    59,    87,     6,    34,    89,   nil,   nil,   nil,
-    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     8,    78,    80,    88,
-    81,    97,   nil,    46,   nil,   nil,    44,   nil,   nil,    83,
-    85,    80,   nil,    86,    50,   nil,    38,    37,   nil,    91,
-   nil,    95,   nil,    36,    61,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+    31,    94,   115,   117,   108,   nil,   nil,   nil,    38,   nil,
+   nil,    91,    82,   108,    78,   nil,    94,    -2,   nil,    75,
+    94,    70,    81,   nil,    41,    25,    23,   -15,    37,    43,
+   nil,    87,    24,   nil,    31,    -5,    -4,   nil,   nil,     4,
+   nil,   nil,   -17,    61,    36,   nil,   nil,   -10,   nil,    32,
+   nil,   -14,    40,   nil,    42,    52,    62,   nil,   nil,   nil,
+   nil,   nil,    77,    52,    83,    10,    -3,    94,   nil,   nil,
+   nil,   nil,   nil,    11,   nil,   nil,   nil,   nil,   nil,   nil,
+    65,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     7,    83,
+    85,   102,    79,   103,   nil,    48,   nil,   nil,    50,   nil,
+    94,   nil,    89,    91,    86,    92,   nil,    46,   nil,    37,
+    38,    63,    98,   nil,   nil,   102,   nil,    41,    67,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 racc_action_default = [
-   -66,   -66,   -66,   -66,   -66,    -1,    -2,    -3,    -4,   -66,
-   -40,   -66,   -66,   -66,   -66,   -12,   -66,   -41,   -13,   -66,
-   -66,   -66,   -66,   122,   -14,   -66,   -66,   -66,   -66,   -14,
-   -36,   -66,   -66,   -39,   -66,   -14,   -42,   -10,   -66,   -11,
-   -14,   -35,   -66,   -66,   -66,   -23,   -66,   -66,   -15,   -66,
-   -16,   -17,   -21,   -27,    -8,   -27,   -37,   -43,   -45,   -44,
-   -38,   -66,   -66,   -66,   -66,   -66,   -66,   -64,   -52,   -54,
-   -66,   -55,   -65,   -56,   -57,   -53,   -58,   -59,   -60,   -48,
-   -61,   -49,   -62,   -50,   -63,   -51,   -66,   -31,   -66,   -66,
-   -31,   -66,   -19,   -66,   -24,   -18,   -66,   -25,   -22,   -33,
-   -66,   -66,    -9,   -33,   -66,   -46,   -66,   -66,    -7,   -66,
-   -32,   -29,    -6,   -66,   -66,   -20,   -26,   -34,   -28,   -30,
-    -5,   -47 ]
+   -68,   -68,   -68,   -68,   -68,    -1,    -2,    -3,   -68,    -4,
+   -42,   -68,   -68,   -68,   -68,   -12,   -68,   -68,   -43,   -13,
+   -68,   -68,   -68,   127,   -14,   -68,   -68,   -68,   -68,   -14,
+   -38,   -68,   -68,   -41,   -68,   -14,   -14,   -44,   -10,   -68,
+   -11,   -37,   -68,   -68,   -68,   -21,   -23,   -68,   -27,   -68,
+   -15,   -68,   -16,   -17,   -29,   -29,    -8,   -39,   -45,   -47,
+   -46,   -40,   -68,   -68,   -68,   -68,   -68,   -68,   -65,   -53,
+   -66,   -54,   -56,   -68,   -67,   -57,   -58,   -55,   -59,   -60,
+   -68,   -61,   -62,   -50,   -63,   -51,   -64,   -52,   -68,   -33,
+   -68,   -33,   -68,   -68,   -19,   -68,   -24,   -18,   -68,   -25,
+   -68,   -22,   -35,   -68,   -68,   -35,    -9,   -68,   -48,   -68,
+   -68,   -68,   -68,    -6,   -34,   -31,    -7,   -68,   -68,   -20,
+   -26,   -28,   -36,   -30,   -32,    -5,   -49 ]
 racc_goto_table = [
-    11,    30,    60,    51,    50,    18,   106,    33,    17,   107,
-   108,    22,    41,    24,   112,     8,    66,   113,    53,     7,
-    31,    92,    56,    55,    35,    36,    39,    40,    44,    97,
-    99,    17,    87,   103,    90,    16,    38,    48,    20,     6,
-     5,    31,    98,    70,   118,    29,     3,   nil,   nil,   nil,
+    11,    53,    61,   109,    19,    52,   110,    18,    30,   113,
+     9,    22,   116,    24,     7,   117,    67,   102,    17,   105,
+    31,    39,    94,    50,    35,    36,    37,    40,    44,    57,
+    16,    18,    99,    33,    89,    91,     6,     5,    41,   100,
+   101,    31,    73,   123,    54,    55,    29,     3,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   102,   nil,
+   121,   nil,   nil,   nil,   nil,   nil,   nil,   126,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   111 ]
+   nil,   106,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   115 ]
 racc_goto_check = [
-     6,    25,    19,    18,    17,     7,     8,    10,     6,     8,
-    13,     6,    10,     6,    13,     5,    18,     8,    10,     4,
-     6,    19,    25,    10,     6,     6,     6,     6,     7,    19,
-    12,     6,    11,    12,    11,    14,    15,    16,     9,     3,
-     2,     6,    20,    22,    23,    24,     1,   nil,   nil,   nil,
+     6,    18,    19,     8,     7,    17,     8,     6,    26,    13,
+     5,     6,    13,     6,     4,     8,    18,    12,    14,    12,
+     6,    15,    19,    16,     6,     6,     6,     6,     7,    26,
+     9,     6,    19,    10,    11,    11,     3,     2,    10,    19,
+    20,     6,    22,    24,    10,    10,    25,     1,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    19,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,
+    19,   nil,   nil,   nil,   nil,   nil,   nil,    19,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     6 ]
+   nil,     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     6 ]
 racc_goto_pointer = [
-   nil,    46,    40,    39,    19,    15,    -1,    -4,   -87,    29,
-   -17,   -21,   -57,   -89,    26,     9,     3,   -30,   -31,   -41,
-   -44,   nil,    -6,   -67,    24,   -20 ]
+   nil,    47,    37,    36,    14,    10,    -1,    -4,   -92,    22,
+     9,   -20,   -72,   -93,    10,    -7,   -11,   -29,   -33,   -41,
+   -48,   nil,    -9,   nil,   -72,    25,   -13 ]
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    65,   nil,   105,
-    52,    45,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil,   nil,    51,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    66,   nil,   108,
+    45,    46,   nil,    48,   nil,   nil,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  10, 47, :_reduce_5,
-  8, 48, :_reduce_6,
-  8, 48, :_reduce_7,
-  4, 59, :_reduce_8,
-  6, 59, :_reduce_9,
-  1, 60, :_reduce_none,
-  1, 60, :_reduce_none,
-  1, 54, :_reduce_12,
-  1, 54, :_reduce_none,
-  0, 55, :_reduce_14,
-  2, 55, :_reduce_15,
-  2, 55, :_reduce_16,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  10, 48, :_reduce_5,
+  8, 49, :_reduce_6,
+  8, 49, :_reduce_7,
+  4, 60, :_reduce_8,
+  6, 60, :_reduce_9,
   1, 61, :_reduce_none,
-  3, 61, :_reduce_18,
-  3, 63, :_reduce_19,
-  5, 63, :_reduce_20,
-  1, 62, :_reduce_21,
-  3, 62, :_reduce_22,
-  1, 65, :_reduce_none,
-  3, 65, :_reduce_24,
-  3, 66, :_reduce_25,
-  5, 66, :_reduce_26,
-  0, 56, :_reduce_27,
-  4, 56, :_reduce_28,
-  0, 68, :_reduce_29,
-  1, 68, :_reduce_none,
-  0, 57, :_reduce_31,
-  2, 57, :_reduce_32,
+  1, 61, :_reduce_none,
+  1, 55, :_reduce_12,
+  1, 55, :_reduce_none,
+  0, 56, :_reduce_14,
+  2, 56, :_reduce_15,
+  2, 56, :_reduce_16,
+  1, 62, :_reduce_none,
+  3, 62, :_reduce_18,
+  3, 64, :_reduce_19,
+  5, 64, :_reduce_20,
+  1, 63, :_reduce_21,
+  3, 63, :_reduce_22,
+  1, 66, :_reduce_none,
+  3, 66, :_reduce_24,
+  3, 67, :_reduce_25,
+  5, 67, :_reduce_26,
+  1, 67, :_reduce_none,
+  5, 69, :_reduce_28,
+  0, 57, :_reduce_29,
+  4, 57, :_reduce_30,
+  0, 70, :_reduce_31,
+  1, 70, :_reduce_none,
   0, 58, :_reduce_33,
   2, 58, :_reduce_34,
-  5, 49, :_reduce_35,
-  1, 69, :_reduce_none,
-  3, 69, :_reduce_37,
-  3, 70, :_reduce_38,
-  4, 50, :_reduce_39,
-  1, 51, :_reduce_none,
-  1, 52, :_reduce_41,
-  3, 52, :_reduce_42,
-  1, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 53, :_reduce_46,
-  3, 53, :_reduce_47,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none,
-  1, 67, :_reduce_none ]
+  0, 59, :_reduce_35,
+  2, 59, :_reduce_36,
+  5, 50, :_reduce_37,
+  1, 71, :_reduce_none,
+  3, 71, :_reduce_39,
+  3, 72, :_reduce_40,
+  4, 51, :_reduce_41,
+  1, 52, :_reduce_none,
+  1, 53, :_reduce_43,
+  3, 53, :_reduce_44,
+  1, 65, :_reduce_none,
+  1, 65, :_reduce_none,
+  1, 65, :_reduce_none,
+  1, 54, :_reduce_48,
+  3, 54, :_reduce_49,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none,
+  1, 68, :_reduce_none ]
-racc_reduce_n = 66
+racc_reduce_n = 68
-racc_shift_n = 122
+racc_shift_n = 127
 racc_token_table = {
   false => 0,
@@ -306,36 +310,37 @@ racc_token_table = {
   "=" => 14,
   :IN => 15,
   :AND => 16,
-  :ORDER => 17,
-  :BY => 18,
-  :LIMIT => 19,
-  :NUMBER => 20,
-  :OFFSET => 21,
-  :UPDATE => 22,
-  :SET => 23,
-  "," => 24,
-  :DELETE => 25,
-  :IDENTIFIER => 26,
-  :STRING => 27,
-  :NULL => 28,
-  :BW => 29,
-  :EW => 30,
-  :INCALL => 31,
-  :INCANY => 32,
-  :INC => 33,
-  :EQANY => 34,
-  :REGEXP => 35,
-  :BETWEEN => 36,
-  :FTS => 37,
-  :FTSALL => 38,
-  :FTSANY => 39,
-  :FTSEX => 40,
-  ">=" => 41,
-  "<=" => 42,
-  ">" => 43,
-  "<" => 44 }
-racc_nt_base = 45
+  :BETWEEN => 17,
+  :ORDER => 18,
+  :BY => 19,
+  :LIMIT => 20,
+  :NUMBER => 21,
+  :OFFSET => 22,
+  :UPDATE => 23,
+  :SET => 24,
+  "," => 25,
+  :DELETE => 26,
+  :IDENTIFIER => 27,
+  :STRING => 28,
+  :NULL => 29,
+  :BW => 30,
+  :EW => 31,
+  :INCALL => 32,
+  :INCANY => 33,
+  :INC => 34,
+  :ANYONE => 35,
+  :REGEXP => 36,
+  :BT => 37,
+  :FTS => 38,
+  :FTSAND => 39,
+  :FTSOR => 40,
+  :FTSEX => 41,
+  ">=" => 42,
+  "<=" => 43,
+  ">" => 44,
+  "<" => 45 }
+racc_nt_base = 46
 racc_use_result_var = false
@@ -373,6 +378,7 @@ Racc_token_to_s_table = [
   "\"=\"",
   "IN",
   "AND",
+  "BETWEEN",
   "ORDER",
   "BY",
   "LIMIT",
@@ -390,12 +396,12 @@ Racc_token_to_s_table = [
   "INCALL",
   "INCANY",
   "INC",
-  "EQANY",
+  "ANYONE",
   "REGEXP",
-  "BETWEEN",
+  "BT",
   "FTS",
-  "FTSALL",
-  "FTSANY",
+  "FTSAND",
+  "FTSOR",
   "FTSEX",
   "\">=\"",
   "\"<=\"",
@@ -424,6 +430,7 @@ Racc_token_to_s_table = [
   "boolean_primary",
   "predicate",
   "op",
+  "between_predicate",
   "ordering_spec",
   "set_clause_list",
   "set_clause" ]
@@ -571,127 +578,132 @@ module_eval(<<'.,.,', 'sqlparser.y', 89)
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 93)
-  def _reduce_27(val, _values)
+# reduce 27 omitted
+module_eval(<<'.,.,', 'sqlparser.y', 95)
+  def _reduce_28(val, _values)
+                                {:name => val[0], :op => tccond(val[1], nil), :expr => [val[2], val[4]]}
+  end
+.,.,
+module_eval(<<'.,.,', 'sqlparser.y', 100)
+  def _reduce_29(val, _values)
                                 nil
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 97)
-  def _reduce_28(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 104)
+  def _reduce_30(val, _values)
                                 {:name => val[2], :type => val[3]}
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 102)
-  def _reduce_29(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 109)
+  def _reduce_31(val, _values)
                                 :QOSTRASC
   end
 .,.,
-# reduce 30 omitted
+# reduce 32 omitted
-module_eval(<<'.,.,', 'sqlparser.y', 108)
-  def _reduce_31(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 115)
+  def _reduce_33(val, _values)
                                 nil
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 112)
-  def _reduce_32(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 119)
+  def _reduce_34(val, _values)
                                 val[1]
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 117)
-  def _reduce_33(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 124)
+  def _reduce_35(val, _values)
                                 nil
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 121)
-  def _reduce_34(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 128)
+  def _reduce_36(val, _values)
                                 val[1]
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 126)
-  def _reduce_35(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 133)
+  def _reduce_37(val, _values)
                                 {:command => :update, :table => val[1], :set_clause_list => val[3], :condition => val[4]}
   end
 .,.,
-# reduce 36 omitted
+# reduce 38 omitted
-module_eval(<<'.,.,', 'sqlparser.y', 132)
-  def _reduce_37(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 139)
+  def _reduce_39(val, _values)
                                 val[0].merge val[2]
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 137)
-  def _reduce_38(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 144)
+  def _reduce_40(val, _values)
                               {val[0] => val[2]}
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 142)
-  def _reduce_39(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 149)
+  def _reduce_41(val, _values)
                                 {:command => :delete, :table => val[2], :condition => val[3]}
   end
 .,.,
-# reduce 40 omitted
+# reduce 42 omitted
-module_eval(<<'.,.,', 'sqlparser.y', 149)
-  def _reduce_41(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 156)
+  def _reduce_43(val, _values)
                                 [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 153)
-  def _reduce_42(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 160)
+  def _reduce_44(val, _values)
                                 val[0] << val[2]
   end
 .,.,
-# reduce 43 omitted
+# reduce 45 omitted
-# reduce 44 omitted
+# reduce 46 omitted
-# reduce 45 omitted
+# reduce 47 omitted
-module_eval(<<'.,.,', 'sqlparser.y', 162)
-  def _reduce_46(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 169)
+  def _reduce_48(val, _values)
                                 [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sqlparser.y', 166)
-  def _reduce_47(val, _values)
+module_eval(<<'.,.,', 'sqlparser.y', 173)
+  def _reduce_49(val, _values)
                                 val[0] << val[2]
   end
 .,.,
-# reduce 48 omitted
-# reduce 49 omitted
 # reduce 50 omitted
 # reduce 51 omitted
@@ -724,6 +736,10 @@ module_eval(<<'.,.,', 'sqlparser.y', 166)
 # reduce 65 omitted
+# reduce 66 omitted
+# reduce 67 omitted
 def _reduce_none(val, _values)
   val[0]
 end