foxhound 2.0.24 → 2.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foxhound",
-    "version": "2.0.24",
+    "version": "2.0.26",
     "description": "A Database Query generation library.",
     "main": "source/FoxHound.js",
     "scripts": {
@@ -48,7 +48,7 @@
     },
     "homepage": "https://github.com/stevenvelozo/foxhound",
     "devDependencies": {
-        "quackage": "^1.0.62"
+        "quackage": "^1.0.63"
     },
     "dependencies": {
         "fable": "^3.1.63",

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

@@ -352,12 +352,6 @@ var FoxHoundDialectALASQL = function(pFable)
 				}
 			}
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				// This is ignored if flag is set
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -382,8 +376,16 @@ var FoxHoundDialectALASQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					// This is an autoidentity, so we don't parameterize it and just pass in NULL
-					tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = NOW()';
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
+						tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = :'+tmpColumnParameter;
+						pParameters.query.parameters[tmpColumnParameter] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = NOW()';
+					}
 					break;
 				case 'UpdateIDUser':
 					// This is the user ID, which we hope is in the query.

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

@@ -489,11 +489,6 @@ var FoxHoundDialectDGraph = function(pFable)
 		{
 			var tmpSchemaEntry = findSchemaEntry(tmpColumn, tmpSchema);
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -513,7 +508,14 @@ var FoxHoundDialectDGraph = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					tmpUpdateDoc[tmpColumn] = '$$NOW';
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						tmpUpdateDoc[tmpColumn] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdateDoc[tmpColumn] = '$$NOW';
+					}
 					break;
 				case 'UpdateIDUser':
 					tmpUpdateDoc[tmpColumn] = pParameters.query.IDUser;

package/source/dialects/MicrosoftSQL/FoxHound-Dialect-MSSQL.js

@@ -554,17 +554,19 @@ var FoxHoundDialectMSSQL = function(pFable)
 					break;
 				case 'JSON':
 					var tmpJSONUpdateParam = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpJSONUpdateParam;
+					tmpUpdate += ' ['+tmpColumn+'] = @'+tmpJSONUpdateParam;
 					pParameters.query.parameters[tmpJSONUpdateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
+					generateMSSQLParameterTypeEntry(pParameters, tmpJSONUpdateParam, {Type:'String'});
 					break;
 				case 'JSONProxy':
 					var tmpProxyUpdateParam = tmpSchemaEntry.StorageColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpSchemaEntry.StorageColumn+' = :'+tmpProxyUpdateParam;
+					tmpUpdate += ' ['+tmpSchemaEntry.StorageColumn+'] = @'+tmpProxyUpdateParam;
 					pParameters.query.parameters[tmpProxyUpdateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
+					generateMSSQLParameterTypeEntry(pParameters, tmpProxyUpdateParam, {Type:'String'});
 					break;
 				default:
 					var tmpColumnDefaultParameter = tmpColumn+'_'+tmpCurrentColumn;
@@ -867,17 +869,19 @@ var FoxHoundDialectMSSQL = function(pFable)
 					break;
 				case 'JSON':
 					var tmpJSONCreateParam = tmpColumn+'_'+tmpCurrentColumn;
-					tmpCreateSet += ' :'+tmpJSONCreateParam;
+					tmpCreateSet += ' @'+tmpJSONCreateParam;
 					pParameters.query.parameters[tmpJSONCreateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
+					generateMSSQLParameterTypeEntry(pParameters, tmpJSONCreateParam, {Type:'String'});
 					break;
 				case 'JSONProxy':
 					var tmpProxyCreateParam = tmpColumn+'_'+tmpCurrentColumn;
-					tmpCreateSet += ' :'+tmpProxyCreateParam;
+					tmpCreateSet += ' @'+tmpProxyCreateParam;
 					pParameters.query.parameters[tmpProxyCreateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
+					generateMSSQLParameterTypeEntry(pParameters, tmpProxyCreateParam, {Type:'String'});
 					break;
 				default:
 					buildDefaultDefinition();
@@ -955,14 +959,14 @@ var FoxHoundDialectMSSQL = function(pFable)
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpColumn;
+					tmpCreateSet += ' ['+tmpColumn+']';
 					break;
 				case 'JSONProxy':
 					if (tmpCreateSet != '')
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpSchemaEntry.StorageColumn;
+					tmpCreateSet += ' ['+tmpSchemaEntry.StorageColumn+']';
 					break;
 				default:
 					if (tmpCreateSet != '')

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

@@ -492,11 +492,6 @@ var FoxHoundDialectMongoDB = function(pFable)
 		{
 			var tmpSchemaEntry = findSchemaEntry(tmpColumn, tmpSchema);
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -516,7 +511,14 @@ var FoxHoundDialectMongoDB = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					tmpUpdateDoc[tmpColumn] = '$$NOW';
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						tmpUpdateDoc[tmpColumn] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdateDoc[tmpColumn] = '$$NOW';
+					}
 					break;
 				case 'UpdateIDUser':
 					tmpUpdateDoc[tmpColumn] = pParameters.query.IDUser;

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

@@ -434,12 +434,6 @@ var FoxHoundDialectMySQL = function(pFable)
 				}
 			}
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				// This is ignored if flag is set
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -464,8 +458,17 @@ var FoxHoundDialectMySQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					// This is an autoidentity, so we don't parameterize it and just pass in NULL
-					tmpUpdate += ' '+tmpColumn+' = ' + SQL_NOW;
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						// Manual mode: use the record's value as-is
+						var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
+						tmpUpdate += ' '+tmpColumn+' = :'+tmpColumnParameter;
+						pParameters.query.parameters[tmpColumnParameter] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdate += ' '+tmpColumn+' = ' + SQL_NOW;
+					}
 					break;
 				case 'UpdateIDUser':
 					// This is the user ID, which we hope is in the query.

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

@@ -398,11 +398,6 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 				}
 			}
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -425,7 +420,16 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = ' + SQL_NOW;
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
+						tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = :'+tmpColumnParameter;
+						pParameters.query.parameters[tmpColumnParameter] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = ' + SQL_NOW;
+					}
 					break;
 				case 'UpdateIDUser':
 					var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
@@ -434,14 +438,14 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 					break;
 				case 'JSON':
 					var tmpJSONUpdateParam = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpJSONUpdateParam;
+					tmpUpdate += ' '+generateSafeFieldName(tmpColumn)+' = :'+tmpJSONUpdateParam;
 					pParameters.query.parameters[tmpJSONUpdateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
 					break;
 				case 'JSONProxy':
 					var tmpProxyUpdateParam = tmpSchemaEntry.StorageColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpSchemaEntry.StorageColumn+' = :'+tmpProxyUpdateParam;
+					tmpUpdate += ' '+generateSafeFieldName(tmpSchemaEntry.StorageColumn)+' = :'+tmpProxyUpdateParam;
 					pParameters.query.parameters[tmpProxyUpdateParam] = (typeof tmpRecords[0][tmpColumn] === 'string')
 						? tmpRecords[0][tmpColumn]
 						: JSON.stringify(tmpRecords[0][tmpColumn] || {});
@@ -768,14 +772,14 @@ var FoxHoundDialectPostgreSQL = function(pFable)
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpColumn;
+					tmpCreateSet += ' '+generateSafeFieldName(tmpColumn);
 					break;
 				case 'JSONProxy':
 					if (tmpCreateSet != '')
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpSchemaEntry.StorageColumn;
+					tmpCreateSet += ' '+generateSafeFieldName(tmpSchemaEntry.StorageColumn);
 					break;
 				default:
 					if (tmpCreateSet != '')

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

@@ -380,12 +380,6 @@ var FoxHoundDialectSQLite = function(pFable)
 				}
 			}
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				// This is ignored if flag is set
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -410,8 +404,17 @@ var FoxHoundDialectSQLite = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					// This is an autoidentity, so we don't parameterize it and just pass in NULL
-					tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = NOW()';
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						// Manual mode: use the record's value as-is
+						var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
+						tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = :'+tmpColumnParameter;
+						pParameters.query.parameters[tmpColumnParameter] = tmpRecords[0][tmpColumn];
+					}
+					else
+					{
+						tmpUpdate += ' '+escapeColumn(tmpColumn, pParameters)+' = NOW()';
+					}
 					break;
 				case 'UpdateIDUser':
 					// This is the user ID, which we hope is in the query.

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

@@ -461,11 +461,6 @@ var FoxHoundDialectSolr = function(pFable)
 		{
 			var tmpSchemaEntry = findSchemaEntry(tmpColumn, tmpSchema);
 
-			if (pParameters.query.disableAutoDateStamp &&
-				tmpSchemaEntry.Type === 'UpdateDate')
-			{
-				continue;
-			}
 			if (pParameters.query.disableAutoUserStamp &&
 				tmpSchemaEntry.Type === 'UpdateIDUser')
 			{
@@ -485,7 +480,14 @@ var FoxHoundDialectSolr = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'UpdateDate':
-					tmpUpdateDoc[tmpColumn] = { 'set': '$$NOW' };
+					if (pParameters.query.disableAutoDateStamp)
+					{
+						tmpUpdateDoc[tmpColumn] = { 'set': tmpRecords[0][tmpColumn] };
+					}
+					else
+					{
+						tmpUpdateDoc[tmpColumn] = { 'set': '$$NOW' };
+					}
 					break;
 				case 'UpdateIDUser':
 					tmpUpdateDoc[tmpColumn] = { 'set': pParameters.query.IDUser };

package/test/FoxHound-Dialect-ALASQL_tests.js

@@ -792,8 +792,10 @@ suite
 						tmpQuery.buildUpdateQuery();
 						// This is the query generated by the ALASQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
+						// When disableAutoDateStamp is true, UpdateDate is included with the
+						// record's value instead of being auto-stamped with NOW()
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE Animal SET `GUIDAnimal` = :GUIDAnimal_0, `Name` = :Name_1, `Age` = :Age_2 WHERE `IDAnimal` = :IDAnimal_w0;');
+							.to.equal('UPDATE Animal SET `GUIDAnimal` = :GUIDAnimal_0, `UpdateDate` = :UpdateDate_1, `Name` = :Name_2, `Age` = :Age_3 WHERE `IDAnimal` = :IDAnimal_w0;');
 					}
 				);
 				test

package/test/FoxHound-Dialect-MySQL_tests.js

@@ -752,8 +752,10 @@ suite
 						tmpQuery.buildUpdateQuery();
 						// This is the query generated by the MySQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
+						// When disableAutoDateStamp is true, UpdateDate is included with the
+						// record's value instead of being auto-stamped with NOW()
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET GUIDAnimal = :GUIDAnimal_0, Name = :Name_1, Age = :Age_2 WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('UPDATE `Animal` SET GUIDAnimal = :GUIDAnimal_0, UpdateDate = :UpdateDate_1, Name = :Name_2, Age = :Age_3 WHERE IDAnimal = :IDAnimal_w0;');
 					}
 				);
 				test

package/test/FoxHound-Dialect-SQLite_tests.js

@@ -792,8 +792,10 @@ suite
 						tmpQuery.buildUpdateQuery();
 						// This is the query generated by the SQLite dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
+						// When disableAutoDateStamp is true, UpdateDate is included with the
+						// record's value instead of being auto-stamped with NOW()
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE Animal SET `GUIDAnimal` = :GUIDAnimal_0, `Name` = :Name_1, `Age` = :Age_2 WHERE `IDAnimal` = :IDAnimal_w0;');
+							.to.equal('UPDATE Animal SET `GUIDAnimal` = :GUIDAnimal_0, `UpdateDate` = :UpdateDate_1, `Name` = :Name_2, `Age` = :Age_3 WHERE `IDAnimal` = :IDAnimal_w0;');
 					}
 				);
 				test