RubyGems - sdbcli - Versions diffs - 0.4.3 → 1.0.0 - Mend

sdbcli 0.4.3 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/README +4 -2
data/bin/sdbcli +18 -7
data/lib/sdbcli/sdb-driver.rb +51 -38
data/lib/sdbcli/sdb-parser.tab.rb +328 -182
data/lib/sdbcli/sdb-parser.y +115 -34
data/lib/sdbcli/sdb-runner.rb +29 -4
metadata +2 -2

data/README CHANGED Viewed

@@ -52,13 +52,15 @@ https://bitbucket.org/winebarrel/sdbcli
   GET [attr_list] FROM domain_name WHERE itemName = '...'
     gets the attribute of an item
-  INSERT INTO domain_name (itemName, attr1, ...) VALUES ('name', 'val1', ...)
+  INSERT INTO domain_name (itemName, attr1, ...) VALUES ('name1', 'val1', ...), ('name2', 'val2', ...), ...
     creates an item
-  UPDATE domain_name set attr1 = 'val1', ... WHERE itemName = '...'
+  UPDATE domain_name {SET|ADD} attr1 = 'val1', ... WHERE itemName = '...'
+  UPDATE domain_name {SET|ADD} attr1 = 'val1', ... [WHERE expression] [sort_instructions] [LIMIT limit]
     updates an item
   DELETE [attr1, ...] FROM domain_name WHERE itemName = '...'
+  DELETE [attr1, ...] FROM domain_name WHERE [WHERE expression] [sort_instructions] [LIMIT limit]
     deletes the attribute of an item or an item
   SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit]

data/bin/sdbcli CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-Version = '0.4.3'
+Version = '1.0.0'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
@@ -87,7 +87,16 @@ def execute(src, show_rows = false)
       out = $runner.execute(query, inline)
-      if out
+      if out.kind_of?(Integer)
+        puts case $format
+             when :yaml
+               "# #{out} #{out > 1 ? 'rows' : 'row'} changed"
+             when :json
+               "// #{out} #{out > 1 ? 'rows' : 'row'} changed"
+             else
+               "# #{out} #{out > 1 ? 'rows' : 'row'} changed"
+             end
+      elsif out
         str = nil
         case $format
@@ -163,13 +172,15 @@ DROP DOMAIN domain_name
 GET [attr_list] FROM domain_name WHERE itemName = '...'
   gets the attribute of an item
-INSERT INTO domain_name (itemName, attr1, ...) VALUES ('name', 'val1', ...)
+INSERT INTO domain_name (itemName, attr1, ...) VALUES ('name1', 'val1', ...), ('name2', 'val2', ...), ...
   creates an item
-UPDATE domain_name set attr1 = 'val1', ... WHERE itemName = '...'
+UPDATE domain_name {SET|ADD} attr1 = 'val1', ... WHERE itemName = '...'
+UPDATE domain_name {SET|ADD} attr1 = 'val1', ... [WHERE expression] [sort_instructions] [LIMIT limit]
   updates an item
 DELETE [attr1, ...] FROM domain_name WHERE itemName = '...'
+DELETE [attr1, ...] FROM domain_name WHERE [WHERE expression] [sort_instructions] [LIMIT limit]
   deletes the attribute of an item or an item
 SELECT output_list FROM domain_name [WHERE expression] [sort_instructions] [LIMIT limit]
@@ -233,8 +244,8 @@ while buf = Readline.readline(prompt, true)
     elsif r =~ 'exit' or r =~ 'quit'
       exit
     elsif r =~ 'format'
-      case arg
-      when nil
+      case (arg || '').strip
+      when ''
         puts $format
       when 'yaml'
         $format = :yaml

data/lib/sdbcli/sdb-driver.rb CHANGED Viewed

@@ -4,6 +4,8 @@ module SimpleDB
   class Error < StandardError; end
   class Driver
+    MAX_NUMBER_SUBMITTED_ITEMS = 25
     attr_accessor :iteratable
     def initialize(accessKeyId, secretAccessKey, endpoint = 'sdb.amazonaws.com')
@@ -42,41 +44,50 @@ module SimpleDB
     # attr action
-    def insert(domain_name, item_name, attrs = {}, consistent = false)
-      params = {:ConsistentRead => consistent}
-      i = 0
+    def insert(domain_name, items = {}, consistent = false)
+      until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
+        params = {:ConsistentRead => consistent}
+        i = j = 0
-      attrs.each do |name, values|
-        [values].flatten.each do |v|
+        chunk.each do |item_name, attrs|
           i += 1
