foxhound 1.0.32 → 1.0.33

package/.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Program",
+            "outputCapture": "std",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/debug/Harness.js"
+        }
+    ]
+}

package/debug/Harness.js

@@ -0,0 +1,46 @@
+var libFable = require('fable').new({});
+var libFoxHound = require('../source/FoxHound.js');
+
+var _AnimalSchema = (
+[
+	{ Column: "IDAnimal",        Type:"AutoIdentity" },
+	{ Column: "GUIDAnimal",      Type:"AutoGUID" },
+	{ Column: "CreateDate",      Type:"CreateDate" },
+	{ Column: "CreatingIDUser",  Type:"CreateIDUser" },
+	{ Column: "UpdateDate",        Type:"UpdateDate" },
+	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" },
+	{ Column: "Deleted",         Type:"Deleted" },
+	{ Column: "DeletingIDUser",  Type:"DeleteIDUser" },
+	{ Column: "DeleteDate",      Type:"DeleteDate" }
+]);
+
+var _AnimalSchemaWithoutDeleted = (
+[
+	{ Column: "IDAnimal",        Type:"AutoIdentity" },
+	{ Column: "GUIDAnimal",      Type:"AutoGUID" },
+	{ Column: "CreateDate",      Type:"CreateDate" },
+	{ Column: "CreatingIDUser",  Type:"CreateIDUser" },
+	{ Column: "UpdateDate",        Type:"UpdateDate" },
+	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" }
+]);
+
+var tmpQuery = libFoxHound.new(libFable)
+.setDialect('MeadowEndpoints')
+.setScope('Animal')
+.setDataElements(['Name', 'Age', 'Cost'])
+.setCap(100)
+.addFilter('Age', '25')
+.addFilter('', '', '(')
+.addFilter('Color', 'Red')
+.addFilter('Color', 'Green', '=', 'OR')
+.addFilter('', '', ')')
+.addFilter('Description', '', 'IS NOT NULL')
+.addFilter('IDOffice', [10, 11, 15, 18, 22], 'IN');
+tmpQuery.setLogLevel(3).addSort('Age');
+// Build the query
+tmpQuery.buildReadQuery();
+// This is the query generated by the MeadowEndpoints dialect
+libFable.log.trace('Select Query', tmpQuery.query);
+
+
+console.log(tmpQuery.query.body);

package/package.json

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

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

@@ -739,9 +739,9 @@ var FoxHoundDialectALASQL = function()
 	var Count = function(pParameters)
 	{
 		var tmpTableName = generateTableName(pParameters);
-		var tmpFieldList = generateFieldList(pParameters);
 		var tmpWhere = generateWhere(pParameters);
 		const tmpOptDistinct = pParameters.distinct ? 'DISTINCT' : '';
+		const tmpCountClause = pParameters.distinct ? `${tmpOptDistinct}${generateFieldList(pParameters)}` : '*';
 
 		if (pParameters.queryOverride)
 		{
@@ -758,7 +758,7 @@ var FoxHoundDialectALASQL = function()
 			}
 		}
 
