Clean up

Author: alejandro-du

README.md

@@ -7,19 +7,24 @@ This repository will walk you through the process of quickly getting started wit
 * [Node.js](https://nodejs.org/en/download/)
 * [MariaDB](https://mariadb.com) - to get started with MariaDB check out [this guide](https://github.com/mariadb-developers/mariadb-getting-started)!
 
+You can easily run a MariaDB Server using Docker:
+
+```Shell
+docker run --name mariadb --detach --publish 3306:3306 --env MARIADB_ROOT_PASSWORD='RootPassword123!' mariadb
+```
+
 ## Samples
 
 ### JavaScript
 
 The [javascript](javascript) folder provides simple examples using MariaDB Connector/Node.js with JavaScript.
 
 * [Connecting to MariaDB](javascript/connect)
-    * [connection.js](javascript/connect/connection.js) - a simple example of connecting to a MariaDB database instance.
-    * [connection_skysql.js](javascript/connect/connection_skysql.js) - a simple example of how to connect to [MariaDB SkySQL](https://mariadb/com/skyview)
+    * [connection.js](javascript/connect/connection.js) - a simple example of connecting to a MariaDB database instance. Change the connection parameters (host, port, user, password) in the same file before running the example.
 
 * [Execute querying operations](javascript/query)
 
-    Examples that utilize a shared [database module](javascript/query/db.js) to perform various SQL operations.
+    Examples that utilize a shared [database module](javascript/query/db.js) to perform various SQL operations. Change the connection parameters (host, port, user, password) in the database module file before running the examples.
 
     * [Create a database and table](javascript/query/create.js) - **required** before executing any other script
     * [Drop a database](javascript/query/drop.js)

javascript/connect/connection.js

@@ -5,10 +5,10 @@ async function asyncFunction() {
     try {
         // Create a new connection
         conn = await mariadb.createConnection({
-            host: '<insert_host_address_here>',
-            port: '<insert_port_number_here>',
-            user: '<insert_user_here>',
-            password: '<insert_password_here>',
+            host: '127.0.0.1',
+            port: '3306',
+            user: 'user',
+            password: 'Password123!',
         });
 
         // Print connection thread

javascript/connect/connection_skysql.js

@@ -7,11 +7,11 @@ async function asyncFunction() {
         conn = await db.pool.getConnection();
 
         // Execute query to create a new database
-        await conn.query("CREATE DATABASE demo");
+        await conn.query("CREATE DATABASE IF NOT EXISTS demo");
         console.log("Demo database created.");
 
         // Execute query to create a new table
-        await conn.query("CREATE TABLE demo.contacts ( \
+        await conn.query("CREATE TABLE IF NOT EXISTS demo.contacts ( \
                         id INT(11) unsigned NOT NULL AUTO_INCREMENT, \
                         first_name VARCHAR(50) NOT NULL, \
                         last_name VARCHAR(50) NOT NULL, \
@@ -24,6 +24,7 @@ async function asyncFunction() {
     } finally {
         // Release the connection back into the connection pool
         if (conn) await conn.release();
+		db.pool.end();
     }
 }
 

javascript/query/create.js

@@ -2,10 +2,10 @@ const mariadb = require('mariadb');
 
 // Expose the Pool object within this module
 module.exports = Object.freeze({
-  pool: mariadb.createPool({
-    host: '<insert_host_address_here>',
-    port: '<insert_port_number_here>',
-    user: '<insert_user_here>',
-    password: '<insert_password_here>'
-  })
+    pool: mariadb.createPool({
+        host: '127.0.0.1',
+        port: '3306',
+        user: 'user',
+        password: 'Password123!'
+    })
 });

javascript/query/db.js

@@ -18,7 +18,9 @@ async function asyncFunction() {
     } catch (err) {
         // Print errors
         console.log(err);
-    } 
+    } finally {
+		db.pool.end();
+	}
 }
 
 asyncFunction();

javascript/query/insert.js

@@ -12,7 +12,9 @@ async function asyncFunction() {
     } catch (err) {
         // Print errors
         console.log(err);
-    }
+    } finally {
+		db.pool.end();
+	}
 }
 
 asyncFunction();