meadow 2.0.4 → 2.0.6

package/.config/configstore/update-notifier-npm-check-updates.json

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1648097783781
+	"lastUpdateCheck": 1684949112628
 }

package/.config/configstore/update-notifier-npm.json

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1677869923810
+	"lastUpdateCheck": 1690759243854
 }

package/.config/vscode-sqltools/runningInfo.json

@@ -0,0 +1,13 @@
+{
+  "numericVersion": 10000,
+  "releaseNotes": "https://vscode-sqltools.mteixeira.dev/changelog#v-1-0-0",
+  "run": 1690759233978,
+  "updated": false,
+  "version": "1.0.0",
+  "lastNotificationDate": 0,
+  "installedExtPlugins": {
+    "driver": [
+      "mtxr.sqltools-driver-mysql"
+    ]
+  }
+}

package/Dockerfile_LUXURYCode

@@ -27,19 +27,45 @@ RUN ( sudo mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&
 RUN sudo service mariadb restart && sleep 5 && mysql -u root -p"123456789" -e "CREATE DATABASE FableTest;"
 
 RUN echo "...installing vscode extensions..."
-RUN code-server --install-extension rangav.vscode-thunder-client \
-    code-server --install-extension hbenl.vscode-mocha-test-adapter \
-    code-server --install-extension hbenl.vscode-test-explorer \
-    code-server --install-extension hbenl.test-adapter-converter \
-    code-server --install-extension cweijan.vscode-mysql-client2 \
-    code-server --install-extension daylerees.rainglow \
-    code-server --install-extension oderwat.indent-rainbow \
-    code-server --install-extension evan-buss.font-switcher \
-    code-server --install-extension vscode-icons-team.vscode-icons \
-    code-server --install-extension bengreenier.vscode-node-readme \
-    code-server --install-extension bierner.color-info \
-    code-server --install-extension dbaeumer.vscode-eslint \
-    code-server --install-extension PKief.material-icon-theme
+# Mocha unit testing in the sidebar
+RUN code-server --install-extension hbenl.vscode-mocha-test-adapter
+RUN code-server --install-extension hbenl.test-adapter-converter
+RUN code-server --install-extension hbenl.vscode-test-explorer
+
+# Magic indentation rainbow
+RUN code-server --install-extension oderwat.indent-rainbow
+RUN code-server --install-extension dbaeumer.vscode-eslint
+
+# Contextual git
+RUN code-server --install-extension eamodio.gitlens
+
+# Other extensions (uncomment them to have them automagic, or run this from a terminal to install in the container):
+
+# SQL Tools
+RUN code-server --install-extension mtxr.sqltools
+RUN code-server --install-extension mtxr.sqltools-driver-mysql
+
+# Microsoft's AI code completion
+# RUN code-server --install-extension  VisualStudioExptTeam.vscodeintellicode
+
+# Live server -- make sure to open up the port on the docker image
+# RUN code-server --install-extension ritwickdey.LiveServer
+
+# Quick link to required modules' documentation
+# RUN code-server --install-extension bengreenier.vscode-node-readme
+
+# Switch up fonts
+# RUN code-server --install-extension evan-buss.font-switcher
+
+# Icons
+# RUN code-server --install-extension vscode-icons-team.vscode-icons
+# RUN code-server --install-extension PKief.material-icon-theme
+
+# Hover over CSS colors to see them previewed
+# RUN code-server --install-extension bierner.color-info
+
+# An easy on the eyes color theme
+# RUN code-server --install-extension daylerees.rainglow
 
 SHELL ["/bin/bash", "-c"]
 USER coder

package/debug/Harness.js

@@ -38,7 +38,7 @@ const _AnimalDefault = (
     {
         IDAnimal: null,
         GUIDAnimal: '',
-    
+
         CreateDate: false,
         CreatingIDUser: 0,
         UpdateDate: false,
@@ -46,7 +46,7 @@ const _AnimalDefault = (
         Deleted: 0,
         DeleteDate: false,
         DeletingIDUser: 0,
-    
+
         Name: 'Unknown',
         Type: 'Unclassified'
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -9,8 +9,9 @@
     "test": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec",
     "tests": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec --grep",
     "build": "./node_modules/.bin/gulp build --full-paths",
-    "docker-dev-build-image": "docker build ./ -f Dockerfile_LUXURYCode -t retold/meadow:local",
-    "docker-dev-run": "docker run -it -d --name meadow-dev -p 127.0.0.1:12342:8080 -p 12106:3306 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/meadow\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/meadow:local"
+    "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t retold/meadow:local",
+    "docker-dev-run": "docker run -it -d --name meadow-dev -p 12342:8080 -p 12106:3306 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/meadow\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/meadow:local",
+    "docker-dev-shell": "docker exec -it meadow-dev /bin/bash"
   },
   "mocha": {
     "diff": true,
@@ -48,22 +49,25 @@
     "alasql": "^3.1.0",
     "browserify": "^17.0.0",
     "chai": "4.3.7",
+    "fable": "^3.0.46",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-terser": "^2.1.0",
-    "fable": "^3.0.11",
     "gulp-util": "^3.0.8",
+    "meadow-connection-mssql": "^1.0.1",
+    "meadow-connection-mysql": "^1.0.2",
     "mocha": "10.2.0",
+    "mysql2": "^3.3.2",
     "nyc": "^15.1.0",
     "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
-    "mysql2": "^3.1.2"
+    "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
     "async": "3.2.4",
-    "foxhound": "^2.0.2",
+    "foxhound": "^2.0.4",
     "is-my-json-valid": "2.20.6",
+    "npm-check-updates": "^16.10.12",
     "simple-get": "^4.0.1"
   }
 }

package/source/providers/Meadow-Provider-MSSQL.js

@@ -0,0 +1,308 @@
+// ##### Part of the **[retold](https://stevenvelozo.github.io/retold/)** system
+/**
+* @license MIT
+* @author <steven@velozo.com>
+*/
+var MeadowProvider = function ()
+{
+	function createNew(pFable)
+	{
+		// If a valid Fable object isn't passed in, return a constructor
+		if (typeof (pFable) !== 'object')
+		{
+			return { new: createNew };
+		}
+		var _Fable = pFable;
+		var _GlobalLogLevel = 0;
+		if (_Fable.settings.MSSQL)
+		{
+			_GlobalLogLevel = _Fable.settings.MSSQL.GlobalLogLevel || 0;
+		}
+
+		/**
+		 * Build a connection pool, shared within this provider.
+		 * This may be more performant as a shared object.
+		 */
+		var getSQLPool = function ()
+		{
+			// New-style default connection pool provider
+			// There are no legacy MSSQL open source connectors.
+			if (typeof (_Fable.MeadowMSSQLProvider) == 'object' && _Fable.MeadowMSSQLProvider.connected)
+			{
+				return _Fable.MeadowMSSQLProvider.pool;
+			}
+
+			return false;
+		};
+
+		// The Meadow marshaller also passes in the Schema as the third parameter, but this is a blunt function ATM.
+		var marshalRecordFromSourceToObject = function (pObject, pRecord)
+		{
+			// For now, crudely assign everything in pRecord to pObject
+			// This is safe in this context, and we don't want to slow down marshalling with millions of hasOwnProperty checks
+			for (var tmpColumn in pRecord)
+			{
+				pObject[tmpColumn] = pRecord[tmpColumn];
+			}
+		};
+
+		var Create = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildCreateQuery();
+
+			// TODO: Test the query before executing
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The MSSQL library also returns the Fields as the third parameter
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = false;
+						try
+						{
+							tmpResult.value = pRows.insertId;
+						}
+						catch (pErrorGettingRowcount)
+						{
+							_Fable.log.warn('Error getting insert ID during create query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+						}
+
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		// This is a synchronous read, good for a few records.
+		// TODO: Add a pipe-able read for huge sets
+		var Read = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildReadQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			let tmpPreparedStatement = _Fable.MeadowMSSQLProvider.preparedStatement;
+			// Now define the inputs for the prepared statement based on the parameters and the schema.
+			
+			//tmpPreparedStatement.input('param', _Fable.MeadowMSSQLProvider.MSSQL.Int);
+			tmpPreparedStatement.prepare(pQuery.query.body,
+				(pPrepareError) =>
+				{
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
+						{
+							_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									_Fable.log.trace(`Prepared statement unprepared.`);
+									return fCallback(pPreparedStatementUnprepareError);
+								});
+						})
+				});
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The MSSQL library also returns the Fields as the third parameter
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = pRows;
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		var Update = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildUpdateQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The MSSQL library also returns the Fields as the third parameter
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.error = pError;
+						tmpResult.value = pRows;
+						tmpResult.executed = true;
+						return fCallback();
+					}
+				);
+			});
+		}
+
+		var Delete = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildDeleteQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						// The MSSQL library also returns the Fields as the third parameter
+						function (pError, pRows)
+						{
+							pDBConnection.release();
+							tmpResult.error = pError;
+							tmpResult.value = false;
+							try
+							{
+								tmpResult.value = pRows.affectedRows;
+							}
+							catch (pErrorGettingRowcount)
+							{
+								_Fable.log.warn('Error getting affected rowcount during delete query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+							}
+							tmpResult.executed = true;
+							return fCallback();
+						}
+					);
+			});
+		};
+
+		var Undelete = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildUndeleteQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						// The MSSQL library also returns the Fields as the third parameter
+						function (pError, pRows)
+						{
+							pDBConnection.release();
+							tmpResult.error = pError;
+							tmpResult.value = false;
+							try
+							{
+								tmpResult.value = pRows.affectedRows;
+							}
+							catch (pErrorGettingRowcount)
+							{
+								_Fable.log.warn('Error getting affected rowcount during delete query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+							}
+							tmpResult.executed = true;
+							return fCallback();
+						}
+					);
+			});
+		};
+
+		var Count = function (pQuery, fCallback)
+		{
+			var tmpResult = pQuery.parameters.result;
+
+			pQuery.setDialect('MSSQL').buildCountQuery();
+
+			if (pQuery.logLevel > 0 ||
+				_GlobalLogLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getSQLPool().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The MSSQL library also returns the Fields as the third parameter
+					function (pError, pRows)
+					{
+						pDBConnection.release();
+						tmpResult.executed = true;
+						tmpResult.error = pError;
+						tmpResult.value = false;
+						try
+						{
+							tmpResult.value = pRows[0].RowCount;
+						}
+						catch (pErrorGettingRowcount)
+						{
+							_Fable.log.warn('Error getting rowcount during count query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+						}
+						return fCallback();
+					}
+				);
+			});
+		};
+
+		var tmpNewProvider = (
+			{
+				marshalRecordFromSourceToObject: marshalRecordFromSourceToObject,
+
+				Create: Create,
+				Read: Read,
+				Update: Update,
+				Delete: Delete,
+				Undelete: Undelete,
+				Count: Count,
+
+				new: createNew
+			});
+
+
+		return tmpNewProvider;
+	}
+
+	return createNew();
+};
+
+module.exports = new MeadowProvider();