meadow 2.0.6 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.6",
+  "version": "2.0.11",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -46,28 +46,28 @@
   },
   "homepage": "https://github.com/stevenvelozo/meadow",
   "devDependencies": {
-    "alasql": "^3.1.0",
+    "alasql": "^4.1.3",
     "browserify": "^17.0.0",
     "chai": "4.3.7",
-    "fable": "^3.0.46",
+    "fable": "^3.0.75",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "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",
+    "meadow-connection-mssql": "^1.0.4",
+    "meadow-connection-mysql": "^1.0.4",
     "mocha": "10.2.0",
-    "mysql2": "^3.3.2",
+    "mysql2": "^3.5.2",
     "nyc": "^15.1.0",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
     "async": "3.2.4",
-    "foxhound": "^2.0.4",
+    "foxhound": "^2.0.10",
     "is-my-json-valid": "2.20.6",
-    "npm-check-updates": "^16.10.12",
+    "npm-check-updates": "^16.10.17",
     "simple-get": "^4.0.1"
   }
 }

package/source/Meadow.js

@@ -135,6 +135,7 @@ var Meadow = function()
 			'ALASQL': require(`./providers/Meadow-Provider-ALASQL.js`),
 			'MeadowEndpoints': require(`./providers/Meadow-Provider-MeadowEndpoints.js`),
 			'MySQL': require(`./providers/Meadow-Provider-MySQL.js`),
+			'MSSQL': require(`./providers/Meadow-Provider-MSSQL.js`),
 			'None': require(`./providers/Meadow-Provider-None.js`),
 		});
 		var setProvider = function(pProviderName)

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

@@ -46,6 +46,36 @@ var MeadowProvider = function ()
 			}
 		};
 
+		var getPreparedStatementFromQuery = function (pQuery)
+		{
+			// Create the MS SQL Prepared Statement class
+			let tmpPreparedStatement = _Fable.MeadowMSSQLProvider.preparedStatement;
+			// Map the Parameters to Types
+			let tmpParameterTypeKeys = Object.keys(pQuery.query.parameterTypes)
+			for (let i = 0; i < tmpParameterTypeKeys.length; i++)
+			{
+				let tmpParameterType = pQuery.query.parameterTypes[tmpParameterTypeKeys[i]];
+				if (_Fable.MeadowMSSQLProvider.MSSQL[tmpParameterType] === undefined)
+				{
+					tmpParameterType = 'Char';
+				}
+				// TODO: Decide how to filter better cleansing to this layer from the schema; we have access to proper lengths.
+				//       BEFORE WE ADD THIS BEHAVIOR, DECIDE CONCISTENCY WITH OTHER PROVIDERS WHO ALLOW OVERFLOWING STRINGS
+				let tmpParameterEntry = false;
+				if ((tmpParameterType === 'Char') || (tmpParameterType === 'VarChar'))
+				{
+					tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL[tmpParameterType](64);
+				}
+				else
+				{
+					tmpParameterEntry = _Fable.MeadowMSSQLProvider.MSSQL[tmpParameterType];
+				}
+				tmpPreparedStatement.input(tmpParameterTypeKeys[i], tmpParameterEntry);
+			}
+
+			return tmpPreparedStatement;
+		};
+
 		var Create = function (pQuery, fCallback)
 		{
 			var tmpResult = pQuery.parameters.result;
@@ -53,37 +83,51 @@ var MeadowProvider = function ()
 			pQuery.setDialect('MSSQL').buildCreateQuery();
 
 			// TODO: Test the query before executing
-			if (pQuery.logLevel > 0 ||
-				_GlobalLogLevel > 0)
+			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 });
-						}
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
 
-						tmpResult.executed = true;
-						return fCallback();
+			let tmpQueryBody = `${pQuery.query.body} \nSELECT @@IDENTITY AS value;`
+
+			tmpPreparedStatement.prepare(tmpQueryBody,
+				(pPrepareError) =>
+				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
+					{
+						_Fable.log.error(`CREATE Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
 					}
-				);
-			});
+
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
+						{
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`CREATE Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									tmpResult.error = pPreparedExecutionError;
+									if (pPreparedResult
+										&& Array.isArray(pPreparedResult.recordset)
+										&& (pPreparedResult.recordset.length > 0)
+										&& (pPreparedResult.recordset[0].value))
+									{
+										tmpResult.value = pPreparedResult.recordset[0].value;
+									}
+									tmpResult.executed = true;
+
+									// TODO: Fix very old pattern by es6-izing this whole bash
+									return fCallback();
+								});
+						});
+				});
 		};
 
 		// This is a synchronous read, good for a few records.
