ddbcli 0.1.6 → 0.1.7

data/bin/ddbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '0.1.6'
+Version = '0.1.7'
 
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.ddbcli_history')
 HISTSIZE = 500

data/lib/ddbcli/cli/functions.rb

@@ -46,8 +46,13 @@ def print_json(data, opts = {})
 
   str.sub!(/(?:\r\n|\r|\n)*\Z/, "\n")
 
-  if opts[:show_rows] and data.kind_of?(Array)
-    str << "// #{data.length} #{data.length > 1 ? 'rows' : 'row'} in set"
+  if opts[:show_rows]
+   if [Array, Hash].any? {|i| data.kind_of?(i) }
+      str << "// #{data.length} #{data.length > 1 ? 'rows' : 'row'} in set"
+    else
+      str << '// 1 row in set'
+    end
+
     str << " (%.2f sec)" % opts[:time] if opts[:time]
     str << "\n"
   end

data/lib/ddbcli/ddb-driver.rb

@@ -193,7 +193,10 @@ module DynamoDB
 
       table_names.map do |table_name|
         table_info = @client.query('DescribeTable', 'TableName' => table_name)['Table']
-        h[table_name] = table_info['TableStatus']
+        h[table_name] = {
+          'TableStatus' => table_info['TableStatus'],
+          'ItemCount'   => table_info['ItemCount'],
+        }
       end
 
       return h
@@ -479,17 +482,27 @@ module DynamoDB
         end
       else
         retval = block_given? ? res_data['Items'].map {|i| yield(i) } : res_data['Items']
+        limit_orig = parsed.limit
+
+        if @iteratable or opts[:iteratable] or (parsed.limit and retval.length < parsed.limit)
+          parsed.limit -= retval.length if parsed.limit
 
-        if (@iteratable or opts[:iteratable]) and not parsed.limit
           while res_data['LastEvaluatedKey']
             res_data = select_proc.call(res_data['LastEvaluatedKey'])
-            retval.concat(
-              block_given? ? res_data['Items'].map {|i| yield(i) } : res_data['Items']
-            )
+            items = block_given? ? res_data['Items'].map {|i| yield(i) } : res_data['Items']
+
+            retval.concat(items)
+
+            if parsed.limit
+              parsed.limit -= items.length
+              break if parsed.limit < 1
+            end
           end
         end
       end
 
+      parsed.limit = limit_orig;
+
       if res_data['LastEvaluatedKey']
         @last_action = action
         @last_parsed = parsed
@@ -667,7 +680,9 @@ module DynamoDB
         end # scan filter
 
         res_data = @client.query('Scan', req_hash)
-        items.concat(res_data['Items'])
+        res_data_items = res_data['Items']
+        parsed.limit -= res_data_items.length if parsed.limit
+        items.concat(res_data_items)
         res_data['LastEvaluatedKey']
       end
 
@@ -675,7 +690,10 @@ module DynamoDB
 
       loop do
         lek = scan.call(lek)
-        break unless lek
+
+        if not lek or (parsed.limit and parsed.limit < 1)
+          break
+        end
       end
 
       return items
@@ -761,7 +779,13 @@ module DynamoDB
     end
 
     def do_insert_select(action, parsed)
+      if parsed.count
+        raise DynamoDB::Error, '"COUNT(*)" cannot be inserted.'
+      end
+
       items = do_select0(action, parsed.select, :iteratable => true)
+      items = items.data if items.kind_of?(Iteratorable)
+
       n = 0
 
       until (chunk = items.slice!(0, MAX_NUMBER_BATCH_PROCESS_ITEMS)).empty?

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

@@ -758,7 +758,7 @@ module_eval(<<'.,.,', 'ddb-parser.y', 40)
 
 module_eval(<<'.,.,', 'ddb-parser.y', 44)
   def _reduce_20(val, _values)
-                    struct(:SHOW_TABLE_STATUS, :limit => val[2])
+                    struct(:SHOW_TABLE_STATUS)
               
   end
 .,.,

data/lib/ddbcli/ddb-parser.y

@@ -40,9 +40,9 @@ rule
               {
                 struct(:SHOW_TABLES, :limit => val[2])
               }
-  show_stmt : SHOW TABLE STATUS
+            | SHOW TABLE STATUS
               {
-                struct(:SHOW_TABLE_STATUS, :limit => val[2])
+                struct(:SHOW_TABLE_STATUS)
               }
             | SHOW REGIONS
               {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddbcli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json