foxhound 1.0.41 → 1.0.43

package/package.json

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

package/source/FoxHound.js

@@ -863,6 +863,19 @@ var FoxHound = function()
 				enumerable: true
 			});
 
+		/**
+		 * Query
+		 *
+		 * @property query
+		 * @type Object
+		 */
+		Object.defineProperty(tmpNewFoxHoundObject, 'indexHints',
+			{
+				get: function() { return _Parameters.indexHints; },
+				set: function(pHints) { _Parameters.indexHints = pHints; },
+				enumerable: true,
+			});
+
 		/**
 		 * Result
 		 *

package/source/Parameters.js

@@ -78,7 +78,12 @@ var FoxHoundQueryParameters = (
 				parameters: {}
 			}
 		*/
-		
+
+		indexHints: false,
+		/*
+			['IndexName1', 'IndexName2'] // A list of index names to hint to the underlying provider, if supported
+		 */
+
 		// Who is making the query
 		userID: 0,
 
@@ -93,4 +98,4 @@ var FoxHoundQueryParameters = (
 		*/
 });
 
-module.exports = FoxHoundQueryParameters;
+module.exports = FoxHoundQueryParameters;

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

@@ -113,12 +113,21 @@ var FoxHoundDialectMySQL = function()
 		let pFieldNames = pFieldName.split('.');
 		if (pFieldNames.length > 1)
 		{
-			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleanseQuoting(pFieldNames[1]) + "`";
+			const cleansedFieldName = cleanseQuoting(pFieldNames[1]);
+			if (cleansedFieldName === '*')
+			{
+				// do not put * as `*`
+				return "`" + cleanseQuoting(pFieldNames[0]) + "`.*";
+			}
+			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleansedFieldName + "`";
 		}
-		else
+		const cleansedFieldName = cleanseQuoting(pFieldNames[0]);
+		if (cleansedFieldName === '*')
 		{
-			return "`" + cleanseQuoting(pFieldNames[0]) + "`";
+			// do not put * as `*`
+			return '*';
 		}
+		return "`" + cleanseQuoting(pFieldNames[0]) + "`";
 	}
 
 	/**
@@ -286,7 +295,7 @@ var FoxHoundDialectMySQL = function()
 	*
 	* @method: generateLimit
 	* @param: {Object} pParameters SQL Query Parameters
-	* @return: {String} Returns the table name clause
+	* @return: {String} Returns the table limit clause
 	*/
 	var generateLimit = function(pParameters)
 	{
@@ -307,6 +316,23 @@ var FoxHoundDialectMySQL = function()
 		return tmpLimit;
 	};
 