@@ -100,42 +144,43 @@ var MeadowProvider = function ()
 				_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);
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
 			tmpPreparedStatement.prepare(pQuery.query.body,
 				(pPrepareError) =>
 				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
+					{
+						_Fable.log.error(`READ Error preparing prepared statement: ${pPrepareError}`, 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);
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`READ Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									//_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+									tmpResult.error = pPreparedExecutionError;
+									try
+									{
+										tmpResult.value = pPreparedResult.recordset;
+									}
+									catch(pMarshalError)
+									{
+										_Fable.log.error(`READ Error marshaling prepared statement result: ${pMarshalError}`, pMarshalError);
+									}
+									tmpResult.executed = true;
+									return fCallback();
 								});
 						})
 				});
-			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)
@@ -150,22 +195,36 @@ var MeadowProvider = function ()
 				_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)
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
+			tmpPreparedStatement.prepare(pQuery.query.body,
+				(pPrepareError) =>
+				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
 					{
-						pDBConnection.release();
-						tmpResult.error = pError;
-						tmpResult.value = pRows;
-						tmpResult.executed = true;
-						return fCallback();
+						_Fable.log.error(`UPDATE Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
 					}
-				);
-			});
+
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
+						{
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`UPDATE Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									//_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+									tmpResult.error = pPreparedExecutionError;
+									tmpResult.value = pPreparedResult;
+									tmpResult.executed = true;
+									return fCallback();
+								});
+						})
+				});
 		}
 
 		var Delete = function (pQuery, fCallback)
@@ -180,31 +239,44 @@ var MeadowProvider = function ()
 				_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)
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
+			tmpPreparedStatement.prepare(pQuery.query.body,
+				(pPrepareError) =>
+				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
+					{
+						_Fable.log.error(`DELETE Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
+					}
+
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
 						{
-							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();
-						}
-					);
-			});
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`DELETE Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									//_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+									tmpResult.error = pPreparedExecutionError;
+									tmpResult.value = false;
+									try
+									{
+										tmpResult.value = pPreparedResult.rowsAffected[0];
+									}
+									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)
@@ -219,31 +291,44 @@ var MeadowProvider = function ()
 				_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)
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
+			tmpPreparedStatement.prepare(pQuery.query.body,
+				(pPrepareError) =>
+				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
+					{
+						_Fable.log.error(`UNDELETE Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
+					}
+
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
 						{
-							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();
-						}
-					);
-			});
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`UNDELETE Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									//_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+									tmpResult.error = pPreparedExecutionError;
+									tmpResult.value = false;
+									try
+									{
+										tmpResult.value = pPreparedResult.rowsAffected[0];
+									}
+									catch (pErrorGettingRowcount)
+									{
+										_Fable.log.warn('Error getting affected rowcount during undelete query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+									}
+									tmpResult.executed = true;
+									return fCallback();
+								});
+						})
+				});
 		};
 
 		var Count = function (pQuery, fCallback)
@@ -258,30 +343,44 @@ var MeadowProvider = function ()
 				_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)
+			let tmpPreparedStatement = getPreparedStatementFromQuery(pQuery);
+			tmpPreparedStatement.prepare(pQuery.query.body,
+				(pPrepareError) =>
+				{
+					// TODO: This will likely blow up the world.  It will definitely happen when the schema doesn't generate good constraints from the inputs.
+					if (pPrepareError)
 					{
-						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();
+						_Fable.log.error(`COUNT Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
 					}
