foxhound 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foxhound",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A Database Query generation library.",
   "main": "source/FoxHound.js",
   "scripts": {
@@ -58,7 +58,6 @@
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
-    "fable": "^3.0.2",
-    "underscore": "1.13.6"
+    "fable": "^3.0.4"
   }
 }

package/source/FoxHound.js

@@ -1,24 +1,12 @@
 /**
 * FoxHound Query Generation Library
-*
 * @license MIT
-*
 * @author Steven Velozo <steven@velozo.com>
-* @module FoxHound
 */
 
-// We use Underscore.js for utility
-var libUnderscore = require('underscore');
-
 // Load our base parameters skeleton object
-var baseParameters = require('./Parameters.js');
+const baseParameters = require('./Parameters.js');
 
-/**
-* FoxHound Query Generation Library Main Class
-*
-* @class FoxHound
-* @constructor
-*/
 var FoxHound = function()
 {
 	function createNew(pFable, pFromParameters)
@@ -39,6 +27,8 @@ var FoxHound = function()
 		// piece of internal state that is important to operation.
 		var _Parameters = false;
 
+		var _Dialects = require('./Foxhound-Dialects.js');
+
 		// The unique identifier for a query
 		var _UUID = _Fable.getUUID();
 
@@ -93,7 +83,7 @@ var FoxHound = function()
 		*/
 		var resetParameters = function()
 		{
-			_Parameters = libUnderscore.extend({}, baseParameters, _DefaultParameters);
+			_Parameters = _Fable.Utility.extend({}, baseParameters, _DefaultParameters);
 			_Parameters.query = ({
 				disableAutoIdentity: false,
 				disableAutoDateStamp: false,
@@ -127,7 +117,7 @@ var FoxHound = function()
 		*/
 		var mergeParameters = function(pFromParameters)
 		{
-			_Parameters = libUnderscore.extend({}, _Parameters, pFromParameters);
+			_Parameters = _Fable.Utility.extend({}, _Parameters, pFromParameters);
 			return this;
 		};
 
@@ -644,26 +634,24 @@ var FoxHound = function()
 		*/
 		var setDialect = function(pDialectName)
 		{
+
 			if (typeof(pDialectName) !== 'string')
 			{
 				_Fable.log.warn('Dialect set to English - invalid name', {queryUUID:_UUID, parameters:_Parameters, invalidDialect:pDialectName});
 				return setDialect('English');
 			}
 
-			var tmpDialectModuleFile = './dialects/'+pDialectName+'/FoxHound-Dialect-'+pDialectName+'.js';
-
-			try
+			if (_Dialects.hasOwnProperty(pDialectName))
 			{
-				var tmpDialectModule = require(tmpDialectModuleFile);
-				_Dialect = tmpDialectModule;
+				_Dialect = _Dialects[pDialectName](_Fable);
 				if (_LogLevel > 2)
 				{
-					_Fable.log.info('Dialog set to: '+pDialectName, {queryUUID:_UUID, parameters:_Parameters, dialectModuleFile:tmpDialectModuleFile});
+					_Fable.log.info('Dialog set to: '+pDialectName, {queryUUID:_UUID, parameters:_Parameters});
 				}
 			}
-			catch (pError)
+			else
 			{
-				_Fable.log.error('Dialect not set - require load problem', {queryUUID:_UUID, parameters:_Parameters, dialectModuleFile:tmpDialectModuleFile, invalidDialect:pDialectName, error:pError});
+				_Fable.log.error('Dialect not set - unknown dialect "'+pDialectName+"'", {queryUUID:_UUID, parameters:_Parameters, invalidDialect:pDialectName});
 				setDialect('English');
 			}
 
@@ -931,4 +919,4 @@ var FoxHound = function()
 	return createNew();
 };
 
-module.exports = new FoxHound();
+module.exports = FoxHound();

package/source/Foxhound-Dialects.js

@@ -0,0 +1,15 @@
+getDialects = () =>
+{
+	let tmpDialects = {};
+
+	tmpDialects.ALASQL = require('./dialects/ALASQL/FoxHound-Dialect-ALASQL.js');
+	tmpDialects.English = require('./dialects/English/FoxHound-Dialect-English.js');
+	tmpDialects.MeadowEndpoints = require('./dialects/MeadowEndpoints/FoxHound-Dialect-MeadowEndpoints.js');
+	tmpDialects.MySQL = require('./dialects/MySQL/FoxHound-Dialect-MySQL.js');
+
+	tmpDialects.default = tmpDialects.English;
+
+	return tmpDialects;
+}
+
+module.exports = getDialects();

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

@@ -15,10 +15,14 @@
 * @author Steven Velozo <steven@velozo.com>
 * @class FoxHoundDialectALASQL
 */
-var libUnderscore = require('underscore');
 
-var FoxHoundDialectALASQL = function()
+var FoxHoundDialectALASQL = function(pFable)
 {
+	//Request time from SQL server with microseconds resolution
+	const SQL_NOW = "NOW(3)";
+
+	_Fable = pFable;
+
 	/**
 	* Generate a table name from the scope.
 	*
@@ -779,7 +783,7 @@ var FoxHoundDialectALASQL = function()
 		{
 			try
 			{
-				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
+				var tmpQueryTemplate = _Fable.Utility.template(pParameters.queryOverride);
 				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
@@ -860,7 +864,7 @@ var FoxHoundDialectALASQL = function()
 		{
 			try
 			{
-				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
+				var tmpQueryTemplate = _Fable.Utility.template(pParameters.queryOverride);
 				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
@@ -898,4 +902,4 @@ var FoxHoundDialectALASQL = function()
 	return tmpDialect;
 };
 
-module.exports = new FoxHoundDialectALASQL();
+module.exports = FoxHoundDialectALASQL;

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

@@ -93,4 +93,4 @@ var FoxHoundDialectEnglish = function()
 	return tmpDialect;
 };
 
-module.exports = new FoxHoundDialectEnglish();
+module.exports = FoxHoundDialectEnglish;

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

@@ -6,7 +6,6 @@
 * @author Steven Velozo <steven@velozo.com>
 * @class FoxHoundDialectMeadowEndpoints
 */
-var libUnderscore = require('underscore');
 
 var FoxHoundDialectMeadowEndpoints = function()
 {
@@ -477,4 +476,4 @@ var FoxHoundDialectMeadowEndpoints = function()
 	return tmpDialect;
 };
 
-module.exports = new FoxHoundDialectMeadowEndpoints();
+module.exports = FoxHoundDialectMeadowEndpoints;

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

@@ -15,13 +15,14 @@
 * @author Steven Velozo <steven@velozo.com>
 * @class FoxHoundDialectMySQL
 */
-var libUnderscore = require('underscore');
 
-var FoxHoundDialectMySQL = function()
+var FoxHoundDialectMySQL = function(pFable)
 {
 	//Request time from SQL server with microseconds resolution
 	const SQL_NOW = "NOW(3)";
 
+	_Fable = pFable;
+
 	/**
 	* Generate a table name from the scope
 	*
@@ -832,7 +833,7 @@ var FoxHoundDialectMySQL = function()
 		{
 			try
 			{
-				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
+				var tmpQueryTemplate = _Fable.Utility.template(pParameters.queryOverride);
 				return tmpQueryTemplate({FieldList:tmpFieldList, TableName:tmpTableName, Where:tmpWhere, Join:tmpJoin, OrderBy:tmpOrderBy, Limit:tmpLimit, Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
@@ -917,7 +918,7 @@ var FoxHoundDialectMySQL = function()
 		{
 			try
 			{
-				var tmpQueryTemplate = libUnderscore.template(pParameters.queryOverride);
+				var tmpQueryTemplate = _Fable.Utility.template(pParameters.queryOverride);
 				return tmpQueryTemplate({FieldList:[], TableName:tmpTableName, Where:tmpWhere, OrderBy:'', Limit:'', Distinct: tmpOptDistinct, _Params: pParameters});
 			}
 			catch (pError)
@@ -955,4 +956,4 @@ var FoxHoundDialectMySQL = function()
 	return tmpDialect;
 };
 
-module.exports = new FoxHoundDialectMySQL();
+module.exports = FoxHoundDialectMySQL;