Partial refactor of code base

build.py

@@ -128,6 +128,14 @@ def test():
     integration_test()
 
 
+def validate_actions(user_actions, valid_targets):
+    for user_action in user_actions:
+        if user_action.lower() not in valid_targets.keys():
+            print('{0} is not a supported action'.format(user_action))
+            print('Supported actions are {}'.format(list(valid_targets.keys())))
+            sys.exit(1)
+
+
 if __name__ == '__main__':
     default_actions = ['build', 'unit_test']
 
@@ -140,9 +148,7 @@ def test():
     }
     actions = sys.argv[1:] or default_actions
 
+    validate_actions(actions, targets)
+
     for action in actions:
-        if action in targets:
-            targets[action]()
-        else:
-            print('{0} is not a supported action'.format(action[1]))
-            print('Supported actions are {}'.format(list(targets.keys())))
+        targets[action]()

mssqlcli/completion_refresher.py

@@ -51,7 +51,7 @@ def _bg_refresh(self, mssqlcliclient, callbacks, history=None,
         completer = MssqlCompleter(smart_completion=True, settings=settings)
 
         executor = mssqlcliclient
-        owner_uri, error_messages = executor.connect()
+        owner_uri, error_messages = executor.connect_to_database()
 
         if not owner_uri:
             # If we were unable to connect, do not break the experience for the user.
@@ -100,31 +100,31 @@ def wrapper(wrapped):
 @refresher('schemata')
 @decorators.suppress_all_exceptions()
 def refresh_schemata(completer, mssqlcliclient):
-    completer.extend_schemata(mssqlcliclient.schemas())
+    completer.extend_schemata(mssqlcliclient.get_schemas())
 
 
 @refresher('tables')
 @decorators.suppress_all_exceptions()
 def refresh_tables(completer, mssqlcliclient):
-    completer.extend_relations(mssqlcliclient.tables(), kind='tables')
-    completer.extend_columns(mssqlcliclient.table_columns(), kind='tables')
-    completer.extend_foreignkeys(mssqlcliclient.foreignkeys())
+    completer.extend_relations(mssqlcliclient.get_tables(), kind='tables')
+    completer.extend_columns(mssqlcliclient.get_table_columns(), kind='tables')
+    completer.extend_foreignkeys(mssqlcliclient.get_foreign_keys())
 
 
 @refresher('views')
 @decorators.suppress_all_exceptions()
 def refresh_views(completer, mssqlcliclient):
-    completer.extend_relations(mssqlcliclient.views(), kind='views')
-    completer.extend_columns(mssqlcliclient.view_columns(), kind='views')
+    completer.extend_relations(mssqlcliclient.get_views(), kind='views')
+    completer.extend_columns(mssqlcliclient.get_view_columns(), kind='views')
 
 
 @refresher('databases')
 @decorators.suppress_all_exceptions()
 def refresh_databases(completer, mssqlcliclient):
-    completer.extend_database_names(mssqlcliclient.databases())
+    completer.extend_database_names(mssqlcliclient.get_databases())
 
 
 @refresher('types')
 @decorators.suppress_all_exceptions()
 def refresh_types(completer, mssqlcliclient):
-    completer.extend_datatypes(mssqlcliclient.user_defined_types())
+    completer.extend_datatypes(mssqlcliclient.get_user_defined_types())

mssqlcli/jsonrpc/contracts/connectionservice.py

@@ -88,7 +88,6 @@ def __init__(self, parameters):
         self.UserName = parameters[u'UserName']
         self.Password = parameters[u'Password']
         self.AuthenticationType = parameters[u'AuthenticationType']
-        self.MultipleActiveResultSets = parameters[u'MultipleActiveResultSets']
         # Optional Params
         if u'Encrypt' in parameters:
             self.Encrypt = parameters[u'Encrypt']