meadow 2.0.15 → 2.0.17

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

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1699195015190
+	"lastUpdateCheck": 1761078031905
 }

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

@@ -1,7 +1,7 @@
 {
   "numericVersion": 10000,
   "releaseNotes": "https://vscode-sqltools.mteixeira.dev/changelog#v-1-0-0",
-  "run": 1699195007876,
+  "run": 1754854114603,
   "updated": false,
   "version": "1.0.0",
   "lastNotificationDate": 0,

package/Dockerfile_LUXURYCode

@@ -26,47 +26,6 @@ RUN ( sudo mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&
 # Import the initial database
 RUN sudo service mariadb restart && sleep 5 && mysql -u root -p"123456789" -e "CREATE DATABASE FableTest;"
 
-RUN echo "...installing vscode extensions..."
-# 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
 
@@ -88,4 +47,4 @@ RUN . ~/.nvm/nvm.sh && source ~/.bashrc && nvm alias default 14
 
 WORKDIR /home/coder/meadow
 
-ENTRYPOINT ["/usr/bin/MySQL-Laden-Entry.sh"]
+ENTRYPOINT ["/usr/bin/MySQL-Laden-Entry.sh"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -49,7 +49,7 @@
     "alasql": "^4.1.10",
     "browserify": "^17.0.0",
     "chai": "4.3.10",
-    "fable": "^3.0.96",
+    "fable": "^3.1.18",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "^3.0.0",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "async": "3.2.5",
-    "foxhound": "^2.0.10",
+    "foxhound": "^2.0.13",
     "is-my-json-valid": "2.20.6",
     "npm-check-updates": "^16.14.6",
     "simple-get": "^4.0.1"

package/source/behaviors/Meadow-Update.js

@@ -47,8 +47,18 @@ var meadowBehaviorUpdate = function(pMeadow, pQuery, fCallBack)
 					switch (pMeadow.schema[i].Type)
 					{
 						case 'UpdateIDUser':
+							// Don't obliterate these from the record if automagic is disabled
+							if (!pQuery.query.disableAutoUserStamp)
+							{
+								pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							}
+							break;
 						case 'UpdateDate':
-							pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							// Don't obliterate these from the record if automagic is disabled
+							if (!pQuery.query.disableAutoDateStamp)
+							{
+								pQuery.query.records[0][pMeadow.schema[i].Column] = false;
+							}
 							break;
 					}
 				}

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

@@ -60,6 +60,12 @@ var MeadowProvider = function ()
 			let tmpPreparedStatement = _Fable.MeadowMSSQLProvider.preparedStatement;
 			// Map the Parameters to Types
 			let tmpParameterTypeKeys = Object.keys(pQuery.query.parameterTypes)
+			const tmpColumns = pQuery.query.schema;
+			const tmpSchemaByColumn = {};
+			for (let i = 0; i < tmpColumns.length; i++)
+			{
+				tmpSchemaByColumn[tmpColumns[i].Column] = tmpColumns[i];
+			}
 			for (let i = 0; i < tmpParameterTypeKeys.length; i++)
 			{
 				let tmpParameterType = pQuery.query.parameterTypes[tmpParameterTypeKeys[i]];
@@ -79,6 +85,21 @@ var MeadowProvider = function ()
 				{
 					tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL.VarChar(_Fable.MeadowMSSQLProvider.MSSQL.Max);
 				}
+				else if (tmpParameterType === 'Decimal')
+				{
+					const tmpSize = tmpSchemaByColumn[tmpParameterTypeKeys[i]]?.Size;
+					if (tmpSize && typeof tmpSize === 'string')
+					{
+						let [ tmpDigitsStr, tmpDecimalDigitsStr ] = tmpSize.split(',');
+						const tmpDigits = parseInt(tmpDigitsStr.trim());
+						const tmpDecimalDigits = tmpDecimalDigitsStr ? parseInt(tmpDecimalDigitsStr.trim()) : 0;
+						tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL.Decimal(tmpDigits, tmpDecimalDigits);
+					}
+					else
+					{
+						tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL.Decimal(18, 8);
+					}
+				}
 				else
 				{
 					tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL[tmpParameterType];

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

@@ -0,0 +1,296 @@
+/**
+* @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;
+
+		/**
+		 * Build a connection pool, shared within this provider.
+		 * This may be more performant as a shared object.
+		 */
+		var getDB = function ()
+		{
+			if (typeof (_Fable.MeadowMySQLConnectionPool) == 'object')
+			{
+				// This is where the old-style SQL Connection pool is.  Refactor doesn't even look for it anymore
+				return _Fable.MeadowMySQLConnectionPool;
+			}
+
+			// New-style default connection pool provider
+			if (typeof (_Fable.MeadowMySQLProvider) == 'object' && _Fable.MeadowMySQLProvider.connected)
+			{
+				return _Fable.MeadowMySQLProvider.pool;
+			}
+
+			return false;
+		};
+
+		var getProvider = function ()
+		{
+			if (typeof (_Fable.MeadowMySQLConnectionPool) == 'object')
+			{
+				// This is where the old-style SQL Connection pool is.  Refactor doesn't even look for it anymore
+				return _Fable.MeadowMySQLConnectionPool;
+			}
+
+			// New-style default connection pool provider
+			if (typeof (_Fable.MeadowMySQLProvider) == 'object')
+			{
+				return _Fable.MeadowMySQLProvider;
+			}
+
+			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('SQLite').buildCreateQuery();
+
+			// TODO: Test the query before executing
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					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('MySQL').buildReadQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					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('MySQL').buildUpdateQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					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('MySQL').buildDeleteQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						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('MySQL').buildUndeleteQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						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('MySQL').buildCountQuery();
+
+			if (pQuery.logLevel > 0)
+			{
+				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
+			}
+
+			getDB().getConnection(function (pError, pDBConnection)
+			{
+				pDBConnection.query(
+					pQuery.query.body,
+					pQuery.query.parameters,
+					// The SQLite 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,
+
+				getProvider: getProvider,
+				providerCreatesSupported: true,
+
+				new: createNew
+			});
+
+
+		return tmpNewProvider;
+	}
+
+	return createNew();
+};
+
+module.exports = new MeadowProvider();