cleanup (#947)

Author: diberry

quickstarts/azure-sql/connect-and-query/README.md

@@ -77,15 +77,9 @@ Samples provided include:
 
 1. In `person.js`, verify or set which configuration you want:
 
-    * `const config = noPasswordConfig;`
-    * `const config = passwordConfig;`
+    * `const database = await createDatabaseConnection(SQLAuthentication);`
+    * `const database = await createDatabaseConnection(PasswordlessConfig);`
 
-1. In `index.js`, verify or set which configuration you want:
-
-    * `const database = new Database(noPasswordConfig);`
-    * `const database = new Database(passwordConfig);`
-    
-    
 
 1. Start the app:
 

quickstarts/azure-sql/connect-and-query/js/config.js

@@ -1,5 +1,8 @@
 import * as dotenv from 'dotenv';
-dotenv.config({ path: `.env.${process.env.NODE_ENV}`, debug: true });
+
+if(process.env.NODE_ENV === 'development') {
+  dotenv.config({ path: `.env.${process.env.NODE_ENV}`, debug: true });
+}
 
 // TIP: Port must be a number, not a string!
 const server = process.env.AZURE_SQL_SERVER;

quickstarts/azure-sql/connect-and-query/js/database.js

@@ -95,33 +95,33 @@ export default class Database {
 
     return result.rowsAffected[0];
   }
-}
 
-async function createTable() {
-  if (process.env.NODE_ENV === 'development') {
-    this.executeQuery(
-      `IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Person')
-       BEGIN
-         CREATE TABLE Person (
-           id int NOT NULL IDENTITY, 
-           firstName varchar(255), 
-           lastName varchar(255)
-         );
-       END`
-    )
-      .then(() => {
-        console.log('Table created');
-      })
-      .catch((err) => {
-        // Table may already exist
-        console.error(`Error creating table: ${err}`);
-      });
+  async createTable() {
+    if (process.env.NODE_ENV === 'development') {
+      this.executeQuery(
+        `IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Person')
+         BEGIN
+           CREATE TABLE Person (
+             id int NOT NULL IDENTITY, 
+             firstName varchar(255), 
+             lastName varchar(255)
+           );
+         END`
+      )
+        .then(() => {
+          console.log('Table created');
+        })
+        .catch((err) => {
+          // Table may already exist
+          console.error(`Error creating table: ${err}`);
+        });
+    }
   }
 }
 
 export const createDatabaseConnection = async (passwordConfig) => {
   database = new Database(passwordConfig);
   await database.connect();
-  await createTable();
+  await database.createTable();
   return database;
 };

quickstarts/azure-sql/connect-and-query/js/package.json

@@ -7,8 +7,7 @@
   "scripts": {
     "format": "prettier --write *.js",
     "dev": "cross-env NODE_ENV=development DEBUG=express:* node index.js",
-    "start": "node index.js",
-    "test": "echo \"No tests yet...\"",
+    "start": "node index.js"
   },
   "dependencies": {
     "express": "^4.17.21",

quickstarts/azure-sql/connect-and-query/js/person.js

@@ -1,11 +1,14 @@
 import express from 'express';
-import { passwordConfig, noPasswordConfig } from './config.js';
+import { 
+  passwordConfig as SQLAuthentication, 
+  noPasswordConfig as PasswordlessConfig 
+} from './config.js';
 import { createDatabaseConnection } from './database.js';
 
 const router = express.Router();
 router.use(express.json());
 
-const database = await createDatabaseConnection(passwordConfig);
+const database = await createDatabaseConnection(SQLAuthentication);
 
 router.get('/', async (req, res) => {
   try {