foxhound 1.0.36 → 1.0.39

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

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1648063932373
+	"lastUpdateCheck": 1653489092676
 }

package/Dockerfile

@@ -17,6 +17,20 @@ RUN echo "...mapping library specific volumes..."
 VOLUME /home/coder/foxhound
 # VOLUME /home/coder/foxhound/node_modules
 
+RUN echo "...installing vscode extensions..."
+RUN 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
+
 SHELL ["/bin/bash", "-c"]
 USER coder
 

package/debug/Harness.js

@@ -24,8 +24,10 @@ var _AnimalSchemaWithoutDeleted = (
 	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" }
 ]);
 
+/*
 var tmpQuery = libFoxHound.new(libFable)
-	.setDialect('MeadowEndpoints')
+	//.setDialect('MeadowEndpoints')
+	.setDialect('MySQL')
 	.setScope('Animal')
 	.setDataElements(['Name', 'Age', 'Cost'])
 	.setCap(100)
@@ -39,7 +41,18 @@ var tmpQuery = libFoxHound.new(libFable)
 tmpQuery.setLogLevel(3).addSort('Age');
 // Build the query
 tmpQuery.buildReadQuery();
-// This is the query generated by the MeadowEndpoints dialect
+// This is the query generated by the set dialect
 libFable.log.trace('Select Query', tmpQuery.query);
+*/
+var tmpQuery = libFoxHound.new(libFable)
+	//.setDialect('MeadowEndpoints')
+	.setDialect('MySQL')
+	.setScope('Animal')
+	.addFilter('IDAnimal', 10);
+tmpQuery.query.schema = _AnimalSchema;
+// Build the query
+tmpQuery.buildUndeleteQuery();
+// This is the query generated by the set dialect
+libFable.log.trace('Query: ', tmpQuery.query);
 
 console.log(tmpQuery.query.body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foxhound",
-  "version": "1.0.36",
+  "version": "1.0.39",
   "description": "A Database Query generation library.",
   "main": "source/FoxHound.js",
   "scripts": {

package/source/FoxHound.js

@@ -794,6 +794,13 @@ var FoxHound = function()
 			return this;
 		};
 
+		var buildUndeleteQuery = function()
+		{
+			checkDialect();
+			_Parameters.query.body = _Dialect.Undelete(_Parameters);
+			return this;
+		};
+
 		var buildCountQuery = function()
 		{
 			checkDialect();
@@ -836,6 +843,7 @@ var FoxHound = function()
 			buildReadQuery: buildReadQuery,
 			buildUpdateQuery: buildUpdateQuery,
 			buildDeleteQuery: buildDeleteQuery,
+			buildUndeleteQuery: buildUndeleteQuery,
 			buildCountQuery: buildCountQuery,
 
 			clone: clone,

package/source/dialects/ALASQL/FoxHound-Dialect-ALASQL.js

@@ -20,24 +20,24 @@ var libUnderscore = require('underscore');
 var FoxHoundDialectALASQL = function()
 {
 	/**
-	 * Generate a table name from the scope.
-	 *
-	 * Because ALASQL is all in-memory, and can be run in two modes (anonymous
-	 * working on arrays or table-based) we are going to make this a programmable
-	 * value.  Then we can share the code across both providers.
-	 *
-	 * @method: generateTableName
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate a table name from the scope.
+	*
+	* Because ALASQL is all in-memory, and can be run in two modes (anonymous
+	* working on arrays or table-based) we are going to make this a programmable
+	* value.  Then we can share the code across both providers.
+	*
+	* @method: generateTableName
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateTableName = function(pParameters)
 	{
 		return ' '+pParameters.scope;
 	};
 
 	/**
-	 * Escape columns, because ALASQL has more reserved KWs than most SQL dialects
-	 */
+	* Escape columns, because ALASQL has more reserved KWs than most SQL dialects
+	*/
 	var escapeColumn = (pColumn, pParameters) =>
 	{
 		if (pColumn.indexOf('.') < 0)
@@ -61,16 +61,16 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate a field list from the array of dataElements
-	 *
-	 * Each entry in the dataElements is a simple string
-	 *
-	 * @method: generateFieldList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @param {Boolean} pIsForCountClause (optional) If true, generate fields for use within a count clause.
-	 * @return: {String} Returns the field list clause, or empty string if explicit fields are requested but cannot be fulfilled
-	 *          due to missing schema.
-	 */
+	* Generate a field list from the array of dataElements
+	*
+	* Each entry in the dataElements is a simple string
+	*
+	* @method: generateFieldList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @param {Boolean} pIsForCountClause (optional) If true, generate fields for use within a count clause.
+	* @return: {String} Returns the field list clause, or empty string if explicit fields are requested but cannot be fulfilled
+	*          due to missing schema.
+	*/
 	var generateFieldList = function(pParameters, pIsForCountClause)
 	{
 		var tmpDataElements = pParameters.dataElements;
@@ -109,9 +109,9 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate a query from the array of where clauses
-	 *
-	 * Each clause is an object like:
+	* Generate a query from the array of where clauses
+	*
+	* Each clause is an object like:
 		{
 			Column:'Name',
 			Operator:'EQ',
@@ -119,11 +119,11 @@ var FoxHoundDialectALASQL = function()
 			Connector:'And',
 			Parameter:'Name'
 		}
-	 *
-	 * @method: generateWhere
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the WHERE clause prefixed with WHERE, or an empty string if unnecessary
-	 */
+	*
+	* @method: generateWhere
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the WHERE clause prefixed with WHERE, or an empty string if unnecessary
+	*/
 	var generateWhere = function(pParameters)
 	{
 		var tmpFilter = Array.isArray(pParameters.filter) ? pParameters.filter : [];
@@ -229,15 +229,15 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate an ORDER BY clause from the sort array
-	 *
-	 * Each entry in the sort is an object like:
-	 * {Column:'Color',Direction:'Descending'}
-	 *
-	 * @method: generateOrderBy
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the field list clause
-	 */
+	* Generate an ORDER BY clause from the sort array
+	*
+	* Each entry in the sort is an object like:
+	* {Column:'Color',Direction:'Descending'}
+	*
+	* @method: generateOrderBy
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the field list clause
+	*/
 	var generateOrderBy = function(pParameters)
 	{
 		var tmpOrderBy = pParameters.sort;
@@ -264,12 +264,12 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate the limit clause
-	 *
-	 * @method: generateLimit
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the limit clause
+	*
+	* @method: generateLimit
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateLimit = function(pParameters)
 	{
 		if (!pParameters.cap)
@@ -291,12 +291,12 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate the update SET clause
-	 *
-	 * @method: generateUpdateSetters
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the update SET clause
+	*
+	* @method: generateUpdateSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateUpdateSetters = function(pParameters)
 	{
 		var tmpRecords = pParameters.query.records;
@@ -391,12 +391,12 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate the update-delete SET clause
-	 *
-	 * @method: generateUpdateDeleteSetters
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the update-delete SET clause
+	*
+	* @method: generateUpdateDeleteSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateUpdateDeleteSetters = function(pParameters)
 	{
 		if (pParameters.query.disableDeleteTracking)
@@ -468,12 +468,81 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate the create SET clause
-	 *
-	 * @method: generateCreateSetList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the update-delete SET clause
+	*
+	* @method: generateUpdateDeleteSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
+	var generateUpdateUndeleteSetters = function(pParameters)
+	{
+		// Check if there is a schema.  If so, we will use it to decide if these are parameterized or not.
+		var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+
+		var tmpCurrentColumn = 0;
+		var tmpHasDeletedField = false;
+		var tmpUpdate = '';
+		// No hash table yet, so, we will just linear search it for now.
+		// This uses the schema to decide if we want to treat a column differently on insert
+		var tmpSchemaEntry = {Type:'Default'};
+		for (var i = 0; i < tmpSchema.length; i++)
+		{
+			// There is a schema entry for it.  Process it accordingly.
+			tmpSchemaEntry = tmpSchema[i];
+
+			var tmpUpdateSql = null;
+
+			switch (tmpSchemaEntry.Type)
+			{
+				case 'Deleted':
+					tmpUpdateSql = ' '+escapeColumn(tmpSchemaEntry.Column, pParameters)+' = 0';
+					tmpHasDeletedField = true; //this field is required in order for query to be built
+					break;
+				case 'UpdateDate':
+					// Delete operation is an Update, so we should stamp the update time
+					tmpUpdateSql = ' '+escapeColumn(tmpSchemaEntry.Column, pParameters)+' = NOW()';
+					break;
+				case 'UpdateIDUser':
+					// This is the user ID, which we hope is in the query.
+					// This is how to deal with a normal column
+					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
+					tmpUpdateSql = ' '+escapeColumn(tmpSchemaEntry.Column, pParameters)+' = :'+tmpColumnParameter;
+					// Set the query parameter
+					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+					break;
+				default:
+					//DON'T allow update of other fields in this query
+					continue;
+			}
+
+			if (tmpCurrentColumn > 0)
+			{
+				tmpUpdate += ',';
+			}
+
+			tmpUpdate += tmpUpdateSql;
+
+			// We use a number to make sure parameters are unique.
+			tmpCurrentColumn++;
+		}
+
+		// We need to tell the query not to generate improperly if there are no values set.
+		if (!tmpHasDeletedField ||
+			tmpUpdate === '')
+		{
+			return false;
+		}
+
+		return tmpUpdate;
+	};
+
+	/**
+	* Generate the create SET clause
+	*
+	* @method: generateCreateSetList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateCreateSetValues = function(pParameters)
 	{
 		var tmpRecords = pParameters.query.records;
@@ -613,12 +682,12 @@ var FoxHoundDialectALASQL = function()
 	};
 
 	/**
-	 * Generate the create SET clause
-	 *
-	 * @method: generateCreateSetList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the create SET clause
+	*
+	* @method: generateCreateSetList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateCreateSetList = function(pParameters)
 	{
 		// The records were already validated by generateCreateSetValues
@@ -755,6 +824,26 @@ var FoxHoundDialectALASQL = function()
 		}
 	};
 
+	var Undelete = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+		let tmpDeleteTrackingState = pParameters.query.disableDeleteTracking;
+		pParameters.query.disableDeleteTracking = false;
+		var tmpWhere = generateWhere(pParameters);
+		var tmpUpdateUndeleteSetters = generateUpdateUndeleteSetters(pParameters);
+		pParameters.query.disableDeleteTracking = tmpDeleteTrackingState;
+
+		if (tmpUpdateUndeleteSetters)
+		{
+			//If it has a deleted bit, update it instead of actually deleting the record
+			return 'UPDATE'+tmpTableName+' SET'+tmpUpdateUndeleteSetters+tmpWhere+';';
+		}
+		else
+		{
+			return 'SELECT NULL;';
+		}
+	};
+
 	var Count = function(pParameters)
 	{
 		var tmpTableName = generateTableName(pParameters);
@@ -790,15 +879,16 @@ var FoxHoundDialectALASQL = function()
 		Read: Read,
 		Update: Update,
 		Delete: Delete,
+		Undelete: Undelete,
 		Count: Count
 	});
 
 	/**
-	 * Dialect Name
-	 *
-	 * @property name
-	 * @type string
-	 */
+	* Dialect Name
+	*
+	* @property name
+	* @type string
+	*/
 	Object.defineProperty(tmpDialect, 'name',
 		{
 			get: function() { return 'ALASQL'; },

package/source/dialects/English/FoxHound-Dialect-English.js

@@ -54,6 +54,13 @@ var FoxHoundDialectEnglish = function()
 		return 'I am deleting your '+tmpScope+'.';
 	};
 
+	var Undelete = function(pParameters)
+	{
+		var tmpScope = pParameters.scope;
+
+		return 'I am undeleting your '+tmpScope+'.';
+	};
+
 	var Count = function(pParameters)
 	{
 		var tmpScope = pParameters.scope;
@@ -67,6 +74,7 @@ var FoxHoundDialectEnglish = function()
 		Read: Read,
 		Update: Update,
 		Delete: Delete,
+		Undelete: Undelete,
 		Count: Count
 	});
 

package/source/dialects/MeadowEndpoints/FoxHound-Dialect-MeadowEndpoints.js

@@ -404,7 +404,6 @@ var FoxHoundDialectMeadowEndpoints = function()
 		}
 
 		return tmpURL;
-        ///'SELECT'+tmpFieldList+' FROM'+tmpTableName+tmpJoin+tmpWhere+tmpOrderBy+tmpLimit+';';
 	};
 
 	var Update = function(pParameters)
@@ -449,7 +448,7 @@ var FoxHoundDialectMeadowEndpoints = function()
 
         if (tmpWhere)
         {
-            return `${tmpCountQuery}s/Count/FilteredTo/${tmpWhere}`;
+            return `${tmpTableName}s/Count/FilteredTo/${tmpWhere}`;
         }
 
         return tmpCountQuery;

package/source/dialects/MySQL/FoxHound-Dialect-MySQL.js

@@ -23,12 +23,12 @@ var FoxHoundDialectMySQL = function()
 	const SQL_NOW = "NOW(3)";
 
 	/**
-	 * Generate a table name from the scope
-	 *
-	 * @method: generateTableName
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate a table name from the scope
+	*
+	* @method: generateTableName
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateTableName = function(pParameters)
 	{
 		if (pParameters.scope && pParameters.scope.indexOf('`') >= 0)
@@ -38,16 +38,16 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate a field list from the array of dataElements
-	 *
-	 * Each entry in the dataElements is a simple string
-	 *
-	 * @method: generateFieldList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @param {Boolean} pIsForCountClause (optional) If true, generate fields for use within a count clause.
-	 * @return: {String} Returns the field list clause, or empty string if explicit fields are requested but cannot be fulfilled
-	 *          due to missing schema.
-	 */
+	* Generate a field list from the array of dataElements
+	*
+	* Each entry in the dataElements is a simple string
+	*
+	* @method: generateFieldList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @param {Boolean} pIsForCountClause (optional) If true, generate fields for use within a count clause.
+	* @return: {String} Returns the field list clause, or empty string if explicit fields are requested but cannot be fulfilled
+	*          due to missing schema.
+	*/
 	var generateFieldList = function(pParameters, pIsForCountClause)
 	{
 		var tmpDataElements = pParameters.dataElements;
@@ -106,8 +106,8 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Ensure a field name is properly escaped.
-	 */
+	* Ensure a field name is properly escaped.
+	*/
 	var generateSafeFieldName = function(pFieldName)
 	{
 		let pFieldNames = pFieldName.split('.');
@@ -122,9 +122,9 @@ var FoxHoundDialectMySQL = function()
 	}
 
 	/**
-	 * Generate a query from the array of where clauses
-	 *
-	 * Each clause is an object like:
+	* Generate a query from the array of where clauses
+	*
+	* Each clause is an object like:
 		{
 			Column:'Name',
 			Operator:'EQ',
@@ -132,11 +132,11 @@ var FoxHoundDialectMySQL = function()
 			Connector:'And',
 			Parameter:'Name'
 		}
-	 *
-	 * @method: generateWhere
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the WHERE clause prefixed with WHERE, or an empty string if unnecessary
-	 */
+	*
+	* @method: generateWhere
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the WHERE clause prefixed with WHERE, or an empty string if unnecessary
+	*/
 	var generateWhere = function(pParameters)
 	{
 		var tmpFilter = Array.isArray(pParameters.filter) ? pParameters.filter : [];
@@ -247,15 +247,15 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate an ORDER BY clause from the sort array
-	 *
-	 * Each entry in the sort is an object like:
-	 * {Column:'Color',Direction:'Descending'}
-	 *
-	 * @method: generateOrderBy
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the field list clause
-	 */
+	* Generate an ORDER BY clause from the sort array
+	*
+	* Each entry in the sort is an object like:
+	* {Column:'Color',Direction:'Descending'}
+	*
+	* @method: generateOrderBy
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the field list clause
+	*/
 	var generateOrderBy = function(pParameters)
 	{
 		var tmpOrderBy = pParameters.sort;
@@ -282,12 +282,12 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate the limit clause
-	 *
-	 * @method: generateLimit
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the limit clause
+	*
+	* @method: generateLimit
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateLimit = function(pParameters)
 	{
 		if (!pParameters.cap)
@@ -308,12 +308,12 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate the join clause
-	 *
-	 * @method: generateJoins
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the join clause
-	 */
+	* Generate the join clause
+	*
+	* @method: generateJoins
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the join clause
+	*/
 	var generateJoins = function(pParameters)
 	{
 		var tmpJoins = pParameters.join;
@@ -337,12 +337,12 @@ var FoxHoundDialectMySQL = function()
 	}
 
 	/**
-	 * Generate the update SET clause
-	 *
-	 * @method: generateUpdateSetters
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the update SET clause
+	*
+	* @method: generateUpdateSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateUpdateSetters = function(pParameters)
 	{
 		var tmpRecords = pParameters.query.records;
@@ -437,12 +437,12 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate the update-delete SET clause
-	 *
-	 * @method: generateUpdateDeleteSetters
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the update-delete SET clause
+	*
+	* @method: generateUpdateDeleteSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateUpdateDeleteSetters = function(pParameters)
 	{
 		if (pParameters.query.disableDeleteTracking)
@@ -452,7 +452,7 @@ var FoxHoundDialectMySQL = function()
 		}
 		// Check if there is a schema.  If so, we will use it to decide if these are parameterized or not.
 		var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
-
+ 
 		var tmpCurrentColumn = 0;
 		var tmpHasDeletedField = false;
 		var tmpUpdate = '';
@@ -463,9 +463,9 @@ var FoxHoundDialectMySQL = function()
 		{
 			// There is a schema entry for it.  Process it accordingly.
 			tmpSchemaEntry = tmpSchema[i];
-
+ 
 			var tmpUpdateSql = null;
-
+ 
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
@@ -491,6 +491,72 @@ var FoxHoundDialectMySQL = function()
 					//DON'T allow update of other fields in this query
 					continue;
 			}
+ 
+			if (tmpCurrentColumn > 0)
+			{
+				tmpUpdate += ',';
+			}
+ 
+			tmpUpdate += tmpUpdateSql;
+ 
+			// We use a number to make sure parameters are unique.
+			tmpCurrentColumn++;
+		}
+ 
+		// We need to tell the query not to generate improperly if there are no values set.
+		if (!tmpHasDeletedField ||
+			tmpUpdate === '')
+		{
+			return false;
+		}
+ 
+		return tmpUpdate;
+	};
+ 
+	/**
+	* Generate the update-undelete SET clause
+	*
+	* @method: generateUpdateUndeleteSetters
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
+	var generateUpdateUndeleteSetters = function(pParameters)
+	{
+		// Check if there is a schema.  If so, we will use it to decide if these are parameterized or not.
+		var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+
+		var tmpCurrentColumn = 0;
+		var tmpHasDeletedField = false;
+		var tmpUpdate = '';
+		// No hash table yet, so, we will just linear search it for now.
+		// This uses the schema to decide if we want to treat a column differently on insert
+		var tmpSchemaEntry = {Type:'Default'};
+		for (var i = 0; i < tmpSchema.length; i++)
+		{
+			// There is a schema entry for it.  Process it accordingly.
+			tmpSchemaEntry = tmpSchema[i];
+
+			var tmpUpdateSql = null;
+
+			switch (tmpSchemaEntry.Type)
+			{
+				case 'Deleted':
+					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 0';
+					tmpHasDeletedField = true; //this field is required in order for query to be built
+					break;
+				case 'UpdateDate':
+					// The undelete operation is an Update, so we should stamp the update time
+					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					break;
+				case 'UpdateIDUser':
+					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
+					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = :'+tmpColumnParameter;
+					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+					break;
+				default:
+					//DON'T allow update of other fields in this query
+					continue;
+			}
 
 			if (tmpCurrentColumn > 0)
 			{
@@ -514,12 +580,12 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate the create SET clause
-	 *
-	 * @method: generateCreateSetList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the create SET clause
+	*
+	* @method: generateCreateSetList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateCreateSetValues = function(pParameters)
 	{
 		var tmpRecords = pParameters.query.records;
@@ -659,12 +725,12 @@ var FoxHoundDialectMySQL = function()
 	};
 
 	/**
-	 * Generate the create SET clause
-	 *
-	 * @method: generateCreateSetList
-	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the table name clause
-	 */
+	* Generate the create SET clause
+	*
+	* @method: generateCreateSetList
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table name clause
+	*/
 	var generateCreateSetList = function(pParameters)
 	{
 		// The records were already validated by generateCreateSetValues
@@ -802,6 +868,29 @@ var FoxHoundDialectMySQL = function()
 		}
 	};
 
+	var Undelete = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+		// TODO: Fix these
+		let tmpDeleteTrackingState = pParameters.query.disableDeleteTracking;
+		pParameters.query.disableDeleteTracking = false;
+		var tmpWhere = generateWhere(pParameters);
+		var tmpUpdateUndeleteSetters = generateUpdateUndeleteSetters(pParameters);
+		pParameters.query.disableDeleteTracking = tmpDeleteTrackingState;
+
+		if (tmpUpdateUndeleteSetters)
+		{
+			//If the table has a deleted bit, go forward with the update to change things.
+			return 'UPDATE'+tmpTableName+' SET'+tmpUpdateUndeleteSetters+tmpWhere+';';
+		}
+		else
+		{
+			// This is a no-op because the record can't be undeleted.
+			// TODO: Should it throw instead?
+			return 'SELECT NULL;';
+		}
+	};
+
 	var Count = function(pParameters)
 	{
 		var tmpFieldList = pParameters.distinct ? generateFieldList(pParameters, true) : '*';
@@ -838,15 +927,16 @@ var FoxHoundDialectMySQL = function()
 		Read: Read,
 		Update: Update,
 		Delete: Delete,
+		Undelete: Undelete,
 		Count: Count
 	});
 
 	/**
-	 * Dialect Name
-	 *
-	 * @property name
-	 * @type string
-	 */
+	* Dialect Name
+	*
+	* @property name
+	* @type string
+	*/
 	Object.defineProperty(tmpDialect, 'name',
 		{
 			get: function() { return 'MySQL'; },

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -659,6 +659,43 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete Query with Deleted Bit',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('ALASQL')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+
+						// Build the query
+						tmpQuery.buildUndeleteQuery();
+						// This is the query generated by the ALASQL dialect
+						libFable.log.trace('Undelete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('UPDATE Animal SET `UpdateDate` = NOW(), `UpdatingIDUser` = :UpdatingIDUser_1, `Deleted` = 0 WHERE `IDAnimal` = :IDAnimal_w0 AND `Deleted` = :Deleted_w1;');
+					}
+				);
+				test
+				(
+					'Undelete Query without Deleted Bit',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('ALASQL')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+
+						// Build the query
+						tmpQuery.buildUndeleteQuery();
+						// This is the query generated by the ALASQL dialect
+						libFable.log.trace('Undelete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT NULL;');
+					}
+				);
+				test
 				(
 					'Update Query -- without Deleted',
 					function()

package/test/FoxHound-Dialect-English_tests.js

@@ -205,6 +205,20 @@ suite
 					}
 				);
 				test
+				(
+					'Undelete Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('English').setScope('Animal');
+
+						// Build the query
+						tmpQuery.buildUndeleteQuery();
+						// This is the query generated by the English dialect
+						Expect(tmpQuery.query.body)
+							.to.equal('I am undeleting your Animal.');
+					}
+				);
+				test
 				(
 					'Count Query',
 					function()

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -772,6 +772,43 @@ suite
 							.to.equal('DELETE FROM `Animal` WHERE IDAnimal = :IDAnimal_w0;');
 					}
 				);
+				test
+				(
+					'Undelete Query with Deleted Bit',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MySQL')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+
+						// Build the query
+						tmpQuery.buildUndeleteQuery();
+						// This is the query generated by the MySQL dialect
+						libFable.log.trace('Undelete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('UPDATE `Animal` SET UpdateDate = NOW(3), UpdatingIDUser = :UpdatingIDUser_1, Deleted = 0 WHERE IDAnimal = :IDAnimal_w0 AND  `Animal`.Deleted = :Deleted_w1;');
+					}
+				);
+				test
+				(
+					'Undelete Query without Deleted Bit',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MySQL')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+
+						// Build the query
+						tmpQuery.buildUndeleteQuery();
+						// This is the query generated by the MySQL dialect
+						libFable.log.trace('Undelete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT NULL;');
+					}
+				);
 			}
 		);