-		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList}) AS RowCount FROM${tmpTableName}${tmpWhere};`;
+		return `SELECT COUNT(${tmpCountClause}) AS RowCount FROM${tmpTableName}${tmpWhere};`;
 	};
 
 	var tmpDialect = ({

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

@@ -0,0 +1,445 @@
+/**
+* FoxHound Meadow Endpoints Dialect
+*
+* @license MIT
+*
+* @author Steven Velozo <steven@velozo.com>
+* @class FoxHoundDialectMeadowEndpoints
+*/
+var libUnderscore = require('underscore');
+
+var FoxHoundDialectMeadowEndpoints = function()
+{
+	/**
+	 * 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)
+	{
+		return pParameters.scope;
+	};
+
+	/**
+	 * 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
+	 * @return: {String} Returns the field list clause
+	 */
+	var generateFieldList = function(pParameters)
+	{
+		var tmpDataElements = pParameters.dataElements;
+		if (!Array.isArray(tmpDataElements) || tmpDataElements.length < 1)
+		{
+			return '';
+		}
+
+		var tmpFieldList = '';
+		for (var i = 0; i < tmpDataElements.length; i++)
+		{
+			if (i > 0)
+			{
+				tmpFieldList += ',';
+			}
+
+            tmpFieldList += tmpDataElements[i];
+		}
+		return tmpFieldList;
+	};
+
+	/**
+	 * Generate a query from the array of where clauses
+	 *
+	 * Each clause is an object like:
+		{
+			Column:'Name', 
+			Operator:'EQ', 
+			Value:'John', 
+			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
+	 */
+	var generateWhere = function(pParameters)
+	{
+		var tmpFilter = Array.isArray(pParameters.filter) ? pParameters.filter : [];
+		var tmpTableName = generateTableName(pParameters);
+        
+        var tmpURL = '';
+
+        let tmpfAddFilter = (pFilterCommand, pFilterParameters) =>
+        {
+            if (tmpURL.length > 0)
+            {
+                tmpURL += '~';
+            }
+            
+            tmpURL += `${pFilterCommand}~${pFilterParameters[0]}~${pFilterParameters[1]}~${pFilterParameters[2]}`;
+        };
+
+        let tmpfTranslateOperator = (pOperator) =>
+        {
+            tmpNewOperator = 'EQ';
+            switch(pOperator.toUpperCase())
+            {
+                case '!=':
+                    tmpNewOperator = 'NE';
+                    break;
+                case '>':
+                    tmpNewOperator = 'GT';
+                    break;
+                case '>=':
+                    tmpNewOperator = 'GE';
+                    break;
+                case '<=':
+                    tmpNewOperator = 'LE';
+                    break;
+                case '<':
+                    tmpNewOperator = 'LT';
+                    break;
+                case 'LIKE':
+                    tmpNewOperator = 'LK';
+                    break;
+                case 'IN':
+                    tmpNewOperator = 'INN';
+                    break;
+                case 'NOT IN':
+                    tmpNewOperator = 'NI';
+                    break;
+            }
+            return tmpNewOperator;
+        }
+
+        // Translating Delete Tracking bit on query to a query with automagic
+        // This will eventually deprecate this as part of the necessary query
+        if (pParameters.query.disableDeleteTracking)
+        {
+            tmpfAddFilter('FBV',['Deleted','GE','0'])
+        }
+
+		for (var i = 0; i < tmpFilter.length; i++)
+		{
+			if (tmpFilter[i].Operator === '(')
+			{
+                tmpfAddFilter('FOP',['0','(','0']);
+			}
+			else if (tmpFilter[i].Operator === ')')
+			{
+				// Close a logical grouping
+                tmpfAddFilter('FCP',['0',')','0']);
+			}
+			else if (tmpFilter[i].Operator === 'IN' || tmpFilter[i].Operator === "NOT IN")
+			{
+                let tmpFilterCommand = 'FBV';
+                if (tmpFilter[i].Connector == 'OR')
+                {
+                    tmpFilterCommand = 'FBVOR';
+                }
+				// Add the column name, operator and parameter name to the list of where value parenthetical
+                tmpfAddFilter(tmpFilterCommand, [tmpFilter[i].Column, tmpfTranslateOperator(tmpFilter[i].Operator), tmpFilter[i].Value.map(encodeURIComponent).join(',')])
+			}
+			else if (tmpFilter[i].Operator === 'IS NULL')
+			{
+				// IS NULL is a special operator which doesn't require a value, or parameter
+                tmpfAddFilter('FBV', [tmpFilter[i].Column, 'IN', '0']);
+			}
+			else if (tmpFilter[i].Operator === 'IS NOT NULL')
+			{
+				// IS NOT NULL is a special operator which doesn't require a value, or parameter
+                tmpfAddFilter('FBV', [tmpFilter[i].Column, 'NN', '0']);
+			}
+			else
+			{
+                let tmpFilterCommand = 'FBV';
+                if (tmpFilter[i].Connector == 'OR')
+                {
+                    tmpFilterCommand = 'FBVOR';
+                }
+				// Add the column name, operator and parameter name to the list of where value parenthetical
+                tmpfAddFilter(tmpFilterCommand, [tmpFilter[i].Column, tmpfTranslateOperator(tmpFilter[i].Operator), encodeURIComponent(tmpFilter[i].Value)]);
+			}
+		}
+
+        let tmpOrderBy = generateOrderBy(pParameters);
+        if (tmpOrderBy)
+        {
+            if (tmpURL)
+            {
+                tmpURL += '~';
+            }
+            tmpURL += tmpOrderBy;
+        }
+
+		return tmpURL;
+	};
+
+    /**
+	 * Get the flags for the request
+     * 
+     * These are usually passed in for Update and Create when extra tracking is disabled.
+	 *
+	 * @method: generateFlags
+	 * @param: {Object} pParameters SQL Query Parameters
+	 * @return: {String} Flags to be sent, if any.
+	 */
+    function generateFlags(pParameters)
+    {
+        let tmpDisableAutoDateStamp = pParameters.query.disableAutoDateStamp;
+        let tmpDisableDeleteTracking = pParameters.query.disableDeleteTracking;
+        let tmpDisableAutoIdentity = pParameters.query.disableAutoIdentity;
+        let tmpDisableAutoUserStamp = pParameters.query.disableAutoUserStamp;
+
+        let tmpFlags = '';
+
+        let fAddFlag = (pFlagSet, pFlag) =>
+            {
+                if (pFlagSet)
+                {
+                    if (tmpFlags.length > 0)
+                    {
+                        tmpFlags += ',';
+                    }
+                    tmpFlags += pFlag;
+                }
+            };
+
+        fAddFlag(tmpDisableAutoDateStamp, 'DisableAutoDateStamp');
+        fAddFlag(tmpDisableDeleteTracking, 'DisableDeleteTracking');
+        fAddFlag(tmpDisableAutoIdentity, 'DisableAutoIdentity');
+        fAddFlag(tmpDisableAutoUserStamp, 'DisableAutoUserStamp');
+
+        return tmpFlags;
+    };
+
+    /**
+	 * Get the ID for the record, to be used in URIs
+	 *
+	 * @method: getIDRecord
+	 * @param: {Object} pParameters SQL Query Parameters
+	 * @return: {String} ID of the record in string form for the URI
+	 */
+	var getIDRecord = function(pParameters)
+	{
+        var tmpFilter = Array.isArray(pParameters.filter) ? pParameters.filter : [];
+
+		var tmpIDRecord = false;
+
+        if (tmpFilter.length < 1)
+		{
+			return tmpIDRecord;
+		}
+
+		for (var i = 0; i < tmpFilter.length; i++)
+		{
+            // Check Schema Entry Type
+            var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+			var tmpSchemaEntry = {Column:tmpFilter[i].Column, Type:'Default'};
+			for (var j = 0; j < tmpSchema.length; j++)
+			{
+                // If this column is the AutoIdentity, set it.
+				if ((tmpFilter[i].Column == tmpSchema[j].Column) &&
+                    (tmpSchema[j].Type == 'AutoIdentity'))
+				{
+                    tmpIDRecord = tmpFilter[i].Value;
+					break;
+				}
+			}
+		}
+
+		return tmpIDRecord;
+    }
+	
+    /**
+	 * 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;
+		var tmpOrderClause = false;
+
+        if (!Array.isArray(tmpOrderBy) || tmpOrderBy.length < 1)
+		{
+			return tmpOrderClause;
+		}
+
+        tmpOrderClause = '';
+
+        for (var i = 0; i < tmpOrderBy.length; i++)
+		{
+			if (i > 0)
+			{
+				tmpOrderClause += '~';
+			}
+			tmpOrderClause += `FSF~${tmpOrderBy[i].Column}~`;
+
+			if (tmpOrderBy[i].Direction == 'Descending')
+			{
+				tmpOrderClause += 'DESC~0';
+			}
+            else
+            {
+                tmpOrderClause += 'ASC~0'
+            }
+		}
+		return tmpOrderClause;
+	};
+
+	/**
+	 * 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)
+		{
+			return '';
+		}
+
+        let tmpBegin = (pParameters.begin !== false) ? pParameters.begin : 0;
+
+        return `${tmpBegin}/${pParameters.cap}`;
+	};
+
+	var Create = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+        var tmpFlags = generateFlags(pParameters);
+
+        if (tmpTableName)
+        {
+            let tmpURL = tmpTableName;
+            if (tmpFlags)
+            {
+                tmpURL = `${tmpURL}/WithFlags/${tmpFlags}`
+            }
+            return tmpURL;
+        }
+        else
+        {
+            return false;
+        }
+	};
+
+
+	/**
+	* Read one or many records
+	*
+	* @method Read
+	* @param {Object} pParameters SQL Query parameters
+	* @return {String} Returns the current Query for chaining.
+	*/
+	var Read = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+		var tmpFieldList = generateFieldList(pParameters);
+		var tmpWhere = generateWhere(pParameters);
+		var tmpLimit = generateLimit(pParameters);
+
+        var tmpURL = `${tmpTableName}s`;
+        if (tmpFieldList)
+        {
+            tmpURL = `${tmpURL}/LiteExtended/${tmpFieldList}`
+        }
+        if (tmpWhere)
+        {
+            tmpURL = `${tmpURL}/FilteredTo/${tmpWhere}`;
+        }
+        if (tmpLimit)
+        {
+            tmpURL = `${tmpURL}/${tmpLimit}`;
+        }
+
+		return tmpURL;
+        ///'SELECT'+tmpFieldList+' FROM'+tmpTableName+tmpJoin+tmpWhere+tmpOrderBy+tmpLimit+';';
+	};
+
+	var Update = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+        var tmpFlags = generateFlags(pParameters);
+
+        if (tmpTableName)
+        {
+            let tmpURL = tmpTableName;
+            if (tmpFlags)
+            {
+                tmpURL = `${tmpURL}/WithFlags/${tmpFlags}`
+            }
+            return tmpURL;
+        }
+        else
+        {
+            return false;
+        }
+	};
+
+	var Delete = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+		var tmpIDRecord = getIDRecord(pParameters);
+
+        if (!tmpIDRecord)
+        {
+            return false;
+        }
+
+		return `${tmpTableName}/${tmpIDRecord}`;
+	};
+
+	var Count = function(pParameters)
+	{
+		var tmpTableName = generateTableName(pParameters);
+		var tmpWhere = generateWhere(pParameters);
+
+        let tmpCountQuery = `${tmpTableName}s/Count`;
+
+        if (tmpWhere)
+        {
+            return `${tmpCountQuery}s/Count/FilteredTo/${tmpWhere}`;
+        }
+
+        return tmpCountQuery;
+	};
+
+	var tmpDialect = ({
+		Create: Create,
+		Read: Read,
+		Update: Update,
+		Delete: Delete,
+		Count: Count
+	});
+
+	/**
+	 * Dialect Name
+	 *
+	 * @property name
+	 * @type string
+	 */
+	Object.defineProperty(tmpDialect, 'name',
+		{
+			get: function() { return 'MeadowEndpoints'; },
+			enumerable: true
+		});
+
+	return tmpDialect;
+};
+
+module.exports = new FoxHoundDialectMeadowEndpoints();

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

@@ -44,14 +44,28 @@ var FoxHoundDialectMySQL = function()
 	 *
 	 * @method: generateFieldList
 	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the field list clause
+	 * @param {Boolean} pExplicitFields (optional) If true, generate explicit fields rather than "TableName.*" (for count distinct).
+	 * @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)
+	var generateFieldList = function(pParameters, pExplicitFields)
 	{
 		var tmpDataElements = pParameters.dataElements;
 		if (!Array.isArray(tmpDataElements) || tmpDataElements.length < 1)
 		{
-			return generateTableName(pParameters) + '.*';
+			const tmpTableName = generateTableName(pParameters);
+			if (!pExplicitFields)
+			{
+				return tmpTableName + '.*';
+			}
+			// we need to list all of the table fields explicitly; get them from the schema
+			var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+			tmpDataElements = tmpSchema.map((entry) => `${tmpTableName}.${entry.Column}`.trim());
+			if (tmpDataElements.length < 1)
+			{
+				// this means we have no schema; returning an empty string here signals the calling code to handle this case
+				return '';
+			}
 		}
 
 		var tmpFieldList = ' ';
@@ -77,19 +91,26 @@ var FoxHoundDialectMySQL = function()
 		return tmpFieldList;
 	};
 
+	const SURROUNDING_QUOTES_AND_WHITESPACE_REGEX = /^[` ]+|[` ]+$/g;
+
+	const cleanseQuoting = (str) =>
+	{
+		return str.replace(SURROUNDING_QUOTES_AND_WHITESPACE_REGEX, '');
+	};
+
 	/**
 	 * Ensure a field name is properly escaped.
 	 */
 	var generateSafeFieldName = function(pFieldName)
 	{
-		pFieldNames = pFieldName.replace('`', '').split('.');
+		let pFieldNames = pFieldName.split('.');
 		if (pFieldNames.length > 1)
 		{
-			return "`" + pFieldNames[0] + "`.`" + pFieldNames[1] + "`";
+			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleanseQuoting(pFieldNames[1]) + "`";
 		}
 		else
 		{
-			return "`" + pFieldNames[0] + "`";
+			return "`" + cleanseQuoting(pFieldNames[0]) + "`";
 		}
 	}
 
