Merge pull request #96418 from burkeholland/patch-28

Modernize JavaScript

Author: TedA-M

articles/sql-database/sql-database-connect-query-nodejs.md

@@ -61,8 +61,7 @@ Open a command prompt and create a folder named *sqltest*. Open the folder you c
 
   ```bash
   npm init -y
-  npm install [email protected]
-  npm install [email protected]
+  npm install tedious
   ```
 
 ## Add code to query database
@@ -72,63 +71,61 @@ Open a command prompt and create a folder named *sqltest*. Open the folder you c
 1. Replace its contents with the following code. Then add the appropriate values for your server, database, user, and password.
 
     ```js
-    var Connection = require('tedious').Connection;
-    var Request = require('tedious').Request;
+    const Connection = require("tedious").Connection;
+    const Request = require("tedious").Request;
 
     // Create connection to database
-    var config =
-    {
-        authentication: {
-            options: {
-                userName: 'userName', // update me
-                password: 'password' // update me
-            },
-            type: 'default'
+    const config = {
+      authentication: {
+        options: {
+          userName: "username", // update me
+          password: "password" // update me
         },
-        server: 'your_server.database.windows.net', // update me
-        options:
-        {
-            database: 'your_database', //update me
-            encrypt: true
-        }
-    }
-    var connection = new Connection(config);
+        type: "default"
+      },
+      server: "your_server.database.windows.net", // update me
+      options: {
+        database: "your_database", //update me
+        encrypt: true
+      }
+    };
+
+    const connection = new Connection(config);
 
     // Attempt to connect and execute queries if connection goes through
-    connection.on('connect', function(err)
-        {
-            if (err)
-            {
-                console.log(err)
-            }
-            else
-            {
-                queryDatabase()
-            }
+    connection.on("connect", err => {
+      if (err) {
+        console.error(err.message);
+      } else {
+        queryDatabase();
+      }
+    });
+
+    function queryDatabase() {
+      console.log("Reading rows from the Table...");
+
+      // Read all rows from table
+      const request = new Request(
+        `SELECT TOP 20 pc.Name as CategoryName,
+                       p.name as ProductName
+         FROM [SalesLT].[ProductCategory] pc
+         JOIN [SalesLT].[Product] p ON pc.productcategoryid = p.productcategoryid`,
+        (err, rowCount) => {
+          if (err) {
+            console.error(err.message);
+          } else {
+            console.log(`${rowCount} row(s) returned`);
+          }
         }
-    );
-
-    function queryDatabase()
-    {
-        console.log('Reading rows from the Table...');
-
-        // Read all rows from table
-        var request = new Request(
-            "SELECT TOP 20 pc.Name as CategoryName, p.name as ProductName FROM [SalesLT].[ProductCategory] pc "
-                + "JOIN [SalesLT].[Product] p ON pc.productcategoryid = p.productcategoryid",
-            function(err, rowCount, rows)
-            {
-                console.log(rowCount + ' row(s) returned');
-                process.exit();
-            }
-        );
-
-        request.on('row', function(columns) {
-            columns.forEach(function(column) {
-                console.log("%s\t%s", column.metadata.colName, column.value);
-            });
+      );
+
+      request.on("row", columns => {
+        columns.forEach(column => {
+          console.log("%s\t%s", column.metadata.colName, column.value);
         });
-        connection.execSql(request);
+      });
+      
+      connection.execSql(request);
     }
     ```