meadow 2.0.5 → 2.0.6

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -55,6 +55,7 @@
     "gulp-sourcemaps": "^3.0.0",
     "gulp-terser": "^2.1.0",
     "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",
@@ -64,7 +65,7 @@
   },
   "dependencies": {
     "async": "3.2.4",
-    "foxhound": "^2.0.3",
+    "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();

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

@@ -3,37 +3,37 @@
 * @license MIT
 * @author <steven@velozo.com>
 */
-var MeadowProvider = function()
+var MeadowProvider = function ()
 {
 	function createNew(pFable)
 	{
 		// If a valid Fable object isn't passed in, return a constructor
-		if (typeof(pFable) !== 'object')
+		if (typeof (pFable) !== 'object')
 		{
-			return {new: createNew};
+			return { new: createNew };
 		}
 		var _Fable = pFable;
 		var _GlobalLogLevel = 0;
 		if (_Fable.settings.MySQL)
 		{
-			 _GlobalLogLevel = _Fable.settings.MySQL.GlobalLogLevel || 0;
+			_GlobalLogLevel = _Fable.settings.MySQL.GlobalLogLevel || 0;
 		}
-		
+
 		/**
 		 * Build a connection pool, shared within this provider.
 		 * This may be more performant as a shared object.
 		 */
-		var getSQLPool = function()
+		var getSQLPool = function ()
 		{
 			let tmpSqlPool = false;
-			if (typeof(_Fable.MeadowMySQLConnectionPool) == 'object')
+			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)
+			if (typeof (_Fable.MeadowMySQLProvider) == 'object' && _Fable.MeadowMySQLProvider.connected)
 			{
 				return _Fable.MeadowMySQLProvider.pool;
 			}
@@ -42,17 +42,17 @@ var MeadowProvider = function()
 		};
 
 		// The Meadow marshaller also passes in the Schema as the third parameter, but this is a blunt function ATM.
-		var marshalRecordFromSourceToObject = function(pObject, pRecord)
+		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)
+			for (var tmpColumn in pRecord)
 			{
 				pObject[tmpColumn] = pRecord[tmpColumn];
 			}
 		};
 
-		var Create = function(pQuery, fCallback)
+		var Create = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -65,13 +65,13 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query(
 					pQuery.query.body,
 					pQuery.query.parameters,
 					// The MySQL library also returns the Fields as the third parameter
-					function(pError, pRows)
+					function (pError, pRows)
 					{
 						pDBConnection.release();
 						tmpResult.error = pError;
@@ -80,9 +80,9 @@ var MeadowProvider = function()
 						{
 							tmpResult.value = pRows.insertId;
 						}
-						catch(pErrorGettingRowcount)
+						catch (pErrorGettingRowcount)
 						{
-							_Fable.log.warn('Error getting insert ID during create query',{Body:pQuery.query.body, Parameters:pQuery.query.parameters});
+							_Fable.log.warn('Error getting insert ID during create query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
 						}
 
 						tmpResult.executed = true;
@@ -94,7 +94,7 @@ var MeadowProvider = function()
 
 		// 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 Read = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -106,13 +106,13 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query(
 					pQuery.query.body,
 					pQuery.query.parameters,
 					// The MySQL library also returns the Fields as the third parameter
-					function(pError, pRows)
+					function (pError, pRows)
 					{
 						pDBConnection.release();
 						tmpResult.error = pError;
@@ -124,7 +124,7 @@ var MeadowProvider = function()
 			});
 		};
 
-		var Update = function(pQuery, fCallback)
+		var Update = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -136,13 +136,13 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query(
 					pQuery.query.body,
 					pQuery.query.parameters,
 					// The MySQL library also returns the Fields as the third parameter
-					function(pError, pRows)
+					function (pError, pRows)
 					{
 						pDBConnection.release();
 						tmpResult.error = pError;
@@ -154,7 +154,7 @@ var MeadowProvider = function()
 			});
 		}
 
-		var Delete = function(pQuery, fCallback)
+		var Delete = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -166,34 +166,34 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query
-				(
-					pQuery.query.body,
-					pQuery.query.parameters,
-					// The MySQL 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)
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						// The MySQL library also returns the Fields as the third parameter
+						function (pError, pRows)
 						{
-							_Fable.log.warn('Error getting affected rowcount during delete query',{Body:pQuery.query.body, Parameters:pQuery.query.parameters});
+							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();
 						}
-						tmpResult.executed = true;
-						return fCallback();
-					}
-				);
+					);
 			});
 		};
 
-		var Undelete = function(pQuery, fCallback)
+		var Undelete = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -205,34 +205,34 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query
-				(
-					pQuery.query.body,
-					pQuery.query.parameters,
-					// The MySQL 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)
+					(
+						pQuery.query.body,
+						pQuery.query.parameters,
+						// The MySQL library also returns the Fields as the third parameter
+						function (pError, pRows)
 						{
-							_Fable.log.warn('Error getting affected rowcount during delete query',{Body:pQuery.query.body, Parameters:pQuery.query.parameters});
+							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();
 						}
-						tmpResult.executed = true;
-						return fCallback();
-					}
-				);
+					);
 			});
 		};
 
-		var Count = function(pQuery, fCallback)
+		var Count = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
 
@@ -244,13 +244,13 @@ var MeadowProvider = function()
 				_Fable.log.trace(pQuery.query.body, pQuery.query.parameters);
 			}
 
-			getSQLPool().getConnection(function(pError, pDBConnection)
+			getSQLPool().getConnection(function (pError, pDBConnection)
 			{
 				pDBConnection.query(
 					pQuery.query.body,
 					pQuery.query.parameters,
 					// The MySQL library also returns the Fields as the third parameter
-					function(pError, pRows)
+					function (pError, pRows)
 					{
 						pDBConnection.release();
 						tmpResult.executed = true;
@@ -260,9 +260,9 @@ var MeadowProvider = function()
 						{
 							tmpResult.value = pRows[0].RowCount;
 						}
-						catch(pErrorGettingRowcount)
+						catch (pErrorGettingRowcount)
 						{
-							_Fable.log.warn('Error getting rowcount during count query',{Body:pQuery.query.body, Parameters:pQuery.query.parameters});
+							_Fable.log.warn('Error getting rowcount during count query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
 						}
 						return fCallback();
 					}
@@ -271,18 +271,18 @@ var MeadowProvider = function()
 		};
 
 		var tmpNewProvider = (
-		{
-			marshalRecordFromSourceToObject: marshalRecordFromSourceToObject,
+			{
+				marshalRecordFromSourceToObject: marshalRecordFromSourceToObject,
 
-			Create: Create,
-			Read: Read,
-			Update: Update,
-			Delete: Delete,
-			Undelete: Undelete,
-			Count: Count,
+				Create: Create,
+				Read: Read,
+				Update: Update,
+				Delete: Delete,
+				Undelete: Undelete,
+				Count: Count,
 
-			new: createNew
-		});
+				new: createNew
+			});
 
 
 		return tmpNewProvider;

package/test/Meadow-Provider-MSSQL-AnimalReadQuery.sql

@@ -0,0 +1,5 @@
+SELECT
+ IDAnimal,
+ Type AS AnimalTypeCustom
+FROM
+ FableTest