foxhound 1.0.33 → 1.0.34

package/package.json

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

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

@@ -67,14 +67,33 @@ var FoxHoundDialectALASQL = function()
 	 *
 	 * @method: generateFieldList
 	 * @param: {Object} pParameters SQL Query Parameters
-	 * @return: {String} Returns the field list clause
+	 * @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)
+	var generateFieldList = function(pParameters, pIsForCountClause)
 	{
 		var tmpDataElements = pParameters.dataElements;
 		if (!Array.isArray(tmpDataElements) || tmpDataElements.length < 1)
 		{
-			return ' *';
+			if (!pIsForCountClause)
+			{
+				return ' *';
+			}
+			// we need to list all of the table fields explicitly; get them from the schema
+			const tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+			if (tmpSchema.length < 1)
+			{
+				// this means we have no schema; returning an empty string here signals the calling code to handle this case
+				return '';
+			}
+			const idColumn = tmpSchema.find((entry) => entry.Type === 'AutoIdentity');
+			if (!idColumn)
+			{
+				// this means there is no autoincrementing unique ID column; treat as above
+				return '';
+			}
+			return ` ${idColumn.Column}`;
 		}
 
 		var tmpFieldList = ' ';
@@ -740,9 +759,14 @@ var FoxHoundDialectALASQL = function()
 	{
 		var tmpTableName = generateTableName(pParameters);
 		var tmpWhere = generateWhere(pParameters);
-		const tmpOptDistinct = pParameters.distinct ? 'DISTINCT' : '';
-		const tmpCountClause = pParameters.distinct ? `${tmpOptDistinct}${generateFieldList(pParameters)}` : '*';
+		const tmpFieldList = pParameters.distinct ? generateFieldList(pParameters, true) : '*';
 
+		// here, we ignore the distinct keyword if no fields have been 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)
 		{
 			try
@@ -758,7 +782,7 @@ var FoxHoundDialectALASQL = function()
 			}
 		}
 
-		return `SELECT COUNT(${tmpCountClause}) AS RowCount FROM${tmpTableName}${tmpWhere};`;
+		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS RowCount FROM${tmpTableName}${tmpWhere};`;
 	};
 
 	var tmpDialect = ({

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

@@ -44,28 +44,35 @@ var FoxHoundDialectMySQL = function()
 	 *
 	 * @method: generateFieldList
 	 * @param: {Object} pParameters SQL Query Parameters
-	 * @param {Boolean} pExplicitFields (optional) If true, generate explicit fields rather than "TableName.*" (for count distinct).
+	 * @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, pExplicitFields)
+	var generateFieldList = function(pParameters, pIsForCountClause)
 	{
 		var tmpDataElements = pParameters.dataElements;
 		if (!Array.isArray(tmpDataElements) || tmpDataElements.length < 1)
 		{
 			const tmpTableName = generateTableName(pParameters);
-			if (!pExplicitFields)
+			if (!pIsForCountClause)
 			{
 				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)
+			const tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+			if (tmpSchema.length < 1)
 			{
 				// this means we have no schema; returning an empty string here signals the calling code to handle this case
 				return '';
 			}
+			const idColumn = tmpSchema.find((entry) => entry.Type === 'AutoIdentity');
+			if (!idColumn)
+			{
+				// this means there is no autoincrementing unique ID column; treat as above
+				return '';
+			}
+			const qualifiedIDColumn = `${tmpTableName}.${idColumn.Column}`;
+			return ` ${generateSafeFieldName(qualifiedIDColumn)}`;
 		}
 
 		var tmpFieldList = ' ';
@@ -801,7 +808,7 @@ var FoxHoundDialectMySQL = function()
 		var tmpTableName = generateTableName(pParameters);
 		var tmpJoin = generateJoins(pParameters);
 		var tmpWhere = generateWhere(pParameters);
-		// here, we ignore the distinct keyword if no fields have bene specified and
+		// here, we ignore the distinct keyword if no fields have been 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.');

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -347,7 +347,7 @@ suite
 						// 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(*) AS RowCount FROM Animal WHERE `Age` = :Age_w0;');
 					}
 				);
 				test
@@ -420,6 +420,43 @@ suite
 							.to.equal('SELECT COUNT(*) AS RowCount FROM Animal;');
 					}
 				);
+				test
+				(
+					'Count Query with Distinct',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('ALASQL')
+							.setScope('Animal')
+							.setDistinct(true);
+
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// 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;');
+					}
+				);
+				test
+				(
+					'Count Query with Schema and Distinct',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('ALASQL')
+							.setScope('Animal')
+							.setDistinct(true);
+						tmpQuery.query.schema = _AnimalSchema;
+
+						// Build the query
+						tmpQuery.buildCountQuery();
+						// This is the query generated by the ALASQL dialect
+						libFable.log.trace('Count Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT COUNT(DISTINCT IDAnimal) AS RowCount FROM Animal WHERE `Deleted` = :Deleted_w0;');
+					}
+				);
 			}
 		);
 

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -352,7 +352,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`.`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;');
+							.to.equal('SELECT COUNT(DISTINCT `Animal`.`IDAnimal`) AS RowCount FROM `Animal` WHERE  `Animal`.Deleted = :Deleted_w0;');
 					}
 				);
 				test