-          params["Attribute.#{i}.Name"] = name
-          params["Attribute.#{i}.Value"] = v
-          params["Attribute.#{i}.Replace"] = false
+          params["Item.#{i}.ItemName"] = item_name
+          (attrs || {}).each do |attr_name, values|
+            [values].flatten.each do |v|
+              j += 1
+              params["Item.#{i}.Attribute.#{j}.Name"] = attr_name
+              params["Item.#{i}.Attribute.#{j}.Value"] = v
+              params["Item.#{i}.Attribute.#{j}.Replace"] = false
+            end
+          end
         end
-      end
-      @client.put_attributes(domain_name, item_name, params)
+        @client.batch_put_attributes(domain_name, params)
+      end
     end
     def update(domain_name, items = {}, consistent = false)
-      params = {:ConsistentRead => consistent}
-      i = j = 0
-      items.each do |item_name, attrs|
-        i += 1
-        params["Item.#{i}.ItemName"] = item_name
-        (attrs || {}).each do |attr_name, values|
-          [values].flatten.each do |v|
-            j += 1
-            params["Item.#{i}.Attribute.#{j}.Name"] = attr_name
-            params["Item.#{i}.Attribute.#{j}.Value"] = v
-            params["Item.#{i}.Attribute.#{j}.Replace"] = true
+      until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
+        params = {:ConsistentRead => consistent}
+        i = j = 0
+        chunk.each do |item_name, attrs|
+          i += 1
+          params["Item.#{i}.ItemName"] = item_name
+          (attrs || {}).each do |attr_name, values|
+            [values].flatten.each do |v|
+              j += 1
+              params["Item.#{i}.Attribute.#{j}.Name"] = attr_name
+              params["Item.#{i}.Attribute.#{j}.Value"] = v
+              params["Item.#{i}.Attribute.#{j}.Replace"] = true
+            end
           end
         end
-      end
-      @client.batch_put_attributes(domain_name, params)
+        @client.batch_put_attributes(domain_name, params)
+      end
     end
     def get(domain_name, item_name, attr_names = [], consistent = false)
@@ -100,23 +111,25 @@ module SimpleDB
     end
     def delete(domain_name, items = {}, consistent = false)
-      params = {:ConsistentRead => consistent}
-      i = j = 0
-      items.each do |item_name, attrs|
-        i += 1
-        params["Item.#{i}.ItemName"] = item_name
+      until (chunk = items.slice!(0, MAX_NUMBER_SUBMITTED_ITEMS)).empty?
+        params = {:ConsistentRead => consistent}
+        i = j = 0
-        (attrs || []).each do |attr_name, values|
-          [values].flatten.each do |v|
-            j += 1
-            params["Item.#{i}.Attribute.#{j}.Name"] = attr_name
-            params["Item.#{i}.Attribute.#{j}.Value"] = v if v
+        chunk.each do |item_name, attrs|
+          i += 1
+          params["Item.#{i}.ItemName"] = item_name
+          (attrs || []).each do |attr_name, values|
+            [values].flatten.each do |v|
+              j += 1
+              params["Item.#{i}.Attribute.#{j}.Name"] = attr_name
+              params["Item.#{i}.Attribute.#{j}.Value"] = v if v
+            end
           end
         end
-      end
-      @client.batch_delete_attributes(domain_name, params)
+        @client.batch_delete_attributes(domain_name, params)
+      end
     end
     def describe(domain_name)

data/lib/sdbcli/sdb-parser.tab.rb CHANGED Viewed

@@ -13,9 +13,10 @@ module SimpleDB
 class Parser < Racc::Parser