-				);
-			});
+
+					tmpPreparedStatement.execute(pQuery.query.parameters,
+						(pPreparedExecutionError, pPreparedResult) =>
+						{
+							// release the connection after queries are executed
+							tmpPreparedStatement.unprepare(
+								(pPreparedStatementUnprepareError) =>
+								{
+									if (pPreparedStatementUnprepareError)
+									{
+										_Fable.log.error(`COUNT Error unpreparing prepared statement: ${pPreparedStatementUnprepareError}`, pPreparedStatementUnprepareError);
+									}
+
+									//_Fable.log.info(`Prepared statement returned...`, pPreparedResult);
+									tmpResult.error = pPreparedExecutionError;
+									tmpResult.value = false;
+									try
+									{
+										tmpResult.value = pPreparedResult.recordset[0].Row_Count;
+									}
+									catch (pErrorGettingRowcount)
+									{
+										_Fable.log.warn('Error getting affected rowcount during count query', { Body: pQuery.query.body, Parameters: pQuery.query.parameters });
+									}
+									tmpResult.executed = true;
+									return fCallback();
+								});
+						})
+				});
 		};
 
 		var tmpNewProvider = (

package/test/Meadow-Provider-MSSQL_tests.js

@@ -11,8 +11,7 @@
 var Chai = require("chai");
 var Expect = Chai.expect;
 
-var libMSSQL = require('mssql');
-var libAsyncWaterfall = require('async/waterfall');
+const libMeadowConnectionMSSQL = require('meadow-connection-mssql');
 
 var tmpFableSettings = (
 	{
@@ -44,8 +43,8 @@ var tmpFableSettings = (
 
 var libFable = new (require('fable'))(tmpFableSettings);
 
-var _SQLConnectionPool = false;
-
+libFable.serviceManager.addServiceType('MeadowMSSQLProvider', libMeadowConnectionMSSQL);
+libFable.serviceManager.instantiateServiceProvider('MeadowMSSQLProvider');
 
 var _AnimalJsonSchema = (
 	{
@@ -78,7 +77,10 @@ var _AnimalSchema = (
 		{ Column: "UpdatingIDUser", Type: "UpdateIDUser" },
 		{ Column: "Deleted", Type: "Deleted" },
 		{ Column: "DeletingIDUser", Type: "DeleteIDUser" },
-		{ Column: "DeleteDate", Type: "DeleteDate" }
+		{ Column: "DeleteDate", Type: "DeleteDate" },
+		{ Column: "Name", Type: "String" },
+		{ Column: "Type", Type: "String" },
+		{ Column: "Age", Type: "Integer" }
 	]);
 var _AnimalDefault = (
 	{
@@ -106,7 +108,7 @@ suite
 
 			var getAnimalInsert = function (pName, pType)
 			{
-				return "INSERT INTO `FableTest` (`IDAnimal`, `GUIDAnimal`, `CreateDate`, `CreatingIDUser`, `UpdateDate`, `UpdatingIDUser`, `Deleted`, `DeleteDate`, `DeletingIDUser`, `Name`, `Type`) VALUES (NULL, '00000000-0000-0000-0000-000000000000', NOW(), 1, NOW(), 1, 0, NULL, 0, '" + pName + "', '" + pType + "'); ";
+				return "INSERT INTO FableTest (GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, DeleteDate, DeletingIDUser, Name, Type) VALUES ('00000000-0000-0000-0000-000000000000', GETUTCDATE(), 1, GETUTCDATE(), 1, 0, NULL, 0, '" + pName + "', '" + pType + "'); ";
 			};
 
 			var newMeadow = function ()
@@ -127,55 +129,52 @@ suite
 						// Only do this for the first test.
 						if (!_SpooledUp)
 						{
-							_SQLConnectionPool = libMSSQL.createPool
-								(
-									{
-										connectionLimit: tmpFableSettings.MSSQL.ConnectionPoolLimit,
-										host: tmpFableSettings.MSSQL.Server,
-										port: tmpFableSettings.MSSQL.Port,
-										user: tmpFableSettings.MSSQL.User,
-										password: tmpFableSettings.MSSQL.Password,
-										database: tmpFableSettings.MSSQL.Database
-									}
-								);
-
 							// Tear down previous test data
-							libAsyncWaterfall(
+							libFable.Utility.waterfall(
 								[
-									function (fCallBack)
+									function (fStageComplete)
+									{
+										libFable.MeadowMSSQLProvider.connectAsync(
+											(pError, pConnectionPool) =>
+											{
+												if (pError)
+												{
+													libFable.log.error(`Error connecting to MS SQL Database: ${pError}`);
+													fStageComplete(pError);
+												}
+
+												libFable.log.info('Connection opened!');
+												return fStageComplete();
+											}
+										);
+									},
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query('DROP TABLE IF EXISTS FableTest',
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query('DROP TABLE IF EXISTS FableTest').then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query("CREATE TABLE IF NOT EXISTS FableTest (IDAnimal INT UNSIGNED NOT NULL AUTO_INCREMENT, GUIDAnimal CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', CreateDate DATETIME, CreatingIDUser INT NOT NULL DEFAULT '0', UpdateDate DATETIME, UpdatingIDUser INT NOT NULL DEFAULT '0', Deleted TINYINT NOT NULL DEFAULT '0', DeleteDate DATETIME, DeletingIDUser INT NOT NULL DEFAULT '0', Name CHAR(128) NOT NULL DEFAULT '', Type CHAR(128) NOT NULL DEFAULT '', PRIMARY KEY (IDAnimal) );",
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query("CREATE TABLE FableTest (IDAnimal INT IDENTITY(1,1) NOT NULL, GUIDAnimal VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', CreateDate DATETIME, CreatingIDUser INT NOT NULL DEFAULT '0', UpdateDate DATETIME, UpdatingIDUser INT NOT NULL DEFAULT '0', Deleted TINYINT NOT NULL DEFAULT '0', DeleteDate DATETIME, DeletingIDUser INT NOT NULL DEFAULT '0', Name VARCHAR(128) NOT NULL DEFAULT '', Type VARCHAR(128) NOT NULL DEFAULT '' );").then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query(getAnimalInsert('Foo Foo', 'Bunny'),
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query(getAnimalInsert('Foo Foo', 'Bunny')).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query(getAnimalInsert('Red Riding Hood', 'Girl'),
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query(getAnimalInsert('Red Riding Hood', 'Girl')).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query(getAnimalInsert('Red', 'Dog'),
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query(getAnimalInsert('Red', 'Dog')).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query(getAnimalInsert('Spot', 'Dog'),
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query(getAnimalInsert('Spot', 'Dog')).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									},
-									function (fCallBack)
+									function (fStageComplete)
 									{
-										_SQLConnectionPool.query(getAnimalInsert('Gertrude', 'Frog'),
-											function (pErrorUpdate, pResponse) { fCallBack(null); });
+										libFable.MeadowMSSQLProvider.pool.query(getAnimalInsert('Gertrude', 'Frog')).then(()=>{ return fStageComplete(); }).catch(fStageComplete);
 									}
 								],
 								function (pError, pResult)
@@ -195,7 +194,7 @@ suite
 
 			suiteTeardown((fDone) =>
 			{
-				_SQLConnectionPool.end(fDone);
+				//_SQLConnectionPool.end(fDone);
 			}
 			);
 
@@ -248,55 +247,6 @@ suite
 								}
 							);
 						test
-							(
-								'New provider format',
-								function (fDone)
-								{
-									let _FableClass = require('fable');
-									let _Fable = new _FableClass({
-										MSSQL:
-										{
-											// This is queued up for Travis defaults.
-											Server: "localhost",
-											Port: 3306,
-											User: "root",
-											Password: "123456789",
-											Database: "FableTest",
-											ConnectionPoolLimit: 20
-										},
-										MeadowConnectionMSSQLAutoConnect: true
-									});
-									_Fable.serviceManager.addAndInstantiateServiceType('MeadowMSSQLProvider', require('meadow-connection-mssql'));
-
-									var testMeadow = require('../source/Meadow.js')
-										.new(_Fable, 'FableTest')
-										.setProvider('MSSQL')
-										.setSchema(_AnimalSchema)
-										.setJsonSchema(_AnimalJsonSchema)
-										.setDefaultIdentifier('IDAnimal')
-										.setDefault(_AnimalDefault);
-
-									testMeadow.setIDUser(90210);
-
-									var tmpQuery = testMeadow.query.addFilter('IDAnimal', 1);
-
-									testMeadow.doRead(tmpQuery,
-										function (pError, pQuery, pRecord)
-										{
-											// We should have a record ....
-											Expect(pRecord.IDAnimal)
-												.to.equal(1);
-											Expect(pRecord.Name)
-												.to.equal('Foo Foo');
-
-											testMeadow.fable.settings.QueryThresholdWarnTime = 1000;
-
-											fDone();
-										}
-									)
-								}
-							);
-						test
 							(
 								'Create a record in the database with Deleted bit already set',
 								function (fDone)
@@ -753,7 +703,7 @@ suite
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal("ER_NO_SUCH_TABLE");
+												.to.equal("ENOTPREPARED");
 											fDone();
 										}
 									)
@@ -774,7 +724,7 @@ suite
 										{
 											// We should have no record because the default id is IDFableTest and our tables identity is IDAnimal
 											Expect(pError.code)
-												.to.equal('ER_BAD_FIELD_ERROR');
+												.to.equal('ENOTPREPARED');
 											fDone();
 										}
 									)
@@ -794,8 +744,8 @@ suite
 										function (pError, pQuery, pQueryRead, pRecord)
 										{
 											// We should have no record because the default id is IDFableTest and our tables identity is IDAnimal
-											Expect(pError)
-												.to.equal('No record found after create.');
+											Expect(pError.code)
+												.to.equal('EPARAM');
 											fDone();
 										}
 									)
@@ -872,7 +822,7 @@ suite
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ER_BAD_FIELD_ERROR');
+												.to.equal('ENOTPREPARED');
 											fDone();
 										}
 									)
@@ -892,7 +842,7 @@ suite
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ER_BAD_FIELD_ERROR');
+												.to.equal('ENOTPREPARED');
 											fDone();
 										}
 									)
@@ -912,7 +862,7 @@ suite
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ER_BAD_FIELD_ERROR');
+												.to.equal('ENOTPREPARED');
 											fDone();
 										}
 									)
@@ -957,23 +907,6 @@ suite
 									)
 								}
 							);
-						test
-							(
-								'Update a record in the database without passing a record in',
-								function (fDone)
-								{
-									var testMeadow = newMeadow();
-
-									testMeadow.doUpdate(testMeadow.query,
-										function (pError, pQuery, pQueryRead, pRecord)
-										{
-											Expect(pError)
-												.to.equal('No record submitted');
-											fDone();
-										}
-									)
-								}
-							);
 						test
 							(
 								'Update a record in the database with a bad record passed in (no default identifier)',
@@ -1101,73 +1034,6 @@ suite
 										});
 								}
 							);
