sdbcli 0.1.1 → 0.1.2

data/README

@@ -42,7 +42,7 @@ https://bitbucket.org/winebarrel/sdbcli
   
   SELECT output_list FROM domain_name [where expression] [sort_instructions] [limit limit]
     queries using the SELECT statement
-
+  
   ap-northeast-1> select * from test
   ---
   - [itemname1, {attr1: val1, attr2: val2}]

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

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by racc 1.4.5
-# from racc grammer file "sdb-parser.y".
+# from racc grammer file "lib/sdbcli/sdb-parser.y".
 #
 
 require 'racc/parser'
@@ -15,7 +15,7 @@ module SimpleDB
 
 class Parser < Racc::Parser
 
-module_eval <<'..end sdb-parser.y modeval..idc908e49d79', 'sdb-parser.y', 119
+module_eval <<'..end lib/sdbcli/sdb-parser.y modeval..idca9c582f51', 'lib/sdbcli/sdb-parser.y', 139
 
 KEYWORDS = %w(
   AND
@@ -117,7 +117,7 @@ def self.parse(obj)
   self.new(obj).parse
 end
 
-..end sdb-parser.y modeval..idc908e49d79
+..end lib/sdbcli/sdb-parser.y modeval..idca9c582f51
 
 ##### racc 1.4.5 generates ###
 
@@ -137,84 +137,81 @@ racc_reduce_table = [
  1, 36, :_reduce_12,
  1, 36, :_reduce_none,
  10, 29, :_reduce_14,
- 3, 38, :_reduce_15,
- 8, 30, :_reduce_16,
- 1, 40, :_reduce_17,
- 3, 40, :_reduce_18,
- 3, 41, :_reduce_19,
- 8, 31, :_reduce_20,
- 0, 42, :_reduce_21,
- 1, 42, :_reduce_none,
- 1, 32, :_reduce_23,
- 3, 33, :_reduce_24,
- 3, 34, :_reduce_25,
- 2, 35, :_reduce_26,
- 1, 37, :_reduce_27,
- 3, 37, :_reduce_28,
- 1, 39, :_reduce_29,
- 3, 39, :_reduce_30 ]
-
-racc_reduce_n = 31
-
-racc_shift_n = 74
+ 1, 38, :_reduce_15,
+ 3, 38, :_reduce_16,
+ 1, 40, :_reduce_none,
+ 1, 40, :_reduce_none,
+ 8, 30, :_reduce_19,
+ 1, 41, :_reduce_20,
+ 3, 41, :_reduce_21,
+ 3, 42, :_reduce_22,
+ 8, 31, :_reduce_23,
+ 0, 43, :_reduce_24,
+ 1, 43, :_reduce_none,
+ 1, 32, :_reduce_26,
+ 3, 33, :_reduce_27,
+ 3, 34, :_reduce_28,
+ 2, 35, :_reduce_29,
+ 1, 37, :_reduce_30,
+ 3, 37, :_reduce_31,
+ 1, 39, :_reduce_32,
+ 3, 39, :_reduce_33 ]
+
+racc_reduce_n = 34
+
+racc_shift_n = 76
 
 racc_action_table = [
-     6,     8,    51,    24,    71,    48,    72,    26,    25,     1,
-    27,    24,    50,    30,    31,    10,    32,    13,    15,    17,
-    33,     3,     5,    34,    35,    36,    34,    37,    38,    39,
-    40,    41,    42,    45,    47,    21,    49,    20,    52,    53,
-    54,    55,    56,    42,    58,    59,    60,    24,    62,    63,
-    64,    65,    34,    66,    67,    68,    70,    19,    73 ]
+     6,     8,    53,    24,    46,    73,    48,    74,    25,     1,
+    24,    55,    52,    56,    46,    10,    48,    13,    15,    17,
+    30,     3,     5,    31,    32,    33,    34,    35,    36,    34,
+    37,    38,    39,    40,    41,    42,    45,    27,    50,    51,
+    26,    54,    21,    57,    58,    42,    60,    61,    62,    20,
+    64,    65,    66,    67,    68,    69,    70,    72,    19,    75 ]
 
 racc_action_check = [
-     0,     0,    43,     8,    69,    40,    69,     9,     8,     0,
-    10,    13,    43,    17,    19,     0,    20,     0,     0,     0,
-    22,     0,     0,    23,    26,    27,    28,    29,    30,    31,
-    33,    34,    36,    37,    39,     5,    42,     3,    45,    46,
-    47,    48,    49,    50,    51,    52,    53,    54,    55,    58,
-    59,    60,    61,    62,    63,    64,    65,     1,    72 ]
+     0,     0,    43,     8,    56,    71,    56,    71,     8,     0,
+    13,    47,    43,    47,    39,     0,    39,     0,     0,     0,
+    17,     0,     0,    19,    20,    22,    23,    26,    27,    28,
+    29,    30,    31,    33,    34,    36,    37,    10,    40,    42,
+     9,    45,     5,    50,    51,    52,    53,    54,    55,     3,
+    57,    60,    61,    62,    64,    65,    66,    67,     1,    74 ]
 
 racc_action_pointer = [
-    -2,    45,   nil,    15,   nil,    10,   nil,   nil,    -2,     7,
-     5,   nil,   nil,     6,   nil,   nil,   nil,    -9,   nil,     9,
-    11,   nil,    16,     7,   nil,   nil,    24,     7,    10,    23,
-    23,    16,   nil,    25,    26,   nil,    27,    28,   nil,    27,
-    -1,   nil,    28,    -4,   nil,    32,    25,    24,    34,    33,
-    38,    37,    38,    31,    42,    40,   nil,   nil,    41,    42,
-    38,    36,    44,    45,    46,    47,   nil,   nil,   nil,   -10,
-   nil,   nil,    49,   nil ]
+    -2,    46,   nil,    27,   nil,    17,   nil,   nil,    -2,    40,
+    32,   nil,   nil,     5,   nil,   nil,   nil,    -2,   nil,    18,
+    19,   nil,    21,    10,   nil,   nil,    27,    10,    13,    26,
+    26,    19,   nil,    28,    29,   nil,    30,    31,   nil,     9,
+    32,   nil,    31,    -4,   nil,    35,   nil,    -3,   nil,   nil,
+    36,    35,    40,    39,    40,    33,    -1,    42,   nil,   nil,
+    43,    44,    40,   nil,    45,    46,    47,    48,   nil,   nil,
+   nil,    -9,   nil,   nil,    50,   nil ]
 
 racc_action_default = [
-   -31,   -31,    -6,   -31,    -7,   -31,    -9,    -8,   -11,   -31,
-   -31,    -1,    -2,   -21,    -3,   -23,    -4,   -31,    -5,   -31,
-   -31,   -26,   -31,   -13,   -27,   -12,   -31,   -31,   -22,   -31,
-   -31,   -31,   -25,   -31,   -31,    74,   -31,   -31,   -24,   -31,
-   -31,   -28,   -31,   -31,   -17,   -31,   -31,   -31,   -31,   -31,
-   -31,   -31,   -31,   -31,   -31,   -31,   -19,   -18,   -31,   -31,
-   -31,   -15,   -31,   -31,   -31,   -31,   -10,   -16,   -20,   -31,
-   -29,   -14,   -31,   -30 ]
+   -34,   -34,    -6,   -34,    -7,   -34,    -9,    -8,   -11,   -34,
+   -34,    -1,    -2,   -24,    -3,   -26,    -4,   -34,    -5,   -34,
+   -34,   -29,   -34,   -13,   -30,   -12,   -34,   -34,   -25,   -34,
+   -34,   -34,   -28,   -34,   -34,    76,   -34,   -34,   -27,   -34,
+   -34,   -31,   -34,   -34,   -20,   -34,   -18,   -34,   -17,   -15,
+   -34,   -34,   -34,   -34,   -34,   -34,   -34,   -34,   -22,   -21,
+   -34,   -34,   -34,   -16,   -34,   -34,   -34,   -34,   -10,   -19,
+   -23,   -34,   -32,   -14,   -34,   -33 ]
 
 racc_goto_table = [
-    23,    44,     7,    14,    16,    28,    18,     2,     4,    12,
-    22,     9,    46,    69,    43,    57,    11,    29,   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,    61 ]
+    49,    23,    44,     7,    16,    18,    28,     2,     4,    14,
+    22,     9,    47,    71,    12,    43,    11,    63,    59,    29 ]
 
 racc_goto_check = [
-    11,    15,     9,     4,     5,    11,     6,     7,     8,     3,
-    10,     1,    12,    13,    14,    15,     2,    16,   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,    11 ]
+    14,    11,    16,     9,     5,     6,    11,     7,     8,     4,
+    10,     1,    12,    13,     3,    15,     2,    14,    16,    17 ]
 
 racc_goto_pointer = [
-   nil,    11,    16,     9,     3,     4,     6,     7,     8,     2,
-     2,    -8,   -27,   -52,   -22,   -35,     4 ]
+   nil,    11,    16,    14,     9,     4,     5,     7,     8,     3,
+     2,    -7,   -27,   -54,   -39,   -21,   -34,     6 ]
 
 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 ]
 
 racc_token_table = {
  false => 0,
@@ -303,8 +300,9 @@ Racc_token_to_s_table = [
 'show_stmt',
 'get_output_list',
 'identifier_list',
-'insert_attr_list',
+'insert_identifier_list',
 'value_list',
+'itemname_identifier',
 'set_clause_list',
 'set_clause',
 'delete_attr_list']
@@ -333,19 +331,19 @@ Racc_debug_parser = false
 
  # reduce 9 omitted
 
-module_eval <<'.,.,', 'sdb-parser.y', 17
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 17
   def _reduce_10( val, _values)
                 struct(:GET, :domain => val[3], :item_name => val[7], :attr_names => val[1])
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 22
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 22
   def _reduce_11( val, _values)
                       []
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 26
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 26
   def _reduce_12( val, _values)
                       []
   end
@@ -353,105 +351,127 @@ module_eval <<'.,.,', 'sdb-parser.y', 26
 
  # reduce 13 omitted
 
-module_eval <<'.,.,', 'sdb-parser.y', 35
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 47
   def _reduce_14( val, _values)
+                unless val[4].length == val[8].length
+                  raise Racc::ParseError, 'The number of an attribute and values differs'
+                end
+
                 attrs = {}
                 val[4].zip(val[8]).each {|k, v| attrs[k] = v }
-                item_name = attrs.delete(:item_name)
+                item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
+
+                unless item_name
+                  raise Racc::ParseError,'itemName is not contained in the INSERT statement'
+                end
+
+                attrs.delete(item_name[0])
+                item_name = item_name[1]
+
                 struct(:INSERT, :domain => val[2], :item_name => item_name, :attrs => attrs)
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 40
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 53
   def _reduce_15( val, _values)
-                       [:item_name, val[2]].flatten
+                             [val[0]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 47
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 57
   def _reduce_16( val, _values)
+                             val[0] + [val[2]]
+  end
+.,.,
+
+ # reduce 17 omitted
+
+ # reduce 18 omitted
+
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 67
+  def _reduce_19( 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', 52
-  def _reduce_17( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 72
+  def _reduce_20( val, _values)
                       [val[0]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 56
-  def _reduce_18( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 76
+  def _reduce_21( val, _values)
                       val[0] + [val[2]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 61
-  def _reduce_19( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 81
+  def _reduce_22( val, _values)
                  [val[0], val[2]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 66
-  def _reduce_20( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 86
+  def _reduce_23( val, _values)
                   struct(:DELETE, :domain => val[3], :items => [[val[7], val[1]]])
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 71
-  def _reduce_21( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 91
+  def _reduce_24( val, _values)
                        []
   end
 .,.,
 
- # reduce 22 omitted
+ # reduce 25 omitted
 
-module_eval <<'.,.,', 'sdb-parser.y', 77
-  def _reduce_23( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 97
+  def _reduce_26( val, _values)
                   struct(:SELECT, :query => val[0])
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 82
-  def _reduce_24( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 102
+  def _reduce_27( val, _values)
                   struct(:CREATE, :domain => val[2])
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 87
-  def _reduce_25( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 107
+  def _reduce_28( val, _values)
                 struct(:DROP, :domain => val[2])
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 92
-  def _reduce_26( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 112
+  def _reduce_29( val, _values)
                 struct(:SHOW, :operand => :domains)
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 97
-  def _reduce_27( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 117
+  def _reduce_30( val, _values)
                                [val[0]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 101
-  def _reduce_28( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 121
+  def _reduce_31( val, _values)
                                val[0] + [val[2]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 106
-  def _reduce_29( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 126
+  def _reduce_32( val, _values)
                            [val[0]]
   end
 .,.,
 
-module_eval <<'.,.,', 'sdb-parser.y', 110
-  def _reduce_30( val, _values)
+module_eval <<'.,.,', 'lib/sdbcli/sdb-parser.y', 130
+  def _reduce_33( val, _values)
                           [val[0], val[2]].flatten
   end
 .,.,

data/lib/sdbcli/sdb-parser.y

@@ -26,18 +26,38 @@ rule
                     }
                   | identifier_list
 
-  insert_stmt : INSERT INTO IDENTIFIER '(' insert_attr_list ')' VALUES '(' value_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
+
                 attrs = {}
                 val[4].zip(val[8]).each {|k, v| attrs[k] = v }
-                item_name = attrs.delete(:item_name)
+                item_name = attrs.find {|k, v| k =~ /\AitemName\Z/i }
+
+                unless item_name
+                  raise Racc::ParseError,'itemName is not contained in the INSERT statement'
+                end
+
+                attrs.delete(item_name[0])
+                item_name = item_name[1]
+
                 struct(:INSERT, :domain => val[2], :item_name => item_name, :attrs => attrs)
               }
 
-  insert_attr_list : ITEMNAME ',' identifier_list
-                     {
-                       [:item_name, val[2]].flatten
-                     }
+
+  insert_identifier_list : itemname_identifier
+                           {
+                             [val[0]]
+                           }
+                         | insert_identifier_list ',' itemname_identifier
+                           {
+                             val[0] + [val[2]]
+                           }
+
+  itemname_identifier : ITEMNAME
+                      | IDENTIFIER
 
   update_stmt : UPDATE IDENTIFIER SET set_clause_list WHERE ITEMNAME '=' VALUE
               {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sdbcli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel