ddbcli 0.3.5 → 0.3.6

data/lib/ddbcli/ddb-parser.y

@@ -205,13 +205,13 @@ rule
                     struct(:DESCRIBE, :table => val[1])
                   }
 
-  select_stmt : SELECT attrs_to_get FROM IDENTIFIER use_index_clause select_where_clause order_clause limit_clause
+  select_stmt : SELECT attrs_to_get FROM IDENTIFIER use_index_clause select_where_clause having_clause order_clause limit_clause
                 {
-                  struct(:SELECT, :attrs => val[1], :table => val[3], :index => val[4], :conds => val[5], :order_asc => val[6], :limit => val[7], :count => false)
+                  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)
                 }
-              | SELECT COUNT '(' '*' ')' FROM IDENTIFIER use_index_clause select_where_clause order_clause limit_clause
+              | SELECT COUNT '(' '*' ')' FROM IDENTIFIER use_index_clause select_where_clause having_clause order_clause limit_clause
                 {
-                  struct(:SELECT, :attrs => [], :table => val[6], :index => val[7], :conds => val[8], :order_asc => val[9], :limit => val[10], :count => true)
+                  struct(:SELECT, :attrs => [], :table => val[6], :index => val[7], :conds => val[8], :having => val[9], :order_asc => val[10], :limit => val[11], :count => true)
                 }
 
   scan_stmt : SELECT ALL attrs_to_get FROM IDENTIFIER scan_where_clause limit_clause
@@ -372,6 +372,12 @@ rule
                    val[1]
                  }
 
+  having_clause :
+               | HAVING scan_expr_list
+                 {
+                   val[1]
+                 }
+
   update_stmt : UPDATE IDENTIFIER set_or_add attr_to_update_list update_where_clause
                 {
                   struct(:UPDATE, :table => val[1], :action => val[2], :attrs => val[3], :conds => val[4])
@@ -557,6 +563,7 @@ KEYWORDS = %w(
   GET
   GLOBAL
   HASH
+  HAVING
   INCLUDE
   INDEX
   INSERT

data/lib/ddbcli/version.rb

@@ -1,5 +1,5 @@
 module DynamoDB
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
 
 Version = DynamoDB::VERSION

data/spec/spec_helper.rb

@@ -7,20 +7,24 @@ require 'tempfile'
 end
 
 def ddbcli(input = nil, args = [])
+  tempfile = nil
+
   if input
-    Tempfile.open('ddbcli') do |f|
-      f << input
-      input = f.path
-    end
+    tempfile = Tempfile.open('ddbcli')
+    tempfile << input
+    tempfile.flush
+    tempfile.rewind
+    input = tempfile.path
   end
 
   cmd = File.expand_path(File.dirname(__FILE__) + '/../bin/ddbcli')
   out = nil
 
-  args = ['--url', 'localhost:8000'] + args
+  args = ['--url', ENV['DYNAMODB_URL'] || 'localhost:8000'] + args
 
   if input
     out = `cat #{input} | #{cmd} #{args.join(' ')} 2>&1`
+    tempfile.close if tempfile
   else
     out = `#{cmd} #{args.join(' ')} 2>&1`
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddbcli
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: ddbcli is an interactive command-line client of Amazon DynamoDB.