-module_eval(<<'...end sdb-parser.y/module_eval...', 'sdb-parser.y', 156)
+module_eval(<<'...end sdb-parser.y/module_eval...', 'sdb-parser.y', 228)
 KEYWORDS = %w(
+  ADD
   AND
   ASC
   BETWEEN
@@ -118,111 +119,141 @@ def self.parse(obj)
   self.new(obj).parse
 end
+def on_error(error_token_id, error_value, value_stack)
+  if @stmt_with_expr
+    @stmt_with_expr.expr << (error_value + @ss.scan_until(/\Z/))
+  else
+    super
+  end
+end
 ...end sdb-parser.y/module_eval...
 ##### State transition tables begin ###
 racc_action_table = [
-    12,    59,    27,    58,    81,    57,    82,    25,    13,    52,
-    58,    60,    57,    64,    14,    65,    15,    16,    17,    36,
-    18,    19,    34,    35,    20,    21,    22,    37,    38,    39,
-    40,    41,    42,    43,    44,    41,    45,    46,    47,    48,
-    49,    33,    53,    54,    32,    27,    61,    62,    63,    29,
-    66,    52,    68,    69,    70,    71,    28,    73,    74,    75,
-    76,    77,    78,    80,    23,    83 ]
+    13,    14,    67,    64,    25,    63,    29,    62,    42,    65,
+    65,    27,    15,    43,    63,    16,    62,    44,    17,    18,
+    19,    40,    20,    21,    98,    94,    22,    23,    24,    71,
+    72,    36,    37,    93,    94,    57,    58,    45,    46,    47,
+    43,    48,    49,    50,    51,    52,    55,    55,    39,    59,
+    38,    35,    66,    41,    68,    69,    70,    34,    73,    55,
+    75,    76,    77,    78,    79,    29,    81,    82,    83,    84,
+    85,    87,    88,    89,    91,    92,    31,    95,    96,    91,
+    30 ]
 racc_action_check = [
-     0,    50,    12,    49,    79,    49,    79,    12,     0,    43,
-    65,    50,    65,    55,     0,    55,     0,     0,     0,    20,
-     0,     0,    19,    19,     0,     0,     0,    21,    22,    23,
-    24,    26,    28,    29,    30,    31,    32,    33,    40,    41,
-    42,    18,    44,    47,    17,    15,    52,    53,    54,    14,
-    59,    60,    61,    62,    63,    64,    13,    66,    69,    70,
-    71,    73,    74,    76,     1,    82 ]
+     0,     0,    56,    53,     1,    52,    14,    52,    26,    56,
+    53,    14,     0,    28,    72,     0,    72,    30,     0,     0,
+     0,    24,     0,     0,    97,    97,     0,     0,     0,    60,
+    60,    21,    21,    90,    90,    47,    47,    31,    31,    32,
+    33,    34,    35,    42,    43,    44,    45,    46,    23,    50,
+    22,    20,    55,    25,    57,    58,    59,    19,    64,    65,
+    66,    67,    68,    70,    71,    17,    73,    76,    77,    78,
+    79,    81,    82,    83,    85,    86,    16,    92,    94,    95,
+    15 ]
 racc_action_pointer = [
-    -2,    64,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -2,    45,    45,    41,   nil,    23,    20,    -2,
-    15,    23,    24,    29,    27,   nil,    16,   nil,    28,    16,
-    31,    20,    32,    33,   nil,   nil,   nil,   nil,   nil,   nil,
-    34,    35,    28,     5,    38,   nil,   nil,    38,   nil,    -1,
-    -4,   nil,    39,    42,    42,     0,   nil,   nil,   nil,    44,
-    47,    44,    47,    47,    41,     6,    50,   nil,   nil,    51,
-    51,    48,   nil,    53,    54,   nil,    55,   nil,   nil,    -9,
-   nil,   nil,    57,   nil ]
+    -1,     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     2,    66,    72,    61,   nil,    35,
+    29,     6,    46,    44,    17,    53,     5,   nil,     1,   nil,
+    13,    20,    36,    28,    37,    38,   nil,   nil,   nil,   nil,
+   nil,   nil,    39,    40,    35,    42,    43,    31,   nil,   nil,
+    44,   nil,     1,    -2,   nil,    45,    -3,    49,    49,    50,
+    18,   nil,   nil,   nil,    52,    55,    52,    55,    56,   nil,
+    56,    49,    10,    59,   nil,   nil,    60,    61,    61,    60,
+   nil,    63,    64,    65,   nil,    66,    63,   nil,   nil,   nil,
+    22,   nil,    67,   nil,    70,    71,   nil,    13,   nil ]
 racc_action_default = [
-   -39,   -39,    -1,    -2,    -3,    -4,    -5,    -6,    -7,    -8,
-    -9,   -10,   -12,   -39,   -39,   -25,   -27,   -39,   -39,   -39,
-   -39,   -39,   -39,   -39,   -39,   -13,   -14,   -35,   -39,   -39,
-   -39,   -26,   -39,   -39,   -30,   -31,   -32,   -33,   -34,    84,
-   -39,   -39,   -39,   -39,   -39,   -28,   -29,   -39,   -36,   -39,
-   -39,   -21,   -39,   -39,   -39,   -39,   -16,   -18,   -19,   -39,
-   -39,   -39,   -39,   -39,   -39,   -39,   -39,   -22,   -23,   -39,
-   -39,   -39,   -17,   -39,   -39,   -11,   -39,   -20,   -24,   -39,
-   -37,   -15,   -39,   -38 ]
+   -53,   -53,    -1,    -2,    -3,    -4,    -5,    -6,    -7,    -8,
+    -9,   -10,   -11,   -12,   -14,   -53,   -53,   -39,   -41,   -53,
+   -53,   -53,   -53,   -53,   -53,   -53,   -53,   -15,   -16,   -49,
+   -53,   -53,   -53,   -40,   -53,   -53,   -44,   -45,   -46,   -47,
+   -48,    99,   -53,   -53,   -53,   -53,   -53,   -53,   -42,   -43,
+   -53,   -50,   -53,   -25,   -32,   -53,   -29,   -36,   -37,   -53,
+   -53,   -20,   -22,   -23,   -26,   -53,   -53,   -30,   -53,   -38,
+   -53,   -53,   -53,   -27,   -33,   -34,   -31,   -53,   -53,   -53,
+   -21,   -53,   -53,   -53,   -13,   -53,   -19,   -24,   -28,   -35,
+   -53,   -51,   -53,   -17,   -53,   -53,   -52,   -53,   -18 ]
 racc_goto_table = [
-    51,    26,    56,    10,    31,     5,     6,     7,     8,     9,
-     4,    11,    24,     1,    55,    79,     3,    67,    72,    50,
-     2,    30 ]
+    61,    90,    28,    53,    56,    33,    11,     6,     7,     8,
+     9,    97,    10,     5,    12,    26,     1,    86,     4,    60,
+    80,     3,     2,    74,    32 ]
 racc_goto_check = [
-    18,    13,    16,    10,    13,     5,     6,     7,     8,     9,
-     4,    11,    12,     1,    14,    15,     3,    18,    16,    17,
-     2,    19 ]
+    18,    16,    14,    19,    19,    14,    11,     6,     7,     8,
+     9,    16,    10,     5,    12,    13,     1,    15,     4,    17,
+    18,     3,     2,    20,    21 ]
 racc_goto_pointer = [
-   nil,    13,    20,    16,    10,     5,     6,     7,     8,     9,
-     3,    11,     0,   -11,   -35,   -61,   -47,   -24,   -43,     6 ]
+   nil,    16,    22,    21,    18,    13,     7,     8,     9,    10,
+    12,     6,    14,     1,   -12,   -62,   -84,   -33,   -52,   -42,
+   -42,     7 ]
 racc_goto_default = [
    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,   nil,   nil,   nil,   nil,   nil,
+    54,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  8, 31, :_reduce_11,
-  0, 41, :_reduce_12,
-  1, 41, :_reduce_13,
-  1, 41, :_reduce_none,
-  10, 32, :_reduce_15,
-  1, 43, :_reduce_16,
-  3, 43, :_reduce_17,
-  1, 45, :_reduce_none,
-  1, 45, :_reduce_none,
-  8, 33, :_reduce_20,
-  1, 46, :_reduce_21,
-  3, 46, :_reduce_22,
-  3, 47, :_reduce_23,
-  8, 34, :_reduce_24,
-  0, 48, :_reduce_25,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_12,
+  8, 32, :_reduce_13,
+  0, 43, :_reduce_14,
+  1, 43, :_reduce_15,
+  1, 43, :_reduce_none,
+  3, 45, :_reduce_17,
+  5, 45, :_reduce_18,
+  8, 33, :_reduce_19,
+  1, 47, :_reduce_20,
+  3, 47, :_reduce_21,
+  1, 48, :_reduce_none,
   1, 48, :_reduce_none,
-  1, 35, :_reduce_27,
-  3, 36, :_reduce_28,
-  3, 37, :_reduce_29,
-  2, 38, :_reduce_30,
-  2, 38, :_reduce_31,
-  2, 39, :_reduce_32,
-  2, 40, :_reduce_33,
-  2, 40, :_reduce_34,
-  1, 42, :_reduce_35,
-  3, 42, :_reduce_36,
-  1, 44, :_reduce_37,
-  3, 44, :_reduce_38 ]
-racc_reduce_n = 39
-racc_shift_n = 84
+  8, 34, :_reduce_24,
+  4, 34, :_reduce_25,
+  5, 34, :_reduce_26,
+  6, 34, :_reduce_27,
+  8, 35, :_reduce_28,
+  4, 35, :_reduce_29,
+  5, 35, :_reduce_30,
+  6, 35, :_reduce_31,
+  1, 49, :_reduce_32,
+  3, 49, :_reduce_33,
+  3, 50, :_reduce_34,
+  8, 36, :_reduce_35,
+  4, 36, :_reduce_36,
+  4, 36, :_reduce_37,
+  5, 36, :_reduce_38,
+  0, 51, :_reduce_39,
+  1, 51, :_reduce_none,
+  1, 37, :_reduce_41,
+  3, 38, :_reduce_42,
+  3, 39, :_reduce_43,
+  2, 40, :_reduce_44,
+  2, 40, :_reduce_45,
+  2, 41, :_reduce_46,
+  2, 42, :_reduce_47,
+  2, 42, :_reduce_48,
+  1, 44, :_reduce_49,
+  3, 44, :_reduce_50,
+  1, 46, :_reduce_51,
+  3, 46, :_reduce_52 ]
+racc_reduce_n = 53
+racc_shift_n = 99
 racc_token_table = {
   false => 0,
@@ -235,27 +266,28 @@ racc_token_table = {
   "=" => 7,
   :VALUE => 8,
   "*" => 9,
-  :INSERT => 10,
-  :INTO => 11,
-  "(" => 12,
-  ")" => 13,
-  :VALUES => 14,
-  "," => 15,
+  "(" => 10,
+  ")" => 11,
+  "," => 12,
+  :INSERT => 13,
+  :INTO => 14,
+  :VALUES => 15,
   :UPDATE => 16,
   :SET => 17,
-  :DELETE => 18,
-  :SELECT => 19,
-  :CREATE => 20,
-  :DOMAIN => 21,
-  :DROP => 22,
-  :SHOW => 23,
-  :DOMAINS => 24,
-  :REGIONS => 25,
-  :USE => 26,
-  :DESC => 27,
-  :DESCRIBE => 28 }
-racc_nt_base = 29
+  :ADD => 18,
+  :DELETE => 19,
+  :SELECT => 20,
+  :CREATE => 21,
+  :DOMAIN => 22,
+  :DROP => 23,
+  :SHOW => 24,
+  :DOMAINS => 25,
+  :REGIONS => 26,
+  :USE => 27,
+  :DESC => 28,
+  :DESCRIBE => 29 }
+racc_nt_base = 30
 racc_use_result_var = false