+	/**
+	* Generate the use index clause
+	*
+	* @method: generateIndexHints
+	* @param: {Object} pParameters SQL Query Parameters
+	* @return: {String} Returns the table limit clause
+	*/
+	var generateIndexHints = function(pParameters)
+	{
+		if (!Array.isArray(pParameters.indexHints) || pParameters.indexHints.length < 1)
+		{
+			return '';
+		}
+
+		return ` USE INDEX (${pParameters.indexHints.join(',')})`;
+	};
+
 	/**
 	* Generate the join clause
 	*
@@ -817,6 +843,7 @@ var FoxHoundDialectMySQL = function()
 		var tmpJoin = generateJoins(pParameters);
 		var tmpOrderBy = generateOrderBy(pParameters);
 		var tmpLimit = generateLimit(pParameters);
+		var tmpIndexHints = generateIndexHints(pParameters);
 		const tmpOptDistinct = pParameters.distinct ? ' DISTINCT' : '';
 
 		if (pParameters.queryOverride)
@@ -824,7 +851,7 @@ var FoxHoundDialectMySQL = function()
 			try
 			{
 				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
-				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, Join:tmpJoin, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct, _Params: pParameters});
+				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, Join:tmpJoin, OrderBy:tmpOrderBy, Limit:tmpLimit, IndexHints: tmpIndexHints, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{
@@ -834,7 +861,7 @@ var FoxHoundDialectMySQL = function()
 			}
 		}
 
-		return `SELECT${tmpOptDistinct}${tmpFieldList} FROM${tmpTableName}${tmpJoin}${tmpWhere}${tmpOrderBy}${tmpLimit};`;
+		return `SELECT${tmpOptDistinct}${tmpFieldList} FROM${tmpTableName}${tmpIndexHints}${tmpJoin}${tmpWhere}${tmpOrderBy}${tmpLimit};`;
 	};
 
 	var Update = function(pParameters)
@@ -897,6 +924,7 @@ var FoxHoundDialectMySQL = function()
 		var tmpTableName = generateTableName(pParameters);
 		var tmpJoin = generateJoins(pParameters);
 		var tmpWhere = generateWhere(pParameters);
+		var tmpIndexHints = generateIndexHints(pParameters);
 		// here, we ignore the distinct keyword if no fields have been specified and
 		if (pParameters.distinct && tmpFieldList.length < 1)
 		{
@@ -909,7 +937,7 @@ var FoxHoundDialectMySQL = function()
 			try
 			{
 				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
-				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct, _Params: pParameters});
+				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', IndexHints: tmpIndexHints, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{
@@ -919,7 +947,7 @@ var FoxHoundDialectMySQL = function()
 			}
 		}
 
-		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS RowCount FROM${tmpTableName}${tmpJoin}${tmpWhere};`;
+		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS RowCount FROM${tmpTableName}${tmpIndexHints}${tmpJoin}${tmpWhere};`;
 	};
 
 	var tmpDialect = ({

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -123,6 +123,22 @@ suite
 					}
 				);
 				test
+				(
+					'Read Query with Index Hints',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable).setDialect('MySQL').setScope('Animal');
+						tmpQuery.addSort({Column:'Cost',Direction:'Descending'});
+						tmpQuery.indexHints = ['AnimalIndex_1', 'AnimalIndex_2'];
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the MySQL dialect
+						libFable.log.trace('Simple Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT `Animal`.* FROM `Animal` USE INDEX (AnimalIndex_1,AnimalIndex_2) ORDER BY Cost DESC;');
+					}
+				);
+				test
 				(
 					'Read Query with Distinct',
 					function()
@@ -161,6 +177,28 @@ suite
 					}
 				);
 				test
+				(
+					'Complex Read Query with qualified and unqualified "SELECT *" cases',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MySQL')
+							.setScope('Animal')
+							.setCap(10)
+							.setBegin(0)
+							.setDataElements(['*', 'Name', 'Age', 'Cost', 'Animal.*'])
+							.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 MySQL dialect
+						libFable.log.trace('Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT *, `Name`, `Age`, `Cost`, `Animal`.* FROM `Animal` WHERE Age = :Age_w0 ORDER BY Age, Cost LIMIT 0, 10;');
+					}
+				);
+				test
 				(
 					'Complex Read Query 2',
 					function()
@@ -221,14 +259,15 @@ suite
 							.setDataElements(['Name', 'Age', 'Cost'])
 							.setSort([{Column:'Age',Direction:'Ascending'},{Column:'Cost',Direction:'Descending'}])
 							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						tmpQuery.indexHints = ['AnimalIndex_1', 'AnimalIndex_2'];
 						tmpQuery.parameters.CustomFields = 'Name, Age * 5, Cost';
-						tmpQuery.parameters.queryOverride = 'SELECT <%= _Params.CustomFields %> FROM <%= TableName %> <%= Where %> <%= Limit %>;';
+						tmpQuery.parameters.queryOverride = 'SELECT <%= _Params.CustomFields %> FROM <%= TableName %><%= IndexHints %> <%= Where %> <%= Limit %>;';
 						// Build the query
 						tmpQuery.buildReadQuery();
 						// This is the query generated by the MySQL dialect
 						libFable.log.trace('Custom Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT Name, Age * 5, Cost FROM  `Animal`  WHERE Age = :Age_w0  LIMIT 0, 10;');
+							.to.equal('SELECT Name, Age * 5, Cost FROM  `Animal` USE INDEX (AnimalIndex_1,AnimalIndex_2)  WHERE Age = :Age_w0  LIMIT 0, 10;');
 					}
 				);
 				test
@@ -280,13 +319,14 @@ suite
 							.setDialect('MySQL')
 							.setScope('Animal')
 							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
-						tmpQuery.parameters.queryOverride = 'SELECT COUNT(*) AS RowCount FROM <%= TableName %> <%= Where %>;';
+						tmpQuery.indexHints = ['AnimalIndex_1', 'AnimalIndex_2'];
+						tmpQuery.parameters.queryOverride = 'SELECT COUNT(*) AS RowCount FROM <%= TableName %><%= IndexHints %> <%= Where %>;';
 						// Build the query
 						tmpQuery.buildCountQuery();
 						// This is the query generated by the MySQL dialect
 						libFable.log.trace('Custom Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(*) AS RowCount FROM  `Animal`  WHERE Age = :Age_w0;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM  `Animal` USE INDEX (AnimalIndex_1,AnimalIndex_2)  WHERE Age = :Age_w0;');
 					}
 				);
 				test