fixsql

Author: wchigit

articles/service-connector/includes/code-sql-me-id.md

@@ -87,26 +87,26 @@ Update your application following the tutorial [Migrate a Java application to us
 
 1. Get the Azure SQL Database connection configurations from the environment variable added by Service Connector. When using the code below, uncomment the part of the code snippet for the authentication type you want to use.
     ```python
-    import os;
+    import os
     import pyodbc
     
     server = os.getenv('AZURE_SQL_SERVER')
     port = os.getenv('AZURE_SQL_PORT')
     database = os.getenv('AZURE_SQL_DATABASE')
     authentication = os.getenv('AZURE_SQL_AUTHENTICATION')
     
-    # Uncomment the following lines according to the authentication type.
+    # Uncomment the following lines according to the authentication type. Customize the driver version as you want.
     # For system-assigned managed identity.
-    # connString = f'Driver={{ODBC Driver 18 for SQL Server}};Server={server},{port};Database={database};Authentication={authentication};Encrypt=yes;'
+    # connString = f'Driver={{ODBC Driver 17 for SQL Server}};Server={server},{port};Database={database};Authentication={authentication};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30'
     
     # For user-assigned managed identity.
     # user = os.getenv('AZURE_SQL_USER')
-    # connString = f'Driver={{ODBC Driver 18 for SQL Server}};Server={server},{port};Database={database};UID={user};Authentication={authentication};Encrypt=yes;'
+    # connString = f'Driver={{ODBC Driver 17 for SQL Server}};Server={server},{port};Database={database};UID={user};Authentication={authentication};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30'
     
     # For service principal.
     # user = os.getenv('AZURE_SQL_USER')
     # password = os.getenv('AZURE_SQL_PASSWORD')
-    # connString = f'Driver={{ODBC Driver 18 for SQL Server}};Server={server},{port};Database={database};UID={user};PWD={password};Authentication={authentication};Encrypt=yes;'
+    # connString = f'Driver={{ODBC Driver 18 for SQL Server}};Server=tcp:{server},{port};Database={database};UID={user};PWD={password};Authentication={authentication};Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30'
     
     conn = pyodbc.connect(connString)
     ```
@@ -133,7 +133,7 @@ Update your application following the tutorial [Migrate a Java application to us
     //     port,
     //     database,
     //     authentication: {
-    //         authenticationType
+    //         type: authenticationType
     //     },
     //     options: {
     //        encrypt: true
@@ -147,13 +147,11 @@ Update your application following the tutorial [Migrate a Java application to us
     //     port,
     //     database,
     //     authentication: {
-    //         type: authenticationType,
-    //         options: {
-    //             clientId: clientId
-    //         }
+    //         type: authenticationType
     //     },
     //     options: {
-    //         encrypt: true
+    //         encrypt: true,
+    //         clientId: clientId
     //     }
     // };  
 
@@ -166,15 +164,13 @@ Update your application following the tutorial [Migrate a Java application to us
     //     port,
     //     database,
     //     authentication: {
-    //         type: authenticationType,
-    //         options: {
-    //             clientId: clientId,
-    //             clientSecret: clientSecret,
-    //             tenantId: tenantId
-    //         }
+    //         type: authenticationType
     //     },
     //     options: {
-    //         encrypt: true
+    //         encrypt: true,
+    //         clientId: clientId,
+    //         clientSecret: clientSecret,
+    //         tenantId: tenantId
     //     }
     // };