@@ -286,14 +318,15 @@ Racc_token_to_s_table = [
   "\"=\"",
   "VALUE",
   "\"*\"",
-  "INSERT",
-  "INTO",
   "\"(\"",
   "\")\"",
-  "VALUES",
   "\",\"",
+  "INSERT",
+  "INTO",
+  "VALUES",
   "UPDATE",
   "SET",
+  "ADD",
   "DELETE",
   "SELECT",
   "CREATE",
@@ -310,6 +343,7 @@ Racc_token_to_s_table = [
   "get_stmt",
   "insert_stmt",
   "update_stmt",
+  "merge_stmt",
   "delete_stmt",
   "select_stmt",
   "create_stmt",
@@ -319,8 +353,9 @@ Racc_token_to_s_table = [
   "desc_stmt",
   "get_output_list",
   "identifier_list",
-  "insert_identifier_list",
+  "value_list_list",
   "value_list",
+  "insert_identifier_list",
   "itemname_identifier",
   "set_clause_list",
   "set_clause",
@@ -352,196 +387,307 @@ Racc_debug_parser = false
 # reduce 10 omitted
+# reduce 11 omitted
 module_eval(<<'.,.,', 'sdb-parser.y', 16)
-  def _reduce_11(val, _values)
+  def _reduce_12(val, _values)
+               @stmt_with_expr
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 21)
+  def _reduce_13(val, _values)
                     struct(:GET, :domain => val[3], :item_name => val[7], :attr_names => val[1])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 21)
-  def _reduce_12(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 26)
+  def _reduce_14(val, _values)
                           []
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 25)
-  def _reduce_13(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 30)
+  def _reduce_15(val, _values)
                           []
   end
 .,.,