@@ -776,11 +797,16 @@ var FoxHoundDialectMySQL = function()
 
 	var Count = function(pParameters)
 	{
-		var tmpFieldList = generateFieldList(pParameters);
+		var tmpFieldList = pParameters.distinct ? generateFieldList(pParameters, true) : '*';
 		var tmpTableName = generateTableName(pParameters);
 		var tmpJoin = generateJoins(pParameters);
 		var tmpWhere = generateWhere(pParameters);
-		const tmpOptDistinct = pParameters.distinct ? 'DISTINCT' : '';
+		// here, we ignore the distinct keyword if no fields have bene specified and
+		if (pParameters.distinct && tmpFieldList.length < 1)
+		{
+			console.warn('Distinct requested but no field list or schema are available, so not honoring distinct for count query.');
+		}
+		const tmpOptDistinct = pParameters.distinct && tmpFieldList.length > 0 ? 'DISTINCT' : '';
 
 		if (pParameters.queryOverride)
 		{
@@ -797,7 +823,7 @@ var FoxHoundDialectMySQL = function()
 			}
 		}
 
-		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList}) AS RowCount FROM${tmpTableName}${tmpJoin}${tmpWhere};`;
+		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS RowCount FROM${tmpTableName}${tmpJoin}${tmpWhere};`;
 	};
 
 	var tmpDialect = ({

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -290,6 +290,49 @@ suite
 					}
 				);
 				test
