ddbcli 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed0ee9d9dc097573bbdf49182bcef2a8751af2e
-  data.tar.gz: 112ce4939ccb1cbfb083bc785cae474427b1f03d
+  metadata.gz: 37f0584f12c1b1b9c904f363ce23ba77a393ae9e
+  data.tar.gz: 06d7388329435968444a42a61419466084b65483
 SHA512:
-  metadata.gz: 9fe3469ade8447b7a46fe768a75e8939b01b1486193e69b201d2ae4c4f0d4452b37db3dd9c17a3dea76b4a5215fa38766b5d6243559771bffbecfae696935a35
-  data.tar.gz: 4edef9cd083130f4f1f39abb280c1e28c272fec6769817b98de87cca7bb4978c77c2b9b478d6dce9792a4ef0b741778f1998a84377b832ed6878b72da066aaab
+  metadata.gz: 6704684fbd7871d2208ab74efd4008d5ce7ae695c6a8058316c190e531a49225a307b86b0f35c32cf386174c40037e52ee288deccaf8133de7aa3b11b4b9314e
+  data.tar.gz: 98aa7d6912dc88001a641d9acfbe9b12888212f8e900973cbffca9af2ce6011f9ce21f9fdc40a1e3bc13c667d12ccd5ff81cbb50f19798b0128e8166d957a68b

data/README.md

@@ -11,11 +11,11 @@ ddbcli is an interactive command-line client of Amazon DynamoDB.
 
 If you are not using RubyGems, you can use the script files that depend on only Ruby.
 
-[ddbcli-0.3.6](https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.6)
+[ddbcli-0.3.7](https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.7)
 
 ```sh
-wget https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.6
-mv ddbcli-0.3.6 ddbcli
+wget https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.7
+mv ddbcli-0.3.7 ddbcli
 chmod 755 ddbcli
 ./ddbcli # show prompt
 ```
@@ -62,6 +62,10 @@ DEBUG: 'i' contains: [{"gender"=>"F"}, {"gender"=>"F"}, {"gender"=>"F"}] ...
 
 * [https://gist.github.com/winebarrel/7938971](https://gist.github.com/winebarrel/7938971)
 
+## Use QueryFilter
+
+* [https://gist.github.com/winebarrel/cdfc59ff6188b1e49027](https://gist.github.com/winebarrel/cdfc59ff6188b1e49027)
+
 ## Enable ctrl-r (reverse-search-history) on OS X
 
     $ echo 'bind "^R" em-inc-search-prev' >> ~/.editrc

data/lib/ddbcli/ddb-client.rb

@@ -69,12 +69,12 @@ EOS
         'X-Amz-Target'         => "DynamoDB_#{API_VERSION.gsub('-', '')}.#{action}",
         'Content-Length'       => req_body.length.to_s,
         'User-Agent'           => USER_AGENT,
-        'Host'                 => 'dynamodb.us-east-1.amazonaws.com',
+        'Host'                 => @endpoint.host,
         'X-Amz-Date'           => iso8601(date),
         'X-Amz-Content-Sha256' => hexhash(req_body),
         'Accept'               => '*/*',
         'Accept-Encoding'      => 'gzip',
-     }
+      }
 
       headers['Authorization'] = authorization(date, headers, req_body)
 
@@ -246,4 +246,4 @@ EOS
       return retval
     end
   end # Client
-end # SimpleDB
+end # DynamoDB

data/lib/ddbcli/ddb-parser.tab.rb

@@ -14,7 +14,7 @@ module DynamoDB
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end ddb-parser.y/module_eval...', 'ddb-parser.y', 545)
+module_eval(<<'...end ddb-parser.y/module_eval...', 'ddb-parser.y', 549)
 
 KEYWORDS = %w(
   ADD
@@ -185,212 +185,214 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     3,     4,   252,   160,   160,    18,   191,   160,   160,   160,
-    21,   288,   289,    19,    20,   162,   162,    52,    52,   162,
-   162,   162,   110,   251,   160,   159,   159,   160,   190,   159,
-   159,   159,    22,    23,    24,    25,   162,   263,   160,   162,
-    26,   160,    25,   173,    50,    50,   159,   107,   174,   159,
-   162,   201,   160,   162,   156,    52,   160,   229,    27,   230,
+     3,     4,   256,   160,   160,    18,   191,   160,   160,   160,
+    21,    78,    79,    19,    20,   162,   162,    52,    52,   162,
+   162,   162,   110,   255,   160,   159,   159,   160,   190,   159,
+   159,   159,    22,    23,    24,    25,   162,   294,   160,   162,
+    26,   160,    25,   173,    50,    50,   159,   113,   174,   159,
+   162,   201,   160,   162,   156,    52,   160,   231,    27,   232,
    159,    28,    29,   159,   162,    30,   161,   161,   162,   192,
    161,   161,   161,   197,   159,   128,   171,   128,   159,    54,
-   201,    73,    50,    90,   172,    52,    91,   161,    94,   113,
-   161,    93,   223,   198,   199,   200,   202,    55,   134,    49,
-   107,   161,   197,    48,   161,    90,    57,    90,    91,   114,
-    91,    47,    50,    56,   115,   161,    32,    33,    34,   161,
+   201,    73,    50,    90,   172,    52,    91,   161,    90,   250,
+   161,    91,   223,   198,   199,   200,   202,    55,   107,    49,
+   134,   161,   197,    48,   161,   252,   253,    57,   241,   240,
+    94,    47,    50,    93,    56,   161,    32,    33,    34,   161,
     35,   205,   198,   199,   200,   202,   204,   206,   209,   210,
-   211,    36,    37,   311,    38,    39,   312,   305,   306,   307,
-   231,   117,   232,   142,   143,   144,   233,   118,   234,   305,
-   306,   307,   285,   119,   277,   142,   143,   144,   320,   121,
-   321,   142,   143,   144,   276,   122,   277,   142,   143,   144,
-   142,   143,   144,   288,   289,   241,   240,    78,    79,    78,
-    79,   123,   124,   105,   107,   102,   129,   105,   133,   134,
-    69,   138,   139,   140,   101,   100,   147,   148,   149,   134,
-   151,   152,   105,    99,    98,   164,   165,   168,    63,   170,
-    95,    97,    96,    95,   176,   178,   181,   182,   183,    63,
-   185,   186,    88,    63,   133,    85,   196,    86,   212,   213,
-   214,   215,   216,   217,   219,   168,   221,    85,   225,   121,
-   227,   134,    83,    82,    81,   168,    80,   162,    76,    75,
-   242,   244,   245,   246,   247,   248,   249,    63,    74,   196,
-   181,    71,    70,   256,   147,   134,    63,   260,   261,   262,
-   109,   264,   265,    69,   268,   269,    67,   271,   178,    63,
-    66,   275,    65,   278,    64,   219,    63,    61,   283,    63,
-    60,    59,   290,   291,   292,    58,   294,   295,   296,   297,
-    45,   300,   301,   302,    44,    43,    42,   309,   310,    41,
-   314,   316,   317,   318,    40,    31,   322,   323,   324,   172,
-   174 ]
+   211,    36,    37,    90,    38,    39,    91,   312,    78,    79,
+   313,   142,   143,   144,   142,   143,   144,   229,   114,   230,
+   142,   143,   144,   306,   307,   308,   321,   115,   322,   142,
+   143,   144,   142,   143,   144,   297,   283,   284,   284,   233,
+   117,   234,   306,   307,   308,   252,   253,   252,   253,   118,
+   119,   121,   122,   123,   124,   107,   107,   105,   129,   105,
+   133,   134,    69,   138,   139,   140,   102,   101,   147,   148,
+   149,   134,   151,   152,   105,   100,    99,   164,   165,   168,
+    63,   170,    95,    98,    97,    96,   176,   178,   181,   182,
+   183,    63,   185,   186,    95,    63,   133,    88,   196,    85,
+   212,   213,   214,   215,   216,   217,   219,   168,   221,    86,
+   225,   121,   227,   134,    85,    83,    82,   168,    81,   162,
+    80,    76,   242,   244,   245,   246,   247,   248,    75,    63,
+    74,   196,   181,    71,    70,   260,   147,   134,    63,   264,
+   265,   266,   267,   268,   269,    69,   272,   273,   274,    67,
+   276,   277,   278,   178,    63,    66,   282,    65,    64,   286,
+   287,   288,    63,   219,    61,    60,   293,   109,   295,    63,
+    59,    58,    45,   301,   274,   302,   303,    44,    43,    42,
+   310,   311,    41,   315,   317,   318,   319,    40,    31,   323,
+   324,   325,   172,   174 ]
 
 racc_action_check = [
-     0,     0,   219,   275,   129,     0,   162,   165,   271,   263,
-     0,   283,   283,     0,     0,   275,   129,    26,   100,   165,
-   271,   263,    83,   219,   203,   275,   129,   205,   162,   165,
-   271,   263,     0,     0,     0,     0,   203,   238,   244,   205,
-     0,   222,    83,   139,    26,   100,   203,    81,   139,   205,
-   244,   181,   223,   222,   129,    48,   277,   187,     0,   187,
-   244,     0,     0,   222,   223,     0,   275,   129,   277,   162,
-   165,   271,   263,   181,   223,   130,   138,   103,   277,    27,
-   168,    48,    48,   140,   138,    25,   140,   203,    67,    85,
-   205,    67,   181,   181,   181,   181,   181,    27,   130,    25,
-   103,   244,   168,    25,   222,    66,    28,   118,    66,    90,
-   118,    25,    25,    28,    91,   223,     2,     2,     2,   277,
+     0,     0,   219,   278,   129,     0,   162,   165,   284,   267,
+     0,    54,    54,     0,     0,   278,   129,    26,   100,   165,
+   284,   267,    83,   219,   203,   278,   129,   205,   162,   165,
+   284,   267,     0,     0,     0,     0,   203,   287,   244,   205,
+     0,   222,    83,   139,    26,   100,   203,    85,   139,   205,
+   244,   181,   223,   222,   129,    48,   282,   188,     0,   188,
+   244,     0,     0,   222,   223,     0,   278,   129,   282,   162,
+   165,   284,   267,   181,   223,   103,   138,   130,   282,    27,
+   168,    48,    48,   118,   138,    25,   118,   203,   140,   217,
+   205,   140,   181,   181,   181,   181,   181,    27,   103,    25,
+   130,   244,   168,    25,   222,   217,   217,    28,   206,   206,
+    67,    25,    25,    67,    28,   223,     2,     2,     2,   282,
      2,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,    18,    18,   308,    18,    18,   308,   302,   302,   302,
-   188,    93,   188,   314,   314,   314,   189,    94,   189,   301,
-   301,   301,   281,    95,   281,   300,   300,   300,   315,    96,
-   315,   117,   117,   117,   266,    97,   266,   249,   249,   249,
-   296,   296,   296,   290,   290,   206,   206,    80,    80,    54,
-    54,    98,    99,    77,   102,    76,   105,   106,   107,   109,
-   110,   114,   115,   116,    75,    74,   120,   121,   122,   123,
-   124,   125,   128,    73,    72,   131,   133,   134,   135,   136,
-   137,    71,    70,    68,   141,   146,   147,   148,   149,   150,
-   151,   152,    65,   163,   164,    64,   166,    63,   170,   171,
-   172,   173,   174,   176,   177,   178,   179,    62,   182,   183,
-   185,   186,    58,    57,    56,   196,    55,   204,    53,    51,
-   211,   212,   213,   214,   215,   216,   217,   218,    49,   220,
-   221,    47,    46,   225,   226,   227,   228,   230,   232,   234,
-    82,   241,   243,    43,   245,   247,    42,   255,   257,   258,
-    40,   265,    39,   270,    37,   272,    36,    35,   278,   280,
-    34,    31,   286,   288,   289,    29,   291,   292,   294,   295,
-    24,   297,   298,   299,    23,    22,    21,   303,   307,    20,
-   309,   310,   311,   312,    19,     1,   317,   318,   321,   322,
-   323 ]
+   168,    18,    18,    66,    18,    18,    66,   309,    80,    80,
+   309,   315,   315,   315,   117,   117,   117,   187,    90,   187,
+   294,   294,   294,   302,   302,   302,   316,    91,   316,   301,
+   301,   301,   250,   250,   250,   291,   270,   291,   270,   189,
+    93,   189,   303,   303,   303,   293,   293,   274,   274,    94,
+    95,    96,    97,    98,    99,    81,   102,    77,   105,   106,
+   107,   109,   110,   114,   115,   116,    76,    75,   120,   121,
+   122,   123,   124,   125,   128,    74,    73,   131,   133,   134,
+   135,   136,   137,    72,    71,    70,   141,   146,   147,   148,
+   149,   150,   151,   152,    68,   163,   164,    65,   166,    64,
+   170,   171,   172,   173,   174,   176,   177,   178,   179,    63,
+   182,   183,   185,   186,    62,    58,    57,   196,    56,   204,
+    55,    53,   211,   212,   213,   214,   215,   216,    51,   218,
+    49,   220,   221,    47,    46,   225,   226,   227,   228,   230,
+   232,   234,   238,   241,   243,    43,   245,   247,   249,    42,
+   252,   253,   259,   261,   262,    40,   269,    39,    37,   275,
+   276,   277,    36,   279,    35,    34,   286,    82,   288,   290,
+    31,    29,    24,   295,   298,   299,   300,    23,    22,    21,
+   304,   308,    20,   310,   311,   312,   313,    19,     1,   318,
+   319,   322,   323,   324 ]
 
 racc_action_pointer = [
-    -2,   315,   114,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   123,   305,
-   296,   297,   296,   291,   287,    72,     4,    66,    75,   230,
-   nil,   291,   nil,   nil,   285,   282,   228,   274,   nil,   273,
-   267,   nil,   263,   260,   nil,   nil,   224,   244,    42,   217,
-   nil,   229,   nil,   210,   118,   233,   231,   205,   229,   nil,
-   nil,   nil,   223,   200,   211,   209,    80,    74,   193,   nil,
-   199,   171,   166,   186,   168,   181,   172,   170,   nil,   nil,
-   116,     4,   257,     5,   nil,    84,   nil,   nil,   nil,   nil,
-    83,    88,   nil,   128,   134,   140,   143,   147,   168,   142,
-     5,   nil,   141,    57,   nil,   160,   174,   175,   nil,   146,
-   177,   nil,   nil,   nil,   164,   165,   175,   139,    82,   nil,
-   153,   168,   160,   156,   182,   163,   nil,   nil,   189,    -1,
-    55,   161,   nil,   180,   194,   150,   191,   190,    56,    23,
-    58,   195,   nil,   nil,   nil,   nil,   156,   203,   200,   205,
-   161,   182,   208,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     1,   165,   211,     2,   182,   nil,    76,   nil,
-   162,   201,   204,   206,   206,   nil,   213,   178,   222,   192,
-   nil,    47,   225,   223,   nil,   227,   198,    39,   122,   128,
-   nil,   nil,   nil,   nil,   nil,   nil,   232,   nil,   nil,   nil,
-   nil,   nil,   nil,    19,   230,    22,   121,   nil,   nil,   nil,
-   nil,   197,   234,   226,   226,   228,   228,   243,   199,   -34,
-   215,   247,    36,    47,   nil,   245,   221,   222,   208,   nil,
-   240,   nil,   263,   nil,   201,   nil,   nil,   nil,    -7,   nil,
-   nil,   216,   nil,   252,    33,   247,   nil,   248,   nil,   145,
-   nil,   nil,   nil,   nil,   nil,   233,   nil,   219,   221,   nil,
-   nil,   nil,   nil,     4,   nil,   264,   146,   nil,   nil,   nil,
-   262,     3,   229,   nil,   nil,    -2,   nil,    51,   268,   nil,
-   231,   134,   nil,   -18,   nil,   nil,   272,   nil,   280,   265,
-   144,   279,   284,   nil,   285,   282,   148,   288,   284,   285,
-   133,   118,   106,   287,   nil,   nil,   nil,   291,   108,   297,
-   298,   286,   287,   nil,   121,   140,   nil,   289,   290,   nil,
-   nil,   305,   291,   295,   nil ]
+    -2,   318,   114,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   123,   308,
+   299,   300,   299,   294,   289,    72,     4,    66,    76,   236,
+   nil,   300,   nil,   nil,   290,   289,   234,   278,   nil,   278,
+   272,   nil,   266,   262,   nil,   nil,   226,   246,    42,   219,
+   nil,   238,   nil,   213,   -50,   237,   235,   208,   232,   nil,
+   nil,   nil,   230,   212,   215,   214,   108,    96,   204,   nil,
+   202,   174,   175,   189,   178,   184,   183,   174,   nil,   nil,
+    77,   142,   284,     5,   nil,    42,   nil,   nil,   nil,   nil,
+   122,   131,   nil,   157,   166,   167,   165,   164,   170,   144,
+     5,   nil,   143,    55,   nil,   162,   176,   177,   nil,   148,
+   179,   nil,   nil,   nil,   166,   167,   177,   122,    58,   nil,
+   155,   170,   162,   158,   184,   165,   nil,   nil,   191,    -1,
+    57,   163,   nil,   182,   196,   152,   193,   192,    56,    23,
+    63,   197,   nil,   nil,   nil,   nil,   158,   205,   202,   207,
+   163,   184,   210,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     1,   167,   213,     2,   184,   nil,    76,   nil,
+   164,   203,   206,   208,   208,   nil,   215,   180,   224,   194,
+   nil,    47,   227,   225,   nil,   229,   200,   129,    39,   151,
+   nil,   nil,   nil,   nil,   nil,   nil,   234,   nil,   nil,   nil,
+   nil,   nil,   nil,    19,   232,    22,    54,   nil,   nil,   nil,
+   nil,   199,   236,   228,   228,   230,   230,    76,   201,   -34,
+   217,   249,    36,    47,   nil,   247,   223,   224,   210,   nil,
+   242,   nil,   265,   nil,   203,   nil,   nil,   nil,   228,   nil,
+   nil,   218,   nil,   254,    33,   249,   nil,   250,   nil,   258,
+   140,   nil,   267,   252,   nil,   nil,   nil,   nil,   nil,   238,
+   nil,   224,   226,   nil,   nil,   nil,   nil,     4,   nil,   269,
+   148,   nil,   nil,   nil,   148,   268,   273,   278,    -2,   237,
+   nil,   nil,    51,   nil,     3,   nil,   276,    24,   281,   nil,
+   241,   147,   nil,   146,   128,   290,   nil,   nil,   284,   287,
+   288,   137,   122,   141,   290,   nil,   nil,   nil,   294,   112,
+   300,   301,   289,   290,   nil,   119,   138,   nil,   292,   293,
+   nil,   nil,   308,   294,   298,   nil ]
 
 racc_action_default = [
-  -145,  -145,    -1,    -6,    -7,    -8,    -9,   -10,   -11,   -12,
-   -13,   -14,   -15,   -16,   -17,   -18,   -19,   -20,  -145,  -145,
-  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -145,
-  -126,  -145,    -2,    -3,  -145,  -145,  -101,  -145,   -23,  -145,
-  -145,   -28,  -145,  -145,   -56,   -57,  -145,  -145,  -145,  -145,
-   -64,   -65,   -66,  -145,  -145,  -145,  -145,  -145,  -145,   325,
-    -4,    -5,   -25,  -145,   -25,  -145,  -145,  -145,   -55,  -143,
-  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -107,  -108,
-  -145,  -145,  -145,  -145,   -21,  -145,  -102,   -22,   -24,   -27,
-  -145,  -145,   -40,  -145,  -145,  -145,   -68,  -145,  -145,  -145,
-  -145,   -67,  -145,  -145,  -109,  -145,  -145,  -145,  -116,   -83,
-  -145,  -119,  -120,   -26,  -145,  -145,  -145,  -145,   -30,  -144,
-   -70,  -145,  -145,   -83,  -145,  -145,   -63,  -105,  -145,  -145,
-   -83,  -112,  -113,  -145,  -145,  -101,  -145,  -121,  -145,  -145,
-  -145,  -145,   -35,   -36,   -37,   -31,  -103,  -145,  -145,  -145,
-  -101,  -145,  -145,  -110,  -111,  -127,  -128,  -129,  -130,  -131,
-  -132,  -133,  -145,  -101,  -145,  -145,   -84,   -85,  -145,  -117,
-  -145,  -145,  -145,  -145,  -145,   -29,   -32,   -98,  -145,   -71,
-   -72,  -145,  -145,   -68,   -60,  -145,   -83,  -145,  -145,  -145,
-  -137,  -139,  -141,  -106,  -114,  -115,  -145,   -77,   -78,   -79,
-   -80,   -81,   -82,  -145,  -145,  -145,  -145,   -91,   -92,   -93,
-   -94,  -145,  -145,  -145,  -145,  -145,  -145,  -145,  -101,  -145,
-  -104,  -145,  -145,  -145,   -76,  -145,   -70,   -83,  -101,  -134,
-  -145,  -135,  -145,  -136,  -145,   -86,   -87,   -88,  -145,   -90,
-   -96,  -145,   -95,  -118,  -145,  -145,   -41,  -145,   -42,  -145,
-   -58,   -99,  -100,   -73,   -74,  -145,   -69,  -103,  -101,   -62,
-  -138,  -140,  -142,  -145,   -97,  -145,  -145,  -124,   -38,   -39,
-  -145,  -145,   -98,   -61,   -89,  -145,  -122,  -145,   -33,   -75,
-  -101,  -145,  -125,  -145,   -59,  -123,   -34,   -43,  -145,  -145,
-  -145,  -145,  -145,   -44,  -145,  -145,  -145,  -145,  -145,  -145,
-  -145,  -145,  -145,   -48,   -45,   -50,   -51,  -145,   -46,  -145,
-  -145,  -145,  -145,   -47,  -145,  -145,   -53,  -145,  -145,   -49,
-   -52,  -145,  -145,  -145,   -54 ]
+  -146,  -146,    -1,    -6,    -7,    -8,    -9,   -10,   -11,   -12,
+   -13,   -14,   -15,   -16,   -17,   -18,   -19,   -20,  -146,  -146,
+  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,
+  -127,  -146,    -2,    -3,  -146,  -146,  -102,  -146,   -23,  -146,
+  -146,   -28,  -146,  -146,   -57,   -58,  -146,  -146,  -146,  -146,
+   -65,   -66,   -67,  -146,  -146,  -146,  -146,  -146,  -146,   326,
+    -4,    -5,   -25,  -146,   -25,  -146,  -146,  -146,   -56,  -144,
+  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -108,  -109,
+  -146,  -146,  -146,  -146,   -21,  -146,  -103,   -22,   -24,   -27,
+  -146,  -146,   -41,  -146,  -146,  -146,   -69,  -146,  -146,  -146,
+  -146,   -68,  -146,  -146,  -110,  -146,  -146,  -146,  -117,   -84,
+  -146,  -120,  -121,   -26,  -146,  -146,  -146,  -146,   -30,  -145,
+   -71,  -146,  -146,   -84,  -146,  -146,   -64,  -106,  -146,  -146,
+   -84,  -113,  -114,  -146,  -146,  -102,  -146,  -122,  -146,  -146,
+  -146,  -146,   -36,   -37,   -38,   -31,  -104,  -146,  -146,  -146,
+  -102,  -146,  -146,  -111,  -112,  -128,  -129,  -130,  -131,  -132,
+  -133,  -134,  -146,  -102,  -146,  -146,   -85,   -86,  -146,  -118,
+  -146,  -146,  -146,  -146,  -146,   -29,   -32,   -99,  -146,   -72,
+   -73,  -146,  -146,   -69,   -61,  -146,   -84,  -146,  -146,  -146,
+  -138,  -140,  -142,  -107,  -115,  -116,  -146,   -78,   -79,   -80,
+   -81,   -82,   -83,  -146,  -146,  -146,  -146,   -92,   -93,   -94,
+   -95,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -102,  -146,
+  -105,  -146,  -146,  -146,   -77,  -146,   -71,   -84,  -102,  -135,
+  -146,  -136,  -146,  -137,  -146,   -87,   -88,   -89,  -146,   -91,
+   -97,  -146,   -96,  -119,  -146,  -146,   -42,  -146,   -43,   -33,
+  -146,   -44,  -146,  -146,   -59,  -100,  -101,   -74,   -75,  -146,
+   -70,  -104,  -102,   -63,  -139,  -141,  -143,  -146,   -98,  -146,
+  -146,  -125,   -39,   -40,  -146,  -146,  -146,  -146,  -146,   -99,
+   -62,   -90,  -146,  -123,  -146,   -45,   -34,  -146,  -146,   -76,
+  -102,  -146,  -126,  -146,  -146,  -146,   -60,  -124,   -35,  -146,
+  -146,  -146,  -146,  -146,   -49,   -46,   -51,   -52,  -146,   -47,
+  -146,  -146,  -146,  -146,   -48,  -146,  -146,   -54,  -146,  -146,
+   -50,   -53,  -146,  -146,  -146,   -55 ]
 
 racc_goto_table = [
     62,   141,   155,   135,   177,   146,   218,   120,    11,    12,
-    46,    53,   180,    89,    68,   132,   166,   150,   266,   103,
-    77,   108,   207,   287,   163,    84,     1,    87,   304,   308,
-   293,   315,   313,    72,   286,   224,   299,   116,   195,    17,
-    16,    15,   126,   127,    14,   179,   106,    13,   130,   281,
-   222,    10,     9,     8,   235,   203,   237,   239,   208,     7,
-   220,     6,   153,   154,   131,   145,     5,   136,   243,     2,
-   187,   188,   194,   189,   nil,   nil,   236,   nil,   238,   nil,
-   228,   137,   nil,   nil,   nil,   125,   253,   175,   nil,   nil,
-   nil,   111,   112,   nil,   226,   254,   255,   nil,   nil,   169,
-   nil,   280,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   257,   nil,   nil,   184,   272,   nil,   nil,   nil,   nil,
-   nil,   258,   nil,   nil,   nil,   nil,   nil,   193,   nil,   nil,
-   nil,   nil,   nil,   270,   nil,   nil,   274,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   279,   nil,   nil,   nil,   nil,   nil,
-   282,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   249,    89,    46,    53,   180,    68,   132,   150,   166,   270,
+   103,    77,   108,   207,   163,    84,     1,    87,   305,   309,
+   316,   285,   314,   300,   116,    72,   224,    17,   195,    16,
+    15,    14,   179,   126,   127,    13,   222,   106,    10,   130,
+     9,     8,   235,   203,   237,   239,   208,   291,     7,     6,
+   153,   154,   220,   145,   131,     5,   136,   243,     2,   187,
+   188,   189,   nil,   194,   nil,   nil,   236,   nil,   238,   nil,
+   228,   nil,   137,   nil,   nil,   175,   298,   125,   257,   nil,
+   nil,   111,   112,   nil,   226,   258,   259,   nil,   nil,   169,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   290,   nil,
+   nil,   261,   nil,   nil,   184,   nil,   nil,   nil,   nil,   279,
+   nil,   262,   nil,   nil,   nil,   nil,   nil,   193,   nil,   nil,
+   nil,   nil,   nil,   nil,   275,   nil,   nil,   nil,   nil,   nil,
+   281,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   289,   nil,   nil,   nil,   nil,   nil,   292,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   299,   nil,
+   nil,   nil,   254,   nil,   nil,   304,   nil,   nil,   nil,   nil,
+   nil,   nil,   263,   nil,   nil,   nil,   nil,   nil,   nil,   320,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   298,   nil,   250,   nil,   303,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   259,   nil,   nil,   nil,   nil,   nil,   319,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   280,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   273,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   284 ]
+   nil,   nil,   nil,   nil,   296 ]
 
 racc_goto_check = [
     16,    20,    39,    33,    31,    30,    32,    29,     9,    10,
-    28,    28,    37,    18,    27,    52,    41,    33,    55,    48,
-    47,    34,    40,    23,    33,    17,     1,    17,    24,    24,
-    23,    26,    22,    28,    21,    40,    25,    19,    39,    15,
-    14,    13,    34,    34,    12,    36,    47,    11,    48,    55,
-    38,     8,     7,     6,    42,    43,    44,    45,    46,     5,
-    41,     4,    49,    50,    51,    18,     3,    53,    54,     2,
-    57,    58,    52,    59,   nil,   nil,    39,   nil,    39,   nil,
-    33,    27,   nil,   nil,   nil,    28,    37,    18,   nil,   nil,
+    21,    18,    28,    28,    37,    27,    52,    33,    41,    55,
+    48,    47,    34,    40,    33,    17,     1,    17,    24,    24,
+    26,    23,    22,    25,    19,    28,    40,    15,    39,    14,
+    13,    12,    36,    34,    34,    11,    38,    47,     8,    48,
+     7,     6,    42,    43,    44,    45,    46,    55,     5,     4,
+    49,    50,    41,    18,    51,     3,    53,    54,     2,    57,
+    58,    59,   nil,    52,   nil,   nil,    39,   nil,    39,   nil,
+    33,   nil,    27,   nil,   nil,    18,    21,    28,    37,   nil,
    nil,     9,    10,   nil,    29,    39,    39,   nil,   nil,    16,
-   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    30,   nil,   nil,    16,    31,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32,   nil,
+   nil,    30,   nil,   nil,    16,   nil,   nil,   nil,   nil,    31,
    nil,    33,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,
-   nil,   nil,   nil,    20,   nil,   nil,    39,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    39,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    20,   nil,   nil,   nil,   nil,   nil,
     39,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    39,   nil,   nil,   nil,   nil,   nil,    39,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    20,   nil,
+   nil,   nil,    16,   nil,   nil,    20,   nil,   nil,   nil,   nil,
+   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,    20,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    20,   nil,    16,   nil,    20,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,    20,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    16 ]
 
 racc_goto_pointer = [
-   nil,    26,    69,    66,    61,    59,    53,    52,    51,     8,
-     9,    47,    44,    41,    40,    39,   -36,   -37,   -53,   -56,
-  -116,  -249,  -276,  -260,  -273,  -261,  -279,   -29,   -15,   -89,
-  -115,  -142,  -171,  -106,   -60,   nil,  -102,  -135,  -131,  -127,
-  -146,  -118,  -142,  -113,  -148,  -149,  -110,   -34,   -58,   -66,
-   -66,   -43,   -92,   -43,  -144,  -226,   nil,   -92,   -91,   -89 ]
+   nil,    26,    68,    65,    59,    58,    51,    50,    48,     8,
+     9,    45,    41,    40,    39,    37,   -36,   -37,   -55,   -59,
+  -116,  -207,  -277,  -243,  -274,  -262,  -281,   -28,   -13,   -89,
+  -115,  -142,  -171,  -106,   -59,   nil,  -105,  -133,  -135,  -127,
+  -145,  -116,  -144,  -115,  -150,  -151,  -112,   -33,   -57,   -68,
+   -68,   -43,   -91,   -44,  -145,  -225,   nil,   -93,   -92,   -91 ]
 
 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,    92,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    51,   nil,   nil,   nil,   267,
+   nil,   nil,    92,   251,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    51,   nil,   nil,   nil,   271,
    nil,   nil,   167,   nil,   158,   nil,   nil,   nil,   nil,   104,
    nil,   nil,   nil,   nil,   nil,   nil,   157,   nil,   nil,   nil ]
 
@@ -428,100 +430,101 @@ racc_reduce_table = [
   5, 75, :_reduce_30,
   6, 75, :_reduce_31,
   3, 88, :_reduce_32,
-  7, 88, :_reduce_33,
-  9, 88, :_reduce_34,
-  1, 89, :_reduce_35,
+  5, 88, :_reduce_33,
+  7, 88, :_reduce_34,
+  9, 88, :_reduce_35,
   1, 89, :_reduce_36,
   1, 89, :_reduce_37,
-  7, 87, :_reduce_38,
+  1, 89, :_reduce_38,
   7, 87, :_reduce_39,
+  7, 87, :_reduce_40,
   1, 87, :_reduce_none,
-  6, 91, :_reduce_41,
   6, 91, :_reduce_42,
-  1, 90, :_reduce_43,
-  3, 90, :_reduce_44,
-  7, 92, :_reduce_45,
+  6, 91, :_reduce_43,
+  1, 90, :_reduce_44,
+  3, 90, :_reduce_45,
   7, 92, :_reduce_46,
-  8, 92, :_reduce_47,
-  2, 94, :_reduce_48,
-  5, 94, :_reduce_49,
-  1, 93, :_reduce_50,
+  7, 92, :_reduce_47,
+  8, 92, :_reduce_48,
+  2, 94, :_reduce_49,
+  5, 94, :_reduce_50,
   1, 93, :_reduce_51,
-  4, 93, :_reduce_52,
-  1, 95, :_reduce_53,
-  3, 95, :_reduce_54,
-  3, 76, :_reduce_55,
-  2, 77, :_reduce_56,
+  1, 93, :_reduce_52,
+  4, 93, :_reduce_53,
+  1, 95, :_reduce_54,
+  3, 95, :_reduce_55,
+  3, 76, :_reduce_56,
   2, 77, :_reduce_57,
-  9, 78, :_reduce_58,
-  12, 78, :_reduce_59,
-  7, 79, :_reduce_60,
-  10, 79, :_reduce_61,
-  9, 79, :_reduce_62,
-  5, 80, :_reduce_63,
-  1, 97, :_reduce_64,
+  2, 77, :_reduce_58,
+  9, 78, :_reduce_59,
+  12, 78, :_reduce_60,
+  7, 79, :_reduce_61,
+  10, 79, :_reduce_62,
+  9, 79, :_reduce_63,
+  5, 80, :_reduce_64,
   1, 97, :_reduce_65,
-  1, 104, :_reduce_66,
-  3, 104, :_reduce_67,
+  1, 97, :_reduce_66,
+  1, 104, :_reduce_67,
+  3, 104, :_reduce_68,
   0, 98, :_reduce_none,
-  5, 98, :_reduce_69,
+  5, 98, :_reduce_70,
   0, 99, :_reduce_none,
-  2, 99, :_reduce_71,
-  1, 105, :_reduce_72,
-  3, 105, :_reduce_73,
-  3, 106, :_reduce_74,
-  5, 106, :_reduce_75,
+  2, 99, :_reduce_72,
+  1, 105, :_reduce_73,
+  3, 105, :_reduce_74,
+  3, 106, :_reduce_75,
+  5, 106, :_reduce_76,
   1, 107, :_reduce_none,
-  1, 109, :_reduce_77,
   1, 109, :_reduce_78,
   1, 109, :_reduce_79,
   1, 109, :_reduce_80,
   1, 109, :_reduce_81,
+  1, 109, :_reduce_82,
   1, 109, :_reduce_none,
   0, 102, :_reduce_none,
-  2, 102, :_reduce_84,
-  1, 110, :_reduce_85,
-  3, 110, :_reduce_86,
-  3, 111, :_reduce_87,
+  2, 102, :_reduce_85,
+  1, 110, :_reduce_86,
+  3, 110, :_reduce_87,
   3, 111, :_reduce_88,
-  5, 111, :_reduce_89,
-  3, 111, :_reduce_90,
+  3, 111, :_reduce_89,
+  5, 111, :_reduce_90,
+  3, 111, :_reduce_91,
   1, 112, :_reduce_none,
   1, 112, :_reduce_none,
-  1, 112, :_reduce_93,
+  1, 112, :_reduce_94,
   1, 115, :_reduce_none,
-  2, 115, :_reduce_95,
-  1, 114, :_reduce_96,
-  2, 114, :_reduce_97,
+  2, 115, :_reduce_96,
+  1, 114, :_reduce_97,
+  2, 114, :_reduce_98,
   0, 101, :_reduce_none,
-  2, 101, :_reduce_99,
   2, 101, :_reduce_100,
+  2, 101, :_reduce_101,
   0, 85, :_reduce_none,
-  2, 85, :_reduce_102,
+  2, 85, :_reduce_103,
   0, 100, :_reduce_none,
-  2, 100, :_reduce_104,
-  5, 81, :_reduce_105,
-  7, 81, :_reduce_106,
-  1, 116, :_reduce_107,
+  2, 100, :_reduce_105,
+  5, 81, :_reduce_106,
+  7, 81, :_reduce_107,
   1, 116, :_reduce_108,
-  1, 117, :_reduce_109,
-  3, 117, :_reduce_110,
-  3, 118, :_reduce_111,
-  2, 103, :_reduce_112,
-  1, 120, :_reduce_113,
-  3, 120, :_reduce_114,
-  3, 121, :_reduce_115,
-  4, 82, :_reduce_116,
-  6, 82, :_reduce_117,
-  8, 83, :_reduce_118,
-  4, 83, :_reduce_119,
+  1, 116, :_reduce_109,
+  1, 117, :_reduce_110,
+  3, 117, :_reduce_111,
+  3, 118, :_reduce_112,
+  2, 103, :_reduce_113,
+  1, 120, :_reduce_114,
+  3, 120, :_reduce_115,
+  3, 121, :_reduce_116,
+  4, 82, :_reduce_117,
+  6, 82, :_reduce_118,
+  8, 83, :_reduce_119,
   4, 83, :_reduce_120,
+  4, 83, :_reduce_121,
   1, 122, :_reduce_none,
-  3, 123, :_reduce_122,
-  5, 123, :_reduce_123,
-  1, 124, :_reduce_124,
-  3, 124, :_reduce_125,
-  1, 84, :_reduce_126,
+  3, 123, :_reduce_123,
+  5, 123, :_reduce_124,
+  1, 124, :_reduce_125,
+  3, 124, :_reduce_126,
+  1, 84, :_reduce_127,
   1, 119, :_reduce_none,
   1, 119, :_reduce_none,
   1, 108, :_reduce_none,
@@ -529,21 +532,21 @@ racc_reduce_table = [
   1, 125, :_reduce_none,
   1, 125, :_reduce_none,
   1, 125, :_reduce_none,
-  3, 113, :_reduce_134,
   3, 113, :_reduce_135,
   3, 113, :_reduce_136,
-  1, 126, :_reduce_137,
-  3, 126, :_reduce_138,
-  1, 127, :_reduce_139,
-  3, 127, :_reduce_140,
-  1, 128, :_reduce_141,
-  3, 128, :_reduce_142,
-  1, 96, :_reduce_143,
-  3, 96, :_reduce_144 ]
+  3, 113, :_reduce_137,
+  1, 126, :_reduce_138,
+  3, 126, :_reduce_139,
+  1, 127, :_reduce_140,
+  3, 127, :_reduce_141,
+  1, 128, :_reduce_142,
+  3, 128, :_reduce_143,
+  1, 96, :_reduce_144,
+  3, 96, :_reduce_145 ]
 
-racc_reduce_n = 145
+racc_reduce_n = 146
 
-racc_shift_n = 325
+racc_shift_n = 326
 
 racc_token_table = {
   false => 0,
@@ -929,113 +932,120 @@ module_eval(<<'.,.,', 'ddb-parser.y', 94)
 
 module_eval(<<'.,.,', 'ddb-parser.y', 98)
   def _reduce_33(val, _values)
-                            {:hash => {:name => val[0], :type => val[1]}, :range => {:name => val[4], :type => val[5]}, :indices => nil}
+                            {:hash => {:name => val[0], :type => val[1]}, :range => nil, :indices => val[4]}
                       
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 102)
   def _reduce_34(val, _values)
-                            {:hash => {:name => val[0], :type => val[1]}, :range => {:name => val[4], :type => val[5]}, :indices => val[8]}
+                            {:hash => {:name => val[0], :type => val[1]}, :range => {:name => val[4], :type => val[5]}, :indices => nil}
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 107)
+module_eval(<<'.,.,', 'ddb-parser.y', 106)
   def _reduce_35(val, _values)
-                         'S'
-                   
+                            {:hash => {:name => val[0], :type => val[1]}, :range => {:name => val[4], :type => val[5]}, :indices => val[8]}
+                      
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 111)
   def _reduce_36(val, _values)
-                         'N'
+                         'S'
                    
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 115)
   def _reduce_37(val, _values)
-                         'B'
+                         'N'
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 120)
+module_eval(<<'.,.,', 'ddb-parser.y', 119)
   def _reduce_38(val, _values)
-                          {:read => val[2], :write => val[6]}
-                    
+                         'B'
+                   
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 124)
   def _reduce_39(val, _values)
+                          {:read => val[2], :write => val[6]}
+                    
+  end
+.,.,
+
+module_eval(<<'.,.,', 'ddb-parser.y', 128)
+  def _reduce_40(val, _values)
                           {:read => val[6], :write => val[2]}
                     
   end
 .,.,
 
-# reduce 40 omitted
+# reduce 41 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 130)
-  def _reduce_41(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 134)
+  def _reduce_42(val, _values)
                                  {:read => val[2], :write => val[5]}
                            
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 134)
-  def _reduce_42(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 138)
+  def _reduce_43(val, _values)
                                  {:read => val[5], :write => val[2]}
                            
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 139)
-  def _reduce_43(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 143)
+  def _reduce_44(val, _values)
                                 [val[0]]
                           
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 143)
-  def _reduce_44(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 147)
+  def _reduce_45(val, _values)
                                 val[0] + [val[2]]
                           
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 148)
-  def _reduce_45(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 152)
+  def _reduce_46(val, _values)
                            {:name => val[1], :key => val[3], :type => val[4], :projection => val[6]}
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 152)
-  def _reduce_46(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 156)
+  def _reduce_47(val, _values)
                            {:name => val[2], :keys => val[4], :projection => val[6], :global => true}
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 156)
-  def _reduce_47(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 160)
+  def _reduce_48(val, _values)
                            {:name => val[2], :keys => val[4], :projection => val[6], :capacity => val[7], :global => true}
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 161)
-  def _reduce_48(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 165)
+  def _reduce_49(val, _values)
                             {:hash => {:key => val[0], :type => val[1]}}
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 165)
-  def _reduce_49(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 169)
+  def _reduce_50(val, _values)
                             {
                           :hash => {:key => val[0], :type => val[1]},
                           :range => {:key => val[3], :type => val[4]},
@@ -1044,487 +1054,485 @@ module_eval(<<'.,.,', 'ddb-parser.y', 165)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 173)
-  def _reduce_50(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 177)
+  def _reduce_51(val, _values)
                                 {:type => 'ALL'}
                           
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 177)
-  def _reduce_51(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 181)
+  def _reduce_52(val, _values)
                                 {:type => 'KEYS_ONLY'}
                           
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 181)
-  def _reduce_52(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 185)
+  def _reduce_53(val, _values)
                                 {:type => 'INCLUDE', :attrs => val[2]}
                           
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 186)
-  def _reduce_53(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 190)
+  def _reduce_54(val, _values)
                                    [val[0]]
                              
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 190)
-  def _reduce_54(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 194)
+  def _reduce_55(val, _values)
                                    val[0] + [val[2]]
                              
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 195)
-  def _reduce_55(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 199)
+  def _reduce_56(val, _values)
                     struct(:DROP, :tables => val[2])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 200)
-  def _reduce_56(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 204)
+  def _reduce_57(val, _values)
                         struct(:DESCRIBE, :table => val[1])
                   
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 204)
-  def _reduce_57(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 208)
+  def _reduce_58(val, _values)
                         struct(:DESCRIBE, :table => val[1])
                   
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 209)
-  def _reduce_58(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 213)
+  def _reduce_59(val, _values)
                       struct(:SELECT, :attrs => val[1], :table => val[3], :index => val[4], :conds => val[5], :having => val[6], :order_asc => val[7], :limit => val[8], :count => false)
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 213)
-  def _reduce_59(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 217)
+  def _reduce_60(val, _values)
                       struct(:SELECT, :attrs => [], :table => val[6], :index => val[7], :conds => val[8], :having => val[9], :order_asc => val[10], :limit => val[11], :count => true)
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 218)
-  def _reduce_60(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 222)
+  def _reduce_61(val, _values)
                     struct(:SCAN, :attrs => val[2], :table => val[4], :conds => val[5], :limit => val[6], :count => false, :segment => nil, :total_segments => nil)
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 222)
-  def _reduce_61(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 226)
+  def _reduce_62(val, _values)
                     struct(:SCAN, :attrs => [], :table => val[7], :conds => val[8], :limit => val[9], :count => true, :segment => nil, :total_segments => nil)
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 226)
-  def _reduce_62(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 230)
+  def _reduce_63(val, _values)
                     struct(:SCAN, :attrs => val[4], :table => val[6], :conds => val[7], :limit => val[8], :count => false, :segment => val[1], :total_segments => val[3])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 231)
-  def _reduce_63(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 235)
+  def _reduce_64(val, _values)
                    struct(:GET, :attrs => val[1], :table => val[3], :conds => val[4])
              
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 236)
-  def _reduce_64(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 240)
+  def _reduce_65(val, _values)
                       []
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 240)
-  def _reduce_65(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 244)
+  def _reduce_66(val, _values)
                       val[0]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 245)
-  def _reduce_66(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 249)
+  def _reduce_67(val, _values)
                      [val[0]]
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 249)
-  def _reduce_67(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 253)
+  def _reduce_68(val, _values)
                      val[0] + [val[2]]
                
   end
 .,.,
 
-# reduce 68 omitted
+# reduce 69 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 255)
-  def _reduce_69(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 259)
+  def _reduce_70(val, _values)
                            val[3]
                      
   end
 .,.,
 
-# reduce 70 omitted
+# reduce 71 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 261)
-  def _reduce_71(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 265)
+  def _reduce_72(val, _values)
                               val[1]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 266)
-  def _reduce_72(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 270)
+  def _reduce_73(val, _values)
                            [val[0]]
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 270)
-  def _reduce_73(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 274)
+  def _reduce_74(val, _values)
                              val[0] + [val[2]]
                        
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 275)
-  def _reduce_74(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 279)
+  def _reduce_75(val, _values)
                       [val[0], val[1].to_s.upcase.to_sym, [val[2]]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 279)
-  def _reduce_75(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 283)
+  def _reduce_76(val, _values)
                       [val[0], val[1].to_s.upcase.to_sym, [val[2], val[4]]]
                 
   end
 .,.,
 
-# reduce 76 omitted
-
-module_eval(<<'.,.,', 'ddb-parser.y', 286)
-  def _reduce_77(val, _values)
-                          :EQ
-                    
-  end
-.,.,
+# reduce 77 omitted
 
 module_eval(<<'.,.,', 'ddb-parser.y', 290)
   def _reduce_78(val, _values)
-                          :LE
+                          :EQ
                     
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 294)
   def _reduce_79(val, _values)
-                          :LT
+                          :LE
                     
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 298)
   def _reduce_80(val, _values)
-                          :GE
+                          :LT
                     
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 302)
   def _reduce_81(val, _values)
-                          :GT
+                          :GE
                     
   end
 .,.,
 
-# reduce 82 omitted
+module_eval(<<'.,.,', 'ddb-parser.y', 306)
+  def _reduce_82(val, _values)
+                          :GT
+                    
+  end
+.,.,
 
 # reduce 83 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 309)
-  def _reduce_84(val, _values)
+# reduce 84 omitted
+
+module_eval(<<'.,.,', 'ddb-parser.y', 313)
+  def _reduce_85(val, _values)
                             val[1]
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 314)
-  def _reduce_85(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 318)
+  def _reduce_86(val, _values)
                          [val[0]]
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 318)
-  def _reduce_86(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 322)
+  def _reduce_87(val, _values)
                          val[0] + [val[2]]
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 323)
-  def _reduce_87(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 327)
+  def _reduce_88(val, _values)
                     [val[0], val[1].to_s.upcase.to_sym, [val[2]]]
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 327)
-  def _reduce_88(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 331)
+  def _reduce_89(val, _values)
                     [val[0], val[1].to_s.upcase.to_sym, val[2]]
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 331)
-  def _reduce_89(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 335)
+  def _reduce_90(val, _values)
                     [val[0], val[1].to_s.upcase.to_sym, [val[2], val[4]]]
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 335)
-  def _reduce_90(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 339)
+  def _reduce_91(val, _values)
                     [val[0], val[2].to_s.upcase.to_sym, []]
               
   end
 .,.,
 
-# reduce 91 omitted
-
 # reduce 92 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 341)
-  def _reduce_93(val, _values)
+# reduce 93 omitted
+
+module_eval(<<'.,.,', 'ddb-parser.y', 345)
+  def _reduce_94(val, _values)
                       :NE
                 
   end
 .,.,
 
-# reduce 94 omitted
+# reduce 95 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 347)
-  def _reduce_95(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 351)
+  def _reduce_96(val, _values)
                             :NOT_CONTAINS
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 351)
-  def _reduce_96(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 355)
+  def _reduce_97(val, _values)
                         :NULL
                   
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 355)
-  def _reduce_97(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 359)
+  def _reduce_98(val, _values)
                         :NOT_NULL
                   
   end
 .,.,
 
-# reduce 98 omitted
+# reduce 99 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 361)
-  def _reduce_99(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 365)
+  def _reduce_100(val, _values)
                        true
                  
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 365)
-  def _reduce_100(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 369)
+  def _reduce_101(val, _values)
                        false
                  
   end
 .,.,
 
-# reduce 101 omitted
+# reduce 102 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 371)
-  def _reduce_102(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 375)
+  def _reduce_103(val, _values)
                        val[1]
                  
   end
 .,.,
 
-# reduce 103 omitted
+# reduce 104 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 377)
-  def _reduce_104(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 381)
+  def _reduce_105(val, _values)
                        val[1]
                  
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 382)
-  def _reduce_105(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 386)
+  def _reduce_106(val, _values)
                       struct(:UPDATE, :table => val[1], :action => val[2], :attrs => val[3], :conds => val[4])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 386)
-  def _reduce_106(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 390)
+  def _reduce_107(val, _values)
                       struct(:UPDATE_ALL, :table => val[2], :action => val[3], :attrs => val[4], :conds => val[5], :limit => val[6])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 391)
-  def _reduce_107(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 395)
+  def _reduce_108(val, _values)
                      :PUT
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 395)
-  def _reduce_108(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 399)
+  def _reduce_109(val, _values)
                      :ADD
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 400)
-  def _reduce_109(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 404)
+  def _reduce_110(val, _values)
                               [val[0]]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 404)
-  def _reduce_110(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 408)
+  def _reduce_111(val, _values)
                               val[0] + [val[2]]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 409)
-  def _reduce_111(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 413)
+  def _reduce_112(val, _values)
                          [val[0], val[2]]
                    
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 414)
-  def _reduce_112(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 418)
+  def _reduce_113(val, _values)
                               val[1]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 419)
-  def _reduce_113(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 423)
+  def _reduce_114(val, _values)
                            [val[0]]
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 423)
-  def _reduce_114(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 427)
+  def _reduce_115(val, _values)
                            val[0] + [val[2]]
                      
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 428)
-  def _reduce_115(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 432)
+  def _reduce_116(val, _values)
                       [val[0], val[2]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 433)
-  def _reduce_116(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 437)
+  def _reduce_117(val, _values)
                       struct(:DELETE, :table => val[2], :conds => val[3])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 437)
-  def _reduce_117(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 441)
+  def _reduce_118(val, _values)
                       struct(:DELETE_ALL, :table => val[3], :conds => val[4], :limit => val[5])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 442)
-  def _reduce_118(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 446)
+  def _reduce_119(val, _values)
                       struct(:INSERT, :table => val[2], :attrs => val[4], :values => val[7])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 446)
-  def _reduce_119(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 450)
+  def _reduce_120(val, _values)
                       struct(:INSERT_SELECT, :table => val[2], :select => val[3])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 450)
-  def _reduce_120(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 454)
+  def _reduce_121(val, _values)
                       struct(:INSERT_SCAN, :table => val[2], :select => val[3])
                 
   end
 .,.,
 
-# reduce 121 omitted
+# reduce 122 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 457)
-  def _reduce_122(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 461)
+  def _reduce_123(val, _values)
                               [val[1]]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 461)
-  def _reduce_123(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 465)
+  def _reduce_124(val, _values)
                               val[0] + [val[3]]
                         
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 466)
-  def _reduce_124(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 470)
+  def _reduce_125(val, _values)
                             [val[0]]
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 470)
-  def _reduce_125(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 474)
+  def _reduce_126(val, _values)
                             val[0] + [val[2]]
                       
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 475)
-  def _reduce_126(val, _values)
+module_eval(<<'.,.,', 'ddb-parser.y', 479)
+  def _reduce_127(val, _values)
                     struct(:NEXT)
               
   end
 .,.,
 
-# reduce 127 omitted
-
 # reduce 128 omitted
 
 # reduce 129 omitted
@@ -1537,12 +1545,7 @@ module_eval(<<'.,.,', 'ddb-parser.y', 475)
 
 # reduce 133 omitted
 
-module_eval(<<'.,.,', 'ddb-parser.y', 489)
-  def _reduce_134(val, _values)
-                     val[1]
-               
-  end
-.,.,
+# reduce 134 omitted
 
 module_eval(<<'.,.,', 'ddb-parser.y', 493)
   def _reduce_135(val, _values)
@@ -1558,57 +1561,64 @@ module_eval(<<'.,.,', 'ddb-parser.y', 497)
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 502)
+module_eval(<<'.,.,', 'ddb-parser.y', 501)
   def _reduce_137(val, _values)
-                      [val[0]]
-                
+                     val[1]
+               
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 506)
   def _reduce_138(val, _values)
-                       val[0] + [val[2]]
+                      [val[0]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 511)
+module_eval(<<'.,.,', 'ddb-parser.y', 510)
   def _reduce_139(val, _values)
-                      [val[0]]
+                       val[0] + [val[2]]
                 
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 515)
   def _reduce_140(val, _values)
-                       val[0] + [val[2]]
+                      [val[0]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 520)
+module_eval(<<'.,.,', 'ddb-parser.y', 519)
   def _reduce_141(val, _values)
-                      [val[0]]
+                       val[0] + [val[2]]
                 
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 524)
   def _reduce_142(val, _values)
-                       val[0] + [val[2]]
+                      [val[0]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ddb-parser.y', 529)
+module_eval(<<'.,.,', 'ddb-parser.y', 528)
   def _reduce_143(val, _values)
-                          [val[0]]
-                    
+                       val[0] + [val[2]]
+                
   end
 .,.,
 
 module_eval(<<'.,.,', 'ddb-parser.y', 533)
   def _reduce_144(val, _values)
+                          [val[0]]
+                    
+  end
+.,.,
+
+module_eval(<<'.,.,', 'ddb-parser.y', 537)
+  def _reduce_145(val, _values)
                           val[0] + [val[2]]
                     
   end