-# reduce 14 omitted
+# reduce 16 omitted
-module_eval(<<'.,.,', 'sdb-parser.y', 31)
-  def _reduce_15(val, _values)
-                    unless val[4].length == val[8].length
-                  raise Racc::ParseError, 'The number of an attribute and values differs'
-                end
+module_eval(<<'.,.,', 'sdb-parser.y', 36)
+  def _reduce_17(val, _values)
+                          [val[1]]
+  end
+.,.,
-                attrs = {}
-                val[4].zip(val[8]).each {|k, v| attrs[k] = v }
-                item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
+module_eval(<<'.,.,', 'sdb-parser.y', 40)
+  def _reduce_18(val, _values)
+                          val[0] + [val[3]]
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 45)
+  def _reduce_19(val, _values)
+                      items = val[7].map do |vals|
+                    unless val[4].length == vals.length
+                      raise Racc::ParseError, 'The number of an attribute and values differs'
+                    end
-                unless item_name
-                  raise Racc::ParseError,'itemName is not contained in the INSERT statement'
-                end
+                    attrs = {}
+                    val[4].zip(vals).each {|k, v| attrs[k] = v }
+                    item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
-                attrs.delete(item_name[0])
-                item_name = item_name[1]
+                    unless item_name
+                      raise Racc::ParseError,'itemName is not contained in the INSERT statement'
+                    end
-                struct(:INSERT, :domain => val[2], :item_name => item_name, :attrs => attrs)
+                    attrs.delete(item_name[0])
+                    item_name = item_name[1]
+                    [item_name, attrs]
+                  end
+                  struct(:INSERT, :domain => val[2], :items => items)
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 52)
-  def _reduce_16(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 69)
+  def _reduce_20(val, _values)
                                  [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 56)