+				(
+					'Count Query with Field Overrides',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('ALASQL')
+							.setScope('Animal')
+							.setCap(10)
+							.setBegin(0)
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setSort([{Column:'Age',Direction:'Ascending'},{Column:'Cost',Direction:'Descending'}])
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// This is the query generated by the ALASQL dialect
+						libFable.log.trace('Custom Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT COUNT(*) AS RowCount FROM Animal WHERE `Age` = :Age_w0;');
+					}
+				);
+				test
+				(
+					'Count Query with Field Overrides and Distinct',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('ALASQL')
+							.setScope('Animal')
+							.setCap(10)
+							.setBegin(0)
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setSort([{Column:'Age',Direction:'Ascending'},{Column:'Cost',Direction:'Descending'}])
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'})
+							.setDistinct(true);
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// This is the query generated by the ALASQL dialect
+						libFable.log.trace('Custom Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT COUNT(DISTINCT `Name`, `Age`, `Cost`) AS RowCount FROM Animal WHERE `Age` = :Age_w0;');
+					}
+				);
+				test
 				(
 					'Custom Count Query with Distinct',
 					function()
@@ -299,13 +342,12 @@ suite
 							.setScope('Animal')
 							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'})
 							.setDistinct(true);
-						tmpQuery.parameters.queryOverride = 'SELECT COUNT(<%= Distinct %> *) AS RowCount FROM <%= TableName %> <%= Where %>;';
 						// Build the query
 						tmpQuery.buildCountQuery();
 						// This is the query generated by the ALASQL dialect
 						libFable.log.trace('Custom Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(DISTINCT *) AS RowCount FROM  Animal  WHERE `Age` = :Age_w0;');
+							.to.equal('SELECT COUNT(DISTINCT *) AS RowCount FROM Animal WHERE `Age` = :Age_w0;');
 					}
 				);
 				test
@@ -375,7 +417,7 @@ suite
 						// This is the query generated by the ALASQL dialect
 						libFable.log.trace('Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT( *) AS RowCount FROM Animal;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM Animal;');
 					}
 				);
 			}

package/test/FoxHound-Dialect-MeadowEndpoints_tests.js

@@ -0,0 +1,589 @@
+/**
+* Unit tests for FoxHound
+*
+* @license     MIT
+*
+* @author      Steven Velozo <steven@velozo.com>
+*/
+
+var Chai = require('chai');
+var Expect = Chai.expect;
+var Assert = Chai.assert;
+
+var libFable = require('fable').new({});
+var libFoxHound = require('../source/FoxHound.js');
+
+var _AnimalSchema = (
+[
+	{ Column: "IDAnimal",        Type:"AutoIdentity" },
+	{ Column: "GUIDAnimal",      Type:"AutoGUID" },
+	{ Column: "CreateDate",      Type:"CreateDate" },
+	{ Column: "CreatingIDUser",  Type:"CreateIDUser" },
+	{ Column: "UpdateDate",        Type:"UpdateDate" },
+	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" },
+	{ Column: "Deleted",         Type:"Deleted" },
+	{ Column: "DeletingIDUser",  Type:"DeleteIDUser" },
+	{ Column: "DeleteDate",      Type:"DeleteDate" }
+]);
+
+var _AnimalSchemaWithoutDeleted = (
+[
+	{ Column: "IDAnimal",        Type:"AutoIdentity" },
+	{ Column: "GUIDAnimal",      Type:"AutoGUID" },
+	{ Column: "CreateDate",      Type:"CreateDate" },
+	{ Column: "CreatingIDUser",  Type:"CreateIDUser" },
+	{ Column: "UpdateDate",        Type:"UpdateDate" },
+	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" }
+]);
+
+suite
+(
+	'FoxHound-Dialect-MeadowEndpoints',
+	function()
+	{
+		setup
+		(
+			function()
+			{
+			}
+		);
+
+		suite
+		(
+			'Object Sanity',
+			function()
+			{
+				test
+				(
+					'initialize should build a happy little object',
+					function()
+					{
+						var testFoxHound = libFoxHound.new(libFable).setDialect('MeadowEndpoints');
+						Expect(testFoxHound.dialect.name)
+							.to.equal('MeadowEndpoints');
+						Expect(testFoxHound)
+							.to.be.an('object', 'FoxHound with MeadowEndpoints should initialize as an object directly from the require statement.');
+					}
+				);
+			}
+		);
+
+		suite
+		(
+			'Basic Query Generation',
+			function()
+			{
+				test
+				(
+					'Create Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setLogLevel(5)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.addRecord({IDAnimal:null, Name:'Foo Foo', Age:15});
+						// Build the query
+						tmpQuery.buildCreateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Create Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal("Animal");
+					}
+				);
+				test
+				(
+					'Bad Create Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints');
+						// Build the query
+						tmpQuery.buildCreateQuery();
+						tmpQuery.addRecord({});
+						tmpQuery.buildCreateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Create Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal(false);
+					}
+				);
+				test
+				(
+					'Read Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints').setScope('Animal');
+						tmpQuery.addSort({Column:'Cost',Direction:'Descending'});
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Simple Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/FilteredTo/FSF~Cost~DESC~0');
+					}
+				);
+				test
+				(
+					'Complex Read Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setCap(10)
+							.setBegin(0)
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setSort([{Column:'Age',Direction:'Ascending'}])
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						tmpQuery.addSort('Cost');
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/LiteExtended/Name,Age,Cost/FilteredTo/FBV~Age~EQ~15~FSF~Age~ASC~0~FSF~Cost~ASC~0/0/10')
+					}
+				);
+				test
+				(
+					'Complex Read Query 2',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(100)
+							.addFilter('Age', '25')
+							.addFilter('', '', '(')
+							.addFilter('Color', 'Red')
+							.addFilter('Color', 'Green', '=', 'OR')
+							.addFilter('', '', ')')
+							.addFilter('Description', '', 'IS NOT NULL')
+							.addFilter('IDOffice', [10, 11, 15, 18, 22], 'IN');
+						tmpQuery.setLogLevel(3).addSort('Age');
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/LiteExtended/Name,Age,Cost/FilteredTo/FBV~Age~EQ~25~FOP~0~(~0~FBV~Color~EQ~Red~FBVOR~Color~EQ~Green~FCP~0~)~0~FBV~Description~NN~0~FBV~IDOffice~INN~10,11,15,18,22~FSF~Age~ASC~0/0/100');
+					}
+				);
+				test
+				(
+					'Update Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.addRecord({Age:15,Color:'Brown'});
+
+						// Build the query
+						tmpQuery.buildUpdateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Update Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal');
+					}
+				);
+				test
+				(
+					'Bad Update Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints');
+
+						// Build the query
+						tmpQuery.buildUpdateQuery();
+						tmpQuery.addRecord({});
+						tmpQuery.buildUpdateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Update Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal(false);
+					}
+				);
+				test
+				(
+					'Delete Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildDeleteQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Delete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/10');
+					}
+				);
+				test
+				(
+					'Count Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal');
+
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Count Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/Count');
+					}
+				);
+			}
+		);
+
+		suite
+		(
+			'Complex Query Generation - Schemas',
+			function()
+			{
+				test
+				(
+					'Create Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setLogLevel(5)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.addRecord(
+							{
+								IDAnimal:false,
+								GUIDAnimal:false,
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Deleted:false,
+								DeletingIDUser:false,
+								DeleteDate:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildCreateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Create Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal("Animal");
+					}
+				);
+				test
+				(
+					'Create Query -- with GUID specified',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setLogLevel(5)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.addRecord(
+							{
+								IDAnimal:false,
+								GUIDAnimal:'0xabcdef',
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Deleted:false,
+								DeletingIDUser:false,
+								DeleteDate:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildCreateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Create Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal("Animal");
+					}
+				);
+				test
+				(
+					'Create Query - with AutoIdentity disabled',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setLogLevel(5)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setDisableAutoIdentity(true)
+							.setDisableDeleteTracking(true)
+							.setDisableAutoDateStamp(true)
+							.setDisableAutoUserStamp(true)
+							.addRecord(
+							{
+								IDAnimal:false,
+								GUIDAnimal:false,
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Deleted:false,
+								DeletingIDUser:false,
+								DeleteDate:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildCreateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Create Query (AutoIdentity disabled)', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal("Animal/WithFlags/DisableAutoDateStamp,DisableDeleteTracking,DisableAutoIdentity,DisableAutoUserStamp");
+					}
+				);
+				test
+				(
+					'Complex Read Query 2, verify checking Deleted bit with no filters',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(100);
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/LiteExtended/Name,Age,Cost/0/100');
+					}
+				);
+				test
+				(
+					'Complex Read Query 2, manually checking Deleted bit with Schema that has one',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(100)
+							.addFilter('Age', '25')
+							.addFilter('', '', '(')
+							.addFilter('Color', 'Red')
+							.addFilter('Color', 'Green', '=', 'OR')
+							.addFilter('', '', ')')
+							.addFilter('Description', '', 'IS NOT NULL')
+							.addFilter('IDOffice', [10, 11, 15, 18, 22], 'IN')
+							.addFilter('Deleted', '1');
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/LiteExtended/Name,Age,Cost/FilteredTo/FBV~Age~EQ~25~FOP~0~(~0~FBV~Color~EQ~Red~FBVOR~Color~EQ~Green~FCP~0~)~0~FBV~Description~NN~0~FBV~IDOffice~INN~10,11,15,18,22~FBV~Deleted~EQ~1/0/100');
+					}
+				);
+				test
+				(
+					'Complex Read Query 2, delete tracking disabled',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.setDisableDeleteTracking(true)
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(100);
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animals/LiteExtended/Name,Age,Cost/FilteredTo/FBV~Deleted~GE~0/0/100');
+					}
+				);
+				test
+				(
+					'Delete Query with Filters',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setScope('Animal')
+							.addFilter('IDAnimal', 10);
+						//Perform delete with no record specified, but has a Deleted bit in the schema
+
+						//Use a schema that already defines a deleted bit
+						tmpQuery.query.schema = _AnimalSchema;
+
+						// Build the query
+						tmpQuery.buildDeleteQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Delete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/10');
+					}
+				);
+				test
+				(
+					'Update Query -- without Deleted',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.addRecord({
+								IDAnimal:82,
+								GUIDAnimal:'1111-2222-3333-4444-5555-6666-7777',
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchemaWithoutDeleted;
+						// Build the query
+						tmpQuery.buildUpdateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Update Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal');
+					}
+				);
+				test
+				(
+					'Update Query -- without Deleted, UpdateDate and UpdatingIDUser',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.setDisableAutoUserStamp(true)
+							.setDisableAutoDateStamp(true)
+							.addRecord({
+								IDAnimal:82,
+								GUIDAnimal:'1111-2222-3333-4444-5555-6666-7777',
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchemaWithoutDeleted;
+						// Build the query
+						tmpQuery.buildUpdateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Update Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/WithFlags/DisableAutoDateStamp,DisableAutoUserStamp');
+					}
+				);
+				test
+				(
+					'Delete Query -- without Deleted',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.addFilter('IDAnimal', 9);
+						tmpQuery.query.schema = _AnimalSchemaWithoutDeleted;
+						// Build the query
+						tmpQuery.buildDeleteQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Delete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/9');
+					}
+				);
+				test
+				(
+					'Update Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.addFilter('Deleted', 0) //cover case where this can be overridden instead of automatically added
+							.addRecord({
+								IDAnimal:82,
+								GUIDAnimal:'1111-2222-3333-4444-5555-6666-7777',
+								CreateDate:false,
+								CreatingIDUser:false,
+								UpdateDate:false,
+								UpdatingIDUser:false,
+								Deleted:false,
+								DeletingIDUser:false,
+								DeleteDate:false,
+								Name:'Froo Froo',
+								Age:18
+							});
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildUpdateQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Update Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal');
+					}
+				);
+				test
+				(
+					'Delete Query',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.addFilter('IDAnimal', 9);
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildDeleteQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Delete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/9');
+					}
+				);
+				test
+				(
+					'Delete Query with Delete Tracking Disabled',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MeadowEndpoints')
+							.setLogLevel(5)
+							.setScope('Animal')
+							.setDisableDeleteTracking(true)
+							.addFilter('IDAnimal', 9);
+						tmpQuery.query.schema = _AnimalSchema;
+						// Build the query
+						tmpQuery.buildDeleteQuery();
+						// This is the query generated by the MeadowEndpoints dialect
+						libFable.log.trace('Delete Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('Animal/9');
+					}
+				);
+			}
+		);
+	}
+);

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -333,13 +333,32 @@ suite
 						// This is the query generated by the MySQL dialect
 						libFable.log.trace('Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT( `Animal`.*) AS RowCount FROM `Animal`;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM `Animal`;');
 					}
 				);
 				test
 				(
 					'Count Distinct Query',
 					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MySQL')
+							.setScope('Animal');
+						tmpQuery.setDistinct(true);
+						tmpQuery.query.schema = _AnimalSchema;
+
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// This is the query generated by the MySQL dialect
+						libFable.log.trace('Count Distinct Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT COUNT(DISTINCT `Animal`.`IDAnimal`, `Animal`.`GUIDAnimal`, `Animal`.`CreateDate`, `Animal`.`CreatingIDUser`, `Animal`.`UpdateDate`, `Animal`.`UpdatingIDUser`, `Animal`.`Deleted`, `Animal`.`DeletingIDUser`, `Animal`.`DeleteDate`) AS RowCount FROM `Animal` WHERE  `Animal`.Deleted = :Deleted_w0;');
+					}
+				);
+				test
+				(
+					'Count Distinct Query without Schema',
+					function()
 					{
 						var tmpQuery = libFoxHound.new(libFable)
 							.setDialect('MySQL')
@@ -351,7 +370,7 @@ suite
 						// This is the query generated by the MySQL dialect
 						libFable.log.trace('Count Distinct Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(DISTINCT `Animal`.*) AS RowCount FROM `Animal`;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM `Animal`;');
 					}
 				);
 				test