Merge branch 'azure-1.11' into azure-2.0

Author: michiya

README.rst

@@ -192,6 +192,11 @@ Dictionary. Current available keys are:
    Integer. Sets the back off time in seconds for reries of
    the database connection process. Default value is ``5``.
 
+-  query_timeout
+
+   Integer. Sets the timeout in seconds for the database query.
+   Default value is ``0`` which disables the timeout.
+
 backend-specific settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

sql_server/pyodbc/base.py

@@ -295,6 +295,7 @@ def get_new_connection(self, conn_params):
         timeout = options.get('connection_timeout', 0)
         retries = options.get('connection_retries', 5)
         backoff_time = options.get('connection_retry_backoff_time', 5)
+        query_timeout = options.get('query_timeout', 0)
 
         conn = None
         retry_count = 0
@@ -317,6 +318,7 @@ def get_new_connection(self, conn_params):
                 if not need_to_retry:
                     raise
 
+        conn.timeout = query_timeout
         return conn
 
     def init_connection_state(self):