merge master

Author: pensivebrian

.gitignore

@@ -8,7 +8,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
+env*/
 build/
 develop-eggs/
 dist/
@@ -83,7 +83,7 @@ celerybeat-schedule
 .env
 
 # sqltoolsservice binaries
-/pgcli/mssqltoolsservice/bin/*
+/mssqlcli/mssqltoolsservice/bin/*
 
 # virtualenv
 .venv

mssqlcli/main.py

@@ -124,7 +124,8 @@ def set_default_pager(self, config):
     def __init__(self, force_passwd_prompt=False,
                  mssqlclirc_file=None, row_limit=None,
                  single_connection=False, less_chatty=None,
-                 auto_vertical_output=False, sql_tools_client=None, integrated_auth=False):
+                 auto_vertical_output=False, sql_tools_client=None,
+                 integrated_auth=False, enable_sqltoolsservice_logging=False):
 
         self.force_passwd_prompt = force_passwd_prompt
 
@@ -193,7 +194,8 @@ def __init__(self, force_passwd_prompt=False,
         self.cli = None
 
         # mssql-cli
-        self.sqltoolsclient = sql_tools_client if sql_tools_client else SqlToolsClient()
+        self.sqltoolsclient = sql_tools_client if sql_tools_client else SqlToolsClient(
+            enable_logging=enable_sqltoolsservice_logging)
         self.mssqlcliclient_query_execution = None
         self.integrated_auth = integrated_auth
 
@@ -695,9 +697,14 @@ def get_last_query(self):
                    'detection and connection to currently active server.')
 @click.option('-a', '--packet-size', default=0, type=int,
               help='Size in bytes of the network packets used to communicate with SQL Server.')
+@click.option('-A', '--dac-connection', is_flag=True, default=False,
+              help='Connect to SQL Server using the dedicated administrator connection.')
+@click.option('--enable-sqltoolsservice-logging', is_flag=True,
+              default=False,
+              help='Enables diagnostic logging for the SqlToolsService.')
 def cli(username, server, prompt_passwd, database, version, mssqlclirc, row_limit, less_chatty, auto_vertical_output,
         integrated_auth, encrypt, trust_server_certificate, connect_timeout, application_intent, multi_subnet_failover,
-        packet_size):
+        packet_size, enable_sqltoolsservice_logging, dac_connection):
 
     if version:
         print('Version:', __version__)
@@ -712,9 +719,12 @@ def cli(username, server, prompt_passwd, database, version, mssqlclirc, row_limi
         integrated_auth = False
         print (u'Integrated authentication not supported on this platform')
 
+    if dac_connection and server and not server.lower().startswith("admin:"):
+        server = "admin:" + server
+
     mssqlcli = MssqlCli(prompt_passwd, row_limit=row_limit, single_connection=False,
                         mssqlclirc_file=mssqlclirc, less_chatty=less_chatty, auto_vertical_output=auto_vertical_output,
-                        integrated_auth=integrated_auth)
+                        integrated_auth=integrated_auth, enable_sqltoolsservice_logging=enable_sqltoolsservice_logging)
 
     mssqlcli.connect(database, server, username, port='', encrypt=encrypt,
                      trust_server_certificate=trust_server_certificate, connection_timeout=connect_timeout,

mssqlcli/sqltoolsclient.py

@@ -14,17 +14,17 @@
 import mssqlcli.jsonrpc.jsonrpcclient as json_rpc_client
 import mssqlcli.jsonrpc.contracts.connectionservice as connection
 import mssqlcli.jsonrpc.contracts.queryexecutestringservice as query
+from .config import config_location
 
 logger = logging.getLogger(u'mssqlcli.sqltoolsclient')
-sqltoolsservice_args = [mssqltoolsservice.get_executable_path()]
 
 
 class SqlToolsClient(object):
     """
         Create sql tools service requests.
     """
 
-    def __init__(self, input_stream=None, output_stream=None):
+    def __init__(self, input_stream=None, output_stream=None, enable_logging=False):
         """
             Initializes the sql tools client.
             Input and output streams for JsonRpcClient are taken as optional params,
@@ -33,6 +33,13 @@ def __init__(self, input_stream=None, output_stream=None):
         self.current_id = uuid.uuid4().int
         self.tools_service_process = None
 
+        sqltoolsservice_args = [mssqltoolsservice.get_executable_path()]
+
+        if enable_logging:
+            sqltoolsservice_args.append('--enable-logging')
+            sqltoolsservice_args.append('--log-dir')
+            sqltoolsservice_args.append(config_location())
+
         if input_stream and output_stream:
             self.json_rpc_client = json_rpc_client.JsonRpcClient(
                 input_stream, output_stream)