-						test
-							(
-								'Read records from a custom query, then delete one, then read them again then update and create.',
-								function (fDone)
-								{
-									var testMeadow = newMeadow();
-									testMeadow.setDefaultIdentifier('IDAnimal');
-									testMeadow.rawQueries.setQuery('Delete', 'DELETE FROM FableTest WHERE IDAnimal = 1;')
-									testMeadow.rawQueries.setQuery('Count', 'SELECT 1337 AS RowCount;')
-									testMeadow.rawQueries.setQuery('Read', 'SELECT IDAnimal, Type AS AnimalTypeCustom FROM FableTest <%= Where %>')
-									testMeadow.rawQueries.setQuery('Update', "UPDATE FableTest SET Type = 'FrogLeg' <%= Where %>")
-
-									// And this, my friends, is why we use async.js
-									testMeadow.rawQueries.loadQuery('Reads', __dirname + '/Meadow-Provider-MSSQL-AnimalReadQuery.sql',
-										function (pSuccess)
-										{
-											// Now try to read the record
-											testMeadow.doReads(testMeadow.query.addFilter('IDAnimal', 2),
-												function (pError, pQuery, pRecords)
-												{
-													Expect(pRecords[1].AnimalTypeCustom)
-														.to.equal('HumanGirl');
-													testMeadow.doDelete(testMeadow.query.addFilter('IDAnimal', 2),
-														function (pError, pQuery, pRecord)
-														{
-															// It returns the number of rows deleted
-															Expect(pRecord)
-																.to.equal(1);
-															testMeadow.doCount(testMeadow.query.addFilter('IDAnimal', 2),
-																function (pError, pQuery, pRecord)
-																{
-																	// It returns the number of rows deleted
-																	Expect(pRecord)
-																		.to.equal(1337);
-																	var tmpQuery = testMeadow.query
-																		.addRecord({ IDAnimal: 5, Type: 'Bartfast' });
-
-																	testMeadow.doUpdate(tmpQuery,
-																		function (pError, pQuery, pQueryRead, pRecord)
-																		{
-																			// We should have a record ....
-																			Expect(pRecord.AnimalTypeCustom)
-																				.to.equal('Bartfast');
-																			var tmpQuery = testMeadow.query
-																				.addRecord({ Name: 'Bambi', Type: 'CustomSheep' });
-
-																			testMeadow.doCreate(tmpQuery,
-																				function (pError, pQuery, pQueryRead, pRecord)
-																				{
-																					// We should have a record ....
-																					Expect(pRecord.AnimalTypeCustom)
-																						.to.equal('CustomSheep');
-																					fDone();
-																				}
-																			)
-																		}
-																	)
-																}
-															)
-														}
-													)
-												}
-											)
-										}
-									);
-								}
-							);
 						test
 							(
 								'Create a record in the database with bad fields',
@@ -1182,7 +1048,7 @@ suite
 										function (pError, pQuery, pQueryRead, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ER_BAD_FIELD_ERROR');
+												.to.equal('ENOTPREPARED');
 											fDone();
 										}
 									)

package/test/Meadow-Provider-MySQL_tests.js

@@ -24,7 +24,7 @@ var tmpFableSettings = 	(
 			Port: 3306,
 			User: "root",
 			Password: "123456789",
-			Database: "FableTest",
+			Database: "bookstore",
 			ConnectionPoolLimit: 20
 		},
 	LogStreams:
@@ -271,7 +271,7 @@ suite
 									Port: 3306,
 									User: "root",
 									Password: "123456789",
-									Database: "FableTest",
+									Database: "bookstore",
 									ConnectionPoolLimit: 20
 								},
 							MeadowConnectionMySQLAutoConnect: true