Merge pull request #36 from dbcli/eliangcs/fix-negative-rows

eliangcs · eliangcs · commit f275214fc446 · 2016-02-17T22:41:41.000+08:00
Fix #35: "-1 rows"
diff --git a/tests/features/crud_table.feature b/tests/features/crud_table.feature
@@ -57,3 +57,15 @@ Feature: manipulate tables:
       and we wait for time prompt
       and we wait for prompt
       then wee see unicode result in file
+
+  Scenario: select 0 rows
+     Given we have vcli installed
+      when we run vcli without arguments
+      and we wait for prompt
+      and we create schema
+      then we see schema created
+      when we create table
+      then we see table created
+
+      when we select from table
+      then we see 0 rows
diff --git a/tests/features/specials.feature b/tests/features/specials.feature
@@ -1,6 +1,5 @@
 Feature: Special commands
 
-  @wip
   Scenario: run refresh command
      Given we have vcli installed
       when we run vcli without arguments
diff --git a/tests/features/steps/step_definitions.py b/tests/features/steps/step_definitions.py
@@ -324,6 +324,11 @@ def step_see_data_deleted(context):
     _expect(context, r'0\s*\|', timeout=1)
 
 
+@then('we see 0 rows')
+def step_see_0_rows(context):
+    _expect(context, '(0 rows)', timeout=1)
+
+
 @then('we see result in file')
 def step_see_result_in_file(context):
     assert os.path.exists(context.temp_filename)
diff --git a/vcli/main.py b/vcli/main.py
@@ -311,7 +311,8 @@ def prompt_tokens(cli):
                                 if cur.rowcount == 1:
                                     write_output(output, '(1 row)')
                                 elif headers:
-                                    write_output(output, '(%d rows)' % cur.rowcount)
+                                    rowcount = max(cur.rowcount, 0)
+                                    write_output(output, '(%d rows)' % rowcount)
                             if document.text.startswith('\\') and cur.rowcount == 0:
                                 stdout_output = ['No matching relations found.']
 