-  def _reduce_17(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 73)
+  def _reduce_21(val, _values)
                                  val[0] + [val[2]]
   end
 .,.,
-# reduce 18 omitted
+# reduce 22 omitted
-# reduce 19 omitted
+# reduce 23 omitted
-module_eval(<<'.,.,', 'sdb-parser.y', 64)
-  def _reduce_20(val, _values)
-                    attrs = {}
-                val[3].each {|k, v| attrs[k] = v }
-                struct(:UPDATE, :domain => val[1], :items => [[val[7], attrs]])
+module_eval(<<'.,.,', 'sdb-parser.y', 81)
+  def _reduce_24(val, _values)
+                      attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  struct(:UPDATE, :domain => val[1], :items => [[val[7], attrs]])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 71)
-  def _reduce_21(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 87)
+  def _reduce_25(val, _values)
+                      attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => '')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 93)
+  def _reduce_26(val, _values)
+                      attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE ')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 99)
+  def _reduce_27(val, _values)
+                      attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE itemName')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 106)
+  def _reduce_28(val, _values)
+                     attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 struct(:MERGE, :domain => val[1], :items => [[val[7], attrs]])
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 112)
+  def _reduce_29(val, _values)
+                     attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => '')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 118)
+  def _reduce_30(val, _values)
+                     attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE ')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 124)
+  def _reduce_31(val, _values)
+                     attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE itemName')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 131)
+  def _reduce_32(val, _values)
                           [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 75)
-  def _reduce_22(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 135)
+  def _reduce_33(val, _values)
                           val[0] + [val[2]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 80)
-  def _reduce_23(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 140)
+  def _reduce_34(val, _values)
                      [val[0], val[2]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 85)
-  def _reduce_24(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 145)
+  def _reduce_35(val, _values)
                       struct(:DELETE, :domain => val[3], :items => [[val[7], val[1]]])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 90)
-  def _reduce_25(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 149)
+  def _reduce_36(val, _values)
+                      @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => '')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 153)
+  def _reduce_37(val, _values)
+                      @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => 'WHERE ')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 157)
+  def _reduce_38(val, _values)
+                      @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => 'WHERE itemName')
+  end
+.,.,
+module_eval(<<'.,.,', 'sdb-parser.y', 162)
+  def _reduce_39(val, _values)
                            []
   end
 .,.,
-# reduce 26 omitted
+# reduce 40 omitted
-module_eval(<<'.,.,', 'sdb-parser.y', 96)
-  def _reduce_27(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 168)
+  def _reduce_41(val, _values)
                       struct(:SELECT, :query => val[0])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 101)
-  def _reduce_28(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 173)
+  def _reduce_42(val, _values)
                       struct(:CREATE, :domain => val[2])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 106)
-  def _reduce_29(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 178)
+  def _reduce_43(val, _values)
                     struct(:DROP, :domain => val[2])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 111)
-  def _reduce_30(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 183)
+  def _reduce_44(val, _values)
                     struct(:SHOW, :operand => :domains)
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 115)
-  def _reduce_31(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 187)
+  def _reduce_45(val, _values)
                     struct(:SHOW, :operand => :regions)
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 119)
-  def _reduce_32(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 191)
+  def _reduce_46(val, _values)
                    struct(:USE, :endpoint => val[1])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 123)
