Abhi/fixes (#125)

* Return empty rows instead of none, use uuid for request id

* Fix typo in exception

* Fix test_rowlimit.py and make show limit prompt handle None return type

* Use uuid int format

Author: abhisheksinha89

mssqlcli/jsonrpc/contracts/connectionservice.py

@@ -119,9 +119,9 @@ def __init__(self, params):
         self.error_message = inner_params[u'errorMessage']
         self.error_number = inner_params[u'errorNumber']
         # server information.
-        self.is_cloud = inner_params['serverInfo']['isCloud'] if inner_params['serverInfo'] else False
-        self.server_version = inner_params['serverInfo']['serverVersion'] if inner_params['serverInfo'] else None
-        self.server_edition = inner_params['serverInfo']['serverEdition'] if inner_params['serverInfo'] else None
+        self.is_cloud = inner_params[u'serverInfo'][u'isCloud'] if u'serverInfo' in inner_params else False
+        self.server_version = inner_params[u'serverInfo'][u'serverVersion'] if u'serverInfo' in inner_params else None
+        self.server_edition = inner_params[u'serverInfo'][u'serverEdition'] if u'serverInfo' in inner_params else None
 
 
 class ConnectionResponse(object):

mssqlcli/jsonrpc/contracts/queryexecutestringservice.py

@@ -164,7 +164,7 @@ def get_response(self):
 
         except Exception as error:
             self.finished = True
-            self.json_rpc_client.request_finised(self.id)
+            self.json_rpc_client.request_finished(self.id)
             return ResultSubset(None, error_message=str(error))
 
     def execute(self):

mssqlcli/main.py

@@ -487,6 +487,8 @@ def get_continuation_tokens(cli, width):
 
     def _should_show_limit_prompt(self, status, rows):
         """returns True if limit prompt should be shown, False otherwise."""
+        if not rows:
+            return False
         return self.row_limit > 0 and len(rows) > self.row_limit
 
     def _evaluate_command(self, text):

mssqlcli/mssqlcliclient.py

@@ -178,7 +178,7 @@ def tabular_results_generator(
         # Returns a generator of rows, columns, status(rows affected) or
         # message, sql (the query), is_error
         if is_error:
-            return None, None, message, query, is_error
+            return (), None, message, query, is_error
 
         columns = [
             col.column_name for col in column_info] if column_info else None

mssqlcli/sqltoolsclient.py

@@ -8,6 +8,7 @@
 import io
 import time
 import sys
+import uuid
 
 import mssqlcli.mssqltoolsservice as mssqltoolsservice
 import mssqlcli.jsonrpc.jsonrpcclient as json_rpc_client
@@ -29,7 +30,7 @@ def __init__(self, input_stream=None, output_stream=None):
             Input and output streams for JsonRpcClient are taken as optional params,
             Else a SqlToolsService process is started and its stdin and stdout is used.
         """
-        self.current_id = 1
+        self.current_id = uuid.uuid4().int
         self.tools_service_process = None
 
         if input_stream and output_stream:
@@ -60,23 +61,21 @@ def create_request(self, request_type, parameters):
             Create request of request type passed in.
         """
         request = None
+        self.current_id = uuid.uuid4().int
 
         if request_type == u'connection_request':
             logger.info(u'SqlToolsClient connection request Id {0}'.format(self.current_id))
             request = connection.ConnectionRequest(self.current_id, self.json_rpc_client, parameters)
-            self.current_id += 1
             return request
 
         if request_type == u'query_execute_string_request':
             logger.info(u'SqlToolsClient execute string request Id {0}'.format(self.current_id))
             request = query.QueryExecuteStringRequest(self.current_id, self.json_rpc_client, parameters)
-            self.current_id += 1
             return request
 
         if request_type == u'query_subset_request':
             logger.info(u'SqlToolsClient subset request Id {0}'.format(self.current_id))
             request = query.QuerySubsetRequest(self.current_id, self.json_rpc_client, parameters)
-            self.current_id += 1
             return request
 
     def shutdown(self):

tests/test_rowlimit.py

@@ -1,45 +1,37 @@
 from mssqlcli.main import MssqlCli
-from mock import Mock
 
 DEFAULT = MssqlCli().row_limit
 LIMIT = DEFAULT + 1000
 
-
-over_default = Mock()
-over_default.configure_mock(rowcount=DEFAULT + 10)
-
-over_limit = Mock()
-over_limit.configure_mock(rowcount=LIMIT + 10)
-
-low_count = Mock()
-low_count.configure_mock(rowcount=1)
-
+low_count = 1
+over_default = DEFAULT + 1
+over_limit = LIMIT + 1
 
 def test_default_row_limit():
     cli = MssqlCli()
     stmt = "SELECT * FROM students"
-    result = cli._should_show_limit_prompt(stmt, low_count)
+    result = cli._should_show_limit_prompt(stmt, ['row']*low_count)
     assert result is False
 
-    result = cli._should_show_limit_prompt(stmt, over_default)
+    result = cli._should_show_limit_prompt(stmt, ['row']*over_default)
     assert result is True
 
 
 def test_set_row_limit():
     cli = MssqlCli(row_limit=LIMIT)
     stmt = "SELECT * FROM students"
-    result = cli._should_show_limit_prompt(stmt, over_default)
+    result = cli._should_show_limit_prompt(stmt, ['row']*over_default)
     assert result is False
 
-    result = cli._should_show_limit_prompt(stmt, over_limit)
+    result = cli._should_show_limit_prompt(stmt, ['row']*over_limit)
     assert result is True
 
 
 def test_no_limit():
     cli = MssqlCli(row_limit=0)
     stmt = "SELECT * FROM students"
 
-    result = cli._should_show_limit_prompt(stmt, over_limit)
+    result = cli._should_show_limit_prompt(stmt, ['row']*over_limit)
     assert result is False
 
 
@@ -50,5 +42,5 @@ def test_row_limit_on_non_select():
     assert result is False
 
     cli = MssqlCli(row_limit=0)
-    result = cli._should_show_limit_prompt(stmt, over_default)
+    result = cli._should_show_limit_prompt(stmt, ['row']*over_default)
     assert result is False