foxhound 1.0.39 → 1.0.42

package/package.json

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

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

@@ -780,7 +780,7 @@ var FoxHoundDialectALASQL = function()
 			try
 			{
 				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
-				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct});
+				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{
@@ -828,7 +828,7 @@ var FoxHoundDialectALASQL = function()
 	{
 		var tmpTableName = generateTableName(pParameters);
 		let tmpDeleteTrackingState = pParameters.query.disableDeleteTracking;
-		pParameters.query.disableDeleteTracking = false;
+		pParameters.query.disableDeleteTracking = true;
 		var tmpWhere = generateWhere(pParameters);
 		var tmpUpdateUndeleteSetters = generateUpdateUndeleteSetters(pParameters);
 		pParameters.query.disableDeleteTracking = tmpDeleteTrackingState;
@@ -861,7 +861,7 @@ var FoxHoundDialectALASQL = function()
 			try
 			{
 				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
-				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct});
+				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{

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]) + "`";
 	}
 
 	/**
@@ -452,7 +461,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 +472,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,28 +500,28 @@ 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
 	*
@@ -824,7 +833,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});
+				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, Join:tmpJoin, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{
@@ -873,7 +882,7 @@ var FoxHoundDialectMySQL = function()
 		var tmpTableName = generateTableName(pParameters);
 		// TODO: Fix these
 		let tmpDeleteTrackingState = pParameters.query.disableDeleteTracking;
-		pParameters.query.disableDeleteTracking = false;
+		pParameters.query.disableDeleteTracking = true;
 		var tmpWhere = generateWhere(pParameters);
 		var tmpUpdateUndeleteSetters = generateUpdateUndeleteSetters(pParameters);
 		pParameters.query.disableDeleteTracking = tmpDeleteTrackingState;
@@ -909,7 +918,7 @@ var FoxHoundDialectMySQL = function()
 			try
 			{
 				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
-				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct});
+				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
 			{

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -232,6 +232,29 @@ suite
 					}
 				);
 				test
+				(
+					'Custom Read Query with Custom Parameters',
+					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'});
+						tmpQuery.parameters.CustomFields = '`Name`, `Age` * 5, `Cost`';
+						tmpQuery.parameters.queryOverride = 'SELECT <%= _Params.CustomFields %> FROM <%= TableName %> <%= Where %> <%= Limit %>;';
+						// Build the query
+						tmpQuery.buildReadQuery();
+						// This is the query generated by the ALASQL 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 10 FETCH 0;');
+					}
+				);
+				test
 				(
 					'Bad Custom Read Query',
 					function()
@@ -290,6 +313,25 @@ suite
 					}
 				);
 				test
+				(
+					'Custom Count Query with Custom Parameters',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('ALASQL')
+							.setScope('Animal')
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						tmpQuery.parameters.CountAlias = 'RowCount';
+						tmpQuery.parameters.queryOverride = 'SELECT COUNT(*) AS <%= _Params.CountAlias %> 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(*) AS RowCount FROM  Animal  WHERE `Age` = :Age_w0;');
+					}
+				);
+				test
 				(
 					'Count Query with Field Overrides',
 					function()
@@ -675,7 +717,7 @@ suite
 						// 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;');
+							.to.equal('UPDATE Animal SET `UpdateDate` = NOW(), `UpdatingIDUser` = :UpdatingIDUser_1, `Deleted` = 0 WHERE `IDAnimal` = :IDAnimal_w0;');
 					}
 				);
 				test

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -161,6 +161,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()
@@ -209,6 +231,29 @@ suite
 					}
 				);
 				test
+				(
+					'Custom Read Query with Custom Parameters',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MySQL')
+							.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'});
+						tmpQuery.parameters.CustomFields = 'Name, Age * 5, Cost';
+						tmpQuery.parameters.queryOverride = 'SELECT <%= _Params.CustomFields %> FROM <%= TableName %> <%= 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;');
+					}
+				);
+				test
 				(
 					'Bad Custom Read Query',
 					function()
@@ -267,6 +312,25 @@ suite
 					}
 				);
 				test
+				(
+					'Custom Count Query with Custom Parameters',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(libFable)
+							.setDialect('MySQL')
+							.setScope('Animal')
+							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
+						tmpQuery.parameters.CountAlias = 'RowCount';
+						tmpQuery.parameters.queryOverride = 'SELECT COUNT(*) AS <%= _Params.CountAlias %> FROM <%= TableName %> <%= 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;');
+					}
+				);
+				test
 				(
 					'Update Query',
 					function()
@@ -789,7 +853,7 @@ suite
 						// 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;');
+							.to.equal('UPDATE `Animal` SET UpdateDate = NOW(3), UpdatingIDUser = :UpdatingIDUser_1, Deleted = 0 WHERE IDAnimal = :IDAnimal_w0;');
 					}
 				);
 				test