-  def _reduce_33(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 195)
+  def _reduce_47(val, _values)
                     struct(:DESCRIBE, :domain => val[1])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 127)
-  def _reduce_34(val, _values)
+module_eval(<<'.,.,', 'sdb-parser.y', 199)
+  def _reduce_48(val, _values)
                     struct(:DESCRIBE, :domain => val[1])
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 132)
-  def _reduce_35(val, _values)
-                                   [val[0]]
+module_eval(<<'.,.,', 'sdb-parser.y', 204)
+  def _reduce_49(val, _values)
+                         [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 136)
-  def _reduce_36(val, _values)
-                                   val[0] + [val[2]]
+module_eval(<<'.,.,', 'sdb-parser.y', 208)
+  def _reduce_50(val, _values)
+                         val[0] + [val[2]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 141)
-  def _reduce_37(val, _values)
-                               [val[0]]
+module_eval(<<'.,.,', 'sdb-parser.y', 213)
+  def _reduce_51(val, _values)
+                     [val[0]]
   end
 .,.,
-module_eval(<<'.,.,', 'sdb-parser.y', 145)
-  def _reduce_38(val, _values)
-                              [val[0], val[2]].flatten
+module_eval(<<'.,.,', 'sdb-parser.y', 217)
+  def _reduce_52(val, _values)
+                     [val[0], val[2]].flatten
   end
 .,.,

data/lib/sdbcli/sdb-parser.y CHANGED Viewed

@@ -4,6 +4,7 @@ rule
   stmt : get_stmt
        | insert_stmt
        | update_stmt
+       | merge_stmt
        | delete_stmt
        | select_stmt
        | create_stmt
@@ -11,6 +12,10 @@ rule
        | show_stmt
        | use_stmt
        | desc_stmt
+       | error
+         {
+           @stmt_with_expr
+         }
   get_stmt : GET get_output_list FROM IDENTIFIER WHERE ITEMNAME '=' VALUE
              {
@@ -27,26 +32,38 @@ rule
                     }
                   | identifier_list
-  insert_stmt : INSERT INTO IDENTIFIER '(' insert_identifier_list ')' VALUES '(' value_list ')'
-              {
-                unless val[4].length == val[8].length
-                  raise Racc::ParseError, 'The number of an attribute and values differs'
-                end
+  value_list_list : '(' value_list ')'
+                    {
+                      [val[1]]
+                    }
+                  | value_list_list ',' '(' value_list ')'
+                    {
+                      val[0] + [val[3]]
+                    }
-                attrs = {}
-                val[4].zip(val[8]).each {|k, v| attrs[k] = v }
-                item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
+  insert_stmt : INSERT INTO IDENTIFIER '(' insert_identifier_list ')' VALUES value_list_list
+                {
+                  items = val[7].map do |vals|
+                    unless val[4].length == vals.length
+                      raise Racc::ParseError, 'The number of an attribute and values differs'
+                    end
-                unless item_name
-                  raise Racc::ParseError,'itemName is not contained in the INSERT statement'
-                end
+                    attrs = {}
+                    val[4].zip(vals).each {|k, v| attrs[k] = v }
+                    item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
-                attrs.delete(item_name[0])
-                item_name = item_name[1]
+                    unless item_name
+                      raise Racc::ParseError,'itemName is not contained in the INSERT statement'
+                    end
-                struct(:INSERT, :domain => val[2], :item_name => item_name, :attrs => attrs)
-              }
+                    attrs.delete(item_name[0])
+                    item_name = item_name[1]
+                    [item_name, attrs]
+                  end
+                  struct(:INSERT, :domain => val[2], :items => items)
+                }
   insert_identifier_list : itemname_identifier
                            {
@@ -61,11 +78,54 @@ rule
                       | IDENTIFIER
   update_stmt : UPDATE IDENTIFIER SET set_clause_list WHERE ITEMNAME '=' VALUE
-              {
-                attrs = {}
-                val[3].each {|k, v| attrs[k] = v }
-                struct(:UPDATE, :domain => val[1], :items => [[val[7], attrs]])
-              }
+                {
+                  attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  struct(:UPDATE, :domain => val[1], :items => [[val[7], attrs]])
+                }
+              | UPDATE IDENTIFIER SET set_clause_list
+                {
+                  attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => '')
+                }
+              | UPDATE IDENTIFIER SET set_clause_list WHERE
+                {
+                  attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE ')
+                }
+              | UPDATE IDENTIFIER SET set_clause_list WHERE ITEMNAME
+                {
+                  attrs = {}
+                  val[3].each {|k, v| attrs[k] = v }
+                  @stmt_with_expr = struct(:UPDATE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE itemName')
+                }
+  merge_stmt : UPDATE IDENTIFIER ADD set_clause_list WHERE ITEMNAME '=' VALUE
+               {
+                 attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 struct(:MERGE, :domain => val[1], :items => [[val[7], attrs]])
+               }
+             | UPDATE IDENTIFIER ADD set_clause_list
+               {
+                 attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => '')
+               }
+             | UPDATE IDENTIFIER ADD set_clause_list WHERE
+               {
+                 attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE ')
+               }
+             | UPDATE IDENTIFIER ADD set_clause_list WHERE ITEMNAME
+               {
+                 attrs = {}
+                 val[3].each {|k, v| attrs[k] = v }
+                 @stmt_with_expr = struct(:MERGE_WITH_EXPR, :domain => val[1], :attrs => attrs, :expr => 'WHERE itemName')
+               }
   set_clause_list : set_clause
                     {
@@ -85,6 +145,18 @@ rule
                 {
                   struct(:DELETE, :domain => val[3], :items => [[val[7], val[1]]])
                 }
+              | DELETE delete_attr_list FROM IDENTIFIER
+                {
+                  @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => '')
+                }
+              | DELETE delete_attr_list FROM WHERE
+                {
+                  @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => 'WHERE ')
+                }
+              | DELETE delete_attr_list FROM WHERE ITEMNAME
+                {
+                  @stmt_with_expr = struct(:DELETE_WITH_EXPR, :domain => val[3], :attrs => val[1],  :expr => 'WHERE itemName')
+                }
   delete_attr_list :
                      {
@@ -129,22 +201,22 @@ rule
               }
   identifier_list: IDENTIFIER
