meadow 2.0.30 → 2.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.30",
+  "version": "2.0.33",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {

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

@@ -183,10 +183,12 @@ var MeadowProvider = function ()
 			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);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,
@@ -236,10 +238,12 @@ var MeadowProvider = function ()
 			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);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,
@@ -287,10 +291,12 @@ var MeadowProvider = function ()
 			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(`UPDATE Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,
@@ -331,10 +337,12 @@ var MeadowProvider = function ()
 			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);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,
@@ -383,10 +391,12 @@ var MeadowProvider = function ()
 			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);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,
@@ -435,10 +445,12 @@ var MeadowProvider = function ()
 			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(`COUNT Error preparing prepared statement: ${pPrepareError}`, pPrepareError);
+						tmpResult.error = pPrepareError;
+						tmpResult.executed = true;
+						return fCallback();
 					}
 
 					tmpPreparedStatement.execute(pQuery.query.parameters,

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

@@ -204,15 +204,14 @@ var MeadowProvider = function ()
 				}
 
 				tmpResult.executed = true;
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var Read = function (pQuery, fCallback)
@@ -245,15 +244,14 @@ var MeadowProvider = function ()
 				tmpResult.error = null;
 				tmpResult.value = tmpRows;
 				tmpResult.executed = true;
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var Update = function (pQuery, fCallback)
@@ -286,15 +284,14 @@ var MeadowProvider = function ()
 				tmpResult.error = null;
 				tmpResult.value = tmpInfo;
 				tmpResult.executed = true;
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var Delete = function (pQuery, fCallback)
@@ -335,15 +332,14 @@ var MeadowProvider = function ()
 					_Fable.log.warn('Error getting affected rowcount during delete query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
 				}
 				tmpResult.executed = true;
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var Undelete = function (pQuery, fCallback)
@@ -384,15 +380,14 @@ var MeadowProvider = function ()
 					_Fable.log.warn('Error getting affected rowcount during undelete query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
 				}
 				tmpResult.executed = true;
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var Count = function (pQuery, fCallback)
@@ -433,15 +428,14 @@ var MeadowProvider = function ()
 				{
 					_Fable.log.warn('Error getting rowcount during count query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
 				}
-				return fCallback();
 			}
 			catch (pError)
 			{
 				tmpResult.error = pError;
 				tmpResult.value = false;
 				tmpResult.executed = true;
-				return fCallback();
 			}
+			return fCallback();
 		};
 
 		var tmpNewProvider = (

package/test/Meadow-Provider-MSSQL_tests.js

@@ -748,7 +748,7 @@ END
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal("ENOTPREPARED");
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)
@@ -769,7 +769,7 @@ END
 										{
 											// We should have no record because the default id is IDFableTest and our tables identity is IDAnimal
 											Expect(pError.code)
-												.to.equal('ENOTPREPARED');
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)
@@ -867,7 +867,7 @@ END
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ENOTPREPARED');
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)
@@ -887,7 +887,7 @@ END
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ENOTPREPARED');
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)
@@ -907,7 +907,7 @@ END
 										function (pError, pQuery, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ENOTPREPARED');
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)
@@ -1093,7 +1093,7 @@ END
 										function (pError, pQuery, pQueryRead, pRecord)
 										{
 											Expect(pError.code)
-												.to.equal('ENOTPREPARED');
+												.to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
 											fDone();
 										}
 									)