-                             {
-                               [val[0]]
-                             }
-                           | identifier_list ',' IDENTIFIER
-                             {
-                               val[0] + [val[2]]
-                             }
+                   {
+                     [val[0]]
+                   }
+                 | identifier_list ',' IDENTIFIER
+                   {
+                     val[0] + [val[2]]
+                   }
   value_list : VALUE
-                         {
-                           [val[0]]
-                         }
-                       | value_list ',' VALUE
-                         {
-                          [val[0], val[2]].flatten
-                         }
+               {
+                 [val[0]]
+               }
+             | value_list ',' VALUE
+               {
+                 [val[0], val[2]].flatten
+               }
 ---- header
@@ -155,6 +227,7 @@ module SimpleDB
 ---- inner
 KEYWORDS = %w(
+  ADD
   AND
   ASC
   BETWEEN
@@ -257,6 +330,14 @@ def self.parse(obj)
   self.new(obj).parse
 end
+def on_error(error_token_id, error_value, value_stack)
+  if @stmt_with_expr
+    @stmt_with_expr.expr << (error_value + @ss.scan_until(/\Z/))
+  else
+    super
+  end
+end
 ---- footer
 end # module SimpleDB

data/lib/sdbcli/sdb-runner.rb CHANGED Viewed

@@ -48,14 +48,39 @@ module SimpleDB
         item
       when :INSERT
-        @driver.insert(parsed.domain, parsed.item_name, parsed.attrs)
-        nil
+        rownum = parsed.items.length
+        @driver.insert(parsed.domain, parsed.items)
+        rownum
       when :UPDATE
+        rownum = parsed.items.length
         @driver.update(parsed.domain, parsed.items)
-        nil
+        rownum
+      when :UPDATE_WITH_EXPR
+        query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
+        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        rownum = items.length
+        @driver.update(parsed.domain, items)
+        rownum
+      when :MERGE
+        rownum = parsed.items.length
+        @driver.insert(parsed.domain, parsed.items)
+        rownum
+      when :MERGE_WITH_EXPR
+        query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
+        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        rownum = items.length
+        @driver.insert(parsed.domain, items)
+        rownum
       when :DELETE
+        rownum = parsed.items.length
         @driver.delete(parsed.domain, parsed.items)
-        nil
+        rownum
+      when :DELETE_WITH_EXPR
+        query = "SELECT itemName FROM #{parsed.domain} #{parsed.expr}"
+        items = @driver.select(query).map {|i| [i[0], parsed.attrs] }
+        rownum = items.length
+        @driver.delete(parsed.domain, items)
+        rownum
       when :SELECT
         items = @driver.select(parsed.query)

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri