foxhound 2.0.4 → 2.0.5

package/package.json

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

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

@@ -32,12 +32,92 @@ var FoxHoundDialectMSSQL = function(pFable)
 	*/
 	var generateTableName = function(pParameters)
 	{
-		if (pParameters.scope && pParameters.scope.indexOf('`') >= 0)
-			return ' '+pParameters.scope+'';
-		else
-			return ' `'+pParameters.scope+'`';
+		// Every Foxhound query has a table name; this puts it on here even if there are no columns
+		// Which occurs when you generate a query like SELECT COUNT(*) FROM SomeTable;
+		if (!pParameters.query.hasOwnProperty('parameterTypes'))
+		{
+			pParameters.query.parameterTypes = {};
+		}
+		return ' '+pParameters.scope;
 	};
 
+	var generateMSSQLParameterTypeEntry = function(pParameters, pColumnParameterName, pColumn)
+	{
+		// Lazily create the parameterTypes object if it doesn't exist
+		if (!pParameters.query.hasOwnProperty('parameterTypes'))
+		{
+			pParameters.query.parameterTypes = {};
+		}
+		// Find the column parameter type for our prepared statement
+		let tmpColumnParameterTypeString = 'VarChar';
+		if (typeof(pColumn) == 'object')
+		{
+			// See if it has a type, set the type string
+			tmpColumnParameterTypeString = pColumn.Type;
+		}
+		else if (typeof(pColumn) == 'string')
+		{
+			var tmpSchema = Array.isArray(pParameters.query.schema) ? pParameters.query.schema : [];
+			for (let i = 0; i < tmpSchema.length; i++)
+			{
+				if (tmpSchema[i].Column == pColumn)
+				{
+					tmpColumnParameterTypeString = tmpSchema[i].Type;
+					break;
+				}
+			}
+		}
+		else
+		{
+			_Fable.log.warn(`Meadow MSSQL query attempted to add a parameter type but no valid column schema entry object or column name was passed; parameter name ${pColumnParameterName}.`);
+		}
+
+		if ((tmpColumnParameterTypeString == null) || (tmpColumnParameterTypeString == undefined))
+		{
+			return false;
+		}
+		switch (tmpColumnParameterTypeString)
+		{
+			case 'AutoIdentity':
+			case 'CreateIDUser':
+			case 'UpdateIDUser':
+			case 'DeleteIDUser':
+
+			case 'Integer':
+				pParameters.query.parameterTypes[pColumnParameterName] = 'Int';
+				break;
+
+			case 'Deleted':
+			case 'Boolean':
+				pParameters.query.parameterTypes[pColumnParameterName] = 'TinyInt';
+				break;
+
+			case 'Decimal':
+				pParameters.query.parameterTypes[pColumnParameterName] = 'Decimal';
+				break;
+
+			case 'String':
+			case 'AutoGUID':
+				pParameters.query.parameterTypes[pColumnParameterName] = 'Char';
+				break;
+
+			case 'CreateDate':
+			case 'UpdateDate':
+			case 'DeleteDate':
+
+			case 'DateTime':
+				pParameters.query.parameterTypes[pColumnParameterName] = 'DateTime';
+				break;
+
+			default:
+				// TODO: This might should throw?  It would mean a new type was added to stricture we don't know about.
+				pParameters.query.parameterTypes[pColumnParameterName] = tmpColumnParameterTypeString;
+				return false;
+		}
+
+		return true;
+	}
+
 	/**
 	* Generate a field list from the array of dataElements
 	*
@@ -99,36 +179,12 @@ var FoxHoundDialectMSSQL = function(pFable)
 		return tmpFieldList;
 	};
 
-	const SURROUNDING_QUOTES_AND_WHITESPACE_REGEX = /^[` ]+|[` ]+$/g;
-
-	const cleanseQuoting = (str) =>
-	{
-		return str.replace(SURROUNDING_QUOTES_AND_WHITESPACE_REGEX, '');
-	};
-
 	/**
 	* Ensure a field name is properly escaped.
 	*/
 	var generateSafeFieldName = function(pFieldName)
 	{
-		let pFieldNames = pFieldName.split('.');
-		if (pFieldNames.length > 1)
-		{
-			const cleansedFieldName = cleanseQuoting(pFieldNames[1]);
-			if (cleansedFieldName === '*')
-			{
-				// do not put * as `*`
-				return "`" + cleanseQuoting(pFieldNames[0]) + "`.*";
-			}
-			return "`" + cleanseQuoting(pFieldNames[0]) + "`.`" + cleansedFieldName + "`";
-		}
-		const cleansedFieldName = cleanseQuoting(pFieldNames[0]);
-		if (cleansedFieldName === '*')
-		{
-			// do not put * as `*`
-			return '*';
-		}
-		return "`" + cleanseQuoting(pFieldNames[0]) + "`";
+		return pFieldName;
 	}
 
 	/**
@@ -231,8 +287,10 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
 				// Add the column name, operator and parameter name to the list of where value parenthetical
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' ( :'+tmpColumnParameter+' )';
+				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' ( @'+tmpColumnParameter+' )';
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
+				// Find the column in the schema
+				generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpFilter[i].Parameter)
 			}
 			else if (tmpFilter[i].Operator === 'IS NULL')
 			{
@@ -248,8 +306,9 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				tmpColumnParameter = tmpFilter[i].Parameter+'_w'+i;
 				// Add the column name, operator and parameter name to the list of where value parenthetical
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' :'+tmpColumnParameter;
+				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator+' @'+tmpColumnParameter;
 				pParameters.query.parameters[tmpColumnParameter] = tmpFilter[i].Value;
+				generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpFilter[i].Parameter)
 			}
 		}
 
@@ -305,14 +364,18 @@ var FoxHoundDialectMSSQL = function(pFable)
 			return '';
 		}
 
-		var tmpLimit = ' LIMIT';
+		var tmpLimit = ' OFFSET ';
 		// If there is a begin record, we'll pass that in as well.
 		if (pParameters.begin !== false)
 		{
-			tmpLimit += ' ' + pParameters.begin + ',';
+			tmpLimit += pParameters.begin;
+		}
+		else
+		{
+			tmpLimit += '0';
 		}
 		// Cap is required for a limit clause.
-		tmpLimit += ' ' + pParameters.cap;
+		tmpLimit +=  ` ROWS FETCH NEXT ${pParameters.cap} ROWS ONLY`;
 
 		return tmpLimit;
 	};
@@ -420,16 +483,18 @@ var FoxHoundDialectMSSQL = function(pFable)
 					// This is the user ID, which we hope is in the query.
 					// This is how to deal with a normal column
 					var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpColumnParameter;
+					tmpUpdate += ' '+tmpColumn+' = @'+tmpColumnParameter;
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpColumn)
 					break;
 				default:
 					var tmpColumnDefaultParameter = tmpColumn+'_'+tmpCurrentColumn;
-					tmpUpdate += ' '+tmpColumn+' = :'+tmpColumnDefaultParameter;
+					tmpUpdate += ' '+tmpColumn+' = @'+tmpColumnDefaultParameter;
 
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnDefaultParameter] = tmpRecords[0][tmpColumn];
+					generateMSSQLParameterTypeEntry(pParameters, tmpColumnDefaultParameter, tmpSchemaEntry)
 					break;
 			}
 
@@ -493,9 +558,10 @@ var FoxHoundDialectMSSQL = function(pFable)
 					// This is the user ID, which we hope is in the query.
 					// This is how to deal with a normal column
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = :'+tmpColumnParameter;
+					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = @'+tmpColumnParameter;
 					// Set the query parameter
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 					break;
 				default:
 					//DON'T allow update of other fields in this query
@@ -560,8 +626,9 @@ var FoxHoundDialectMSSQL = function(pFable)
 					break;
 				case 'UpdateIDUser':
 					var tmpColumnParameter = tmpSchemaEntry.Column+'_'+tmpCurrentColumn;
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = :'+tmpColumnParameter;
+					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = @'+tmpColumnParameter;
 					pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+					generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 					break;
 				default:
 					//DON'T allow update of other fields in this query
@@ -646,9 +713,10 @@ var FoxHoundDialectMSSQL = function(pFable)
 			var buildDefaultDefinition = function()
 			{
 				var tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-				tmpCreateSet += ' :'+tmpColumnParameter;
+				tmpCreateSet += ' @'+tmpColumnParameter;
 				// Set the query parameter
 				pParameters.query.parameters[tmpColumnParameter] = tmpRecords[0][tmpColumn];
+				generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 			};
 
 			var tmpColumnParameter;
@@ -681,9 +749,10 @@ var FoxHoundDialectMSSQL = function(pFable)
 					{
 						// This is an autoidentity, so we don't parameterize it and just pass in NULL
 						tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-						tmpCreateSet += ' :'+tmpColumnParameter;
+						tmpCreateSet += ' @'+tmpColumnParameter;
 						// Set the query parameter
 						pParameters.query.parameters[tmpColumnParameter] = pParameters.query.UUID;
+						generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 					}
 					break;
 				case 'UpdateDate':
@@ -711,9 +780,10 @@ var FoxHoundDialectMSSQL = function(pFable)
 						// This is the user ID, which we hope is in the query.
 						// This is how to deal with a normal column
 						tmpColumnParameter = tmpColumn+'_'+tmpCurrentColumn;
-						tmpCreateSet += ' :'+tmpColumnParameter;
+						tmpCreateSet += ' @'+tmpColumnParameter;
 						// Set the query parameter
 						pParameters.query.parameters[tmpColumnParameter] = pParameters.query.IDUser;
+						generateMSSQLParameterTypeEntry(pParameters, tmpColumnParameter, tmpSchemaEntry)
 					}
 					break;
 				default:
@@ -929,7 +999,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			}
 		}
 
-		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS RowCount FROM${tmpTableName}${tmpJoin}${tmpWhere};`;
+		return `SELECT COUNT(${tmpOptDistinct}${tmpFieldList || '*'}) AS Row_Count FROM${tmpTableName}${tmpJoin}${tmpWhere};`;
 	};
 
 	var tmpDialect = ({

package/test/Foxhound-Dialect-MSSQL_tests.js

@@ -24,7 +24,9 @@ var _AnimalSchema = (
 	{ Column: "UpdatingIDUser", Type:"UpdateIDUser" },
 	{ Column: "Deleted",         Type:"Deleted" },
 	{ Column: "DeletingIDUser",  Type:"DeleteIDUser" },
-	{ Column: "DeleteDate",      Type:"DeleteDate" }
+	{ Column: "DeleteDate",      Type:"DeleteDate" },
+	{ Column: "Name",  Type:"String" },
+	{ Column: "Age",      Type:"Integer" }
 ]);
 
 var _AnimalSchemaWithoutDeleted = (
@@ -89,7 +91,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Create Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal("INSERT INTO `Animal` ( IDAnimal, Name, Age) VALUES ( :IDAnimal_0, :Name_1, :Age_2);");
+							.to.equal("INSERT INTO Animal ( IDAnimal, Name, Age) VALUES ( @IDAnimal_0, @Name_1, @Age_2);");
 					}
 				);
 				test
@@ -120,7 +122,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Simple Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Animal`.* FROM `Animal` ORDER BY Cost DESC;');
+							.to.equal('SELECT Animal.* FROM Animal ORDER BY Cost DESC;');
 					}
 				);
 				test
@@ -136,7 +138,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Simple Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT DISTINCT `Animal`.* FROM `Animal` ORDER BY Cost DESC;');
+							.to.equal('SELECT DISTINCT Animal.* FROM Animal ORDER BY Cost DESC;');
 					}
 				);
 				test
@@ -158,8 +160,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` WHERE Age = :Age_w0 ORDER BY Age, Cost LIMIT 0, 10;');
-					}
+							.to.equal('SELECT Name, Age, Cost FROM Animal WHERE Age = @Age_w0 ORDER BY Age, Cost OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -180,8 +181,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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;');
-					}
+							.to.equal('SELECT *, Name, Age, Cost, Animal.* FROM Animal WHERE Age = @Age_w0 ORDER BY Age, Cost OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -200,13 +200,13 @@ suite
 							.addFilter('', '', ')')
 							.addFilter('Description', '', 'IS NOT NULL')
 							.addFilter('IDOffice', [10, 11, 15, 18, 22], 'IN');
-						tmpQuery.setLogLevel(3).addSort('Age');
+						tmpQuery.setLogLevel(0).addSort('Age');
 						// Build the query
 						tmpQuery.buildReadQuery();
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` WHERE Age = :Age_w0 AND ( Color = :Color_w2 OR Color = :Color_w3 ) AND Description IS NOT NULL AND IDOffice IN ( :IDOffice_w6 ) ORDER BY Age LIMIT 100;');
+							.to.equal('SELECT Name, Age, Cost FROM Animal WHERE Age = @Age_w0 AND ( Color = @Color_w2 OR Color = @Color_w3 ) AND Description IS NOT NULL AND IDOffice IN ( @IDOffice_w6 ) ORDER BY Age OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -228,8 +228,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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  WHERE Age = @Age_w0  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -251,8 +250,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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  WHERE Age = @Age_w0  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -309,7 +307,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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  WHERE Age = @Age_w0;');
 					}
 				);
 				test
@@ -328,7 +326,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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  WHERE Age = @Age_w0;');
 					}
 				);
 				test
@@ -347,7 +345,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET Age = :Age_0, Color = :Color_1 WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('UPDATE Animal SET Age = @Age_0, Color = @Color_1 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -381,7 +379,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('DELETE FROM `Animal` WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('DELETE FROM Animal WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -398,7 +396,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Count Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(*) AS RowCount FROM `Animal`;');
+							.to.equal('SELECT COUNT(*) AS Row_Count FROM Animal;');
 					}
 				);
 				test
@@ -417,7 +415,8 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Count Distinct Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(DISTINCT `Animal`.`IDAnimal`) AS RowCount FROM `Animal` WHERE  `Animal`.Deleted = :Deleted_w0;');
+						// RowCount is a reserved word for MSSQL so we need to change it to Row_Count
+							.to.equal('SELECT COUNT(DISTINCT  Animal.IDAnimal) AS Row_Count FROM Animal WHERE  Animal.Deleted = @Deleted_w0;');
 					}
 				);
 				test
@@ -435,7 +434,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Count Distinct Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(*) AS RowCount FROM `Animal`;');
+							.to.equal('SELECT COUNT(*) AS Row_Count FROM Animal;');
 					}
 				);
 				test
@@ -446,7 +445,7 @@ suite
 						var tmpQuery = libFoxHound.new(_Fable)
 							.setDialect('MSSQL')
 							.setScope('Animal')
-							.setDataElements(['Name', 'Age', 'Cost']);
+							.setDataElements(['Name']);
 						tmpQuery.setDistinct(true);
 
 						// Build the query
@@ -454,7 +453,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Count Distinct Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT COUNT(DISTINCT `Name`, `Age`, `Cost`) AS RowCount FROM `Animal`;');
+							.to.equal('SELECT COUNT(DISTINCT Name) AS Row_Count FROM Animal;');
 					}
 				);
 			}
@@ -494,7 +493,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Create Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal("INSERT INTO `Animal` ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( NULL, :GUIDAnimal_1, NOW(3), :CreatingIDUser_3, NOW(3), :UpdatingIDUser_5, :Deleted_6, :Name_7, :Age_8);");
+							.to.equal("INSERT INTO Animal ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( NULL, @GUIDAnimal_1, NOW(3), @CreatingIDUser_3, NOW(3), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -526,7 +525,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Create Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal("INSERT INTO `Animal` ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( NULL, :GUIDAnimal_1, NOW(3), :CreatingIDUser_3, NOW(3), :UpdatingIDUser_5, :Deleted_6, :Name_7, :Age_8);");
+							.to.equal("INSERT INTO Animal ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( NULL, @GUIDAnimal_1, NOW(3), @CreatingIDUser_3, NOW(3), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -562,7 +561,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Create Query (AutoIdentity disabled)', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal("INSERT INTO `Animal` ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, DeletingIDUser, DeleteDate, Name, Age) VALUES ( :IDAnimal_0, :GUIDAnimal_1, :CreateDate_2, :CreatingIDUser_3, :UpdateDate_4, :UpdatingIDUser_5, :Deleted_6, :DeletingIDUser_7, :DeleteDate_8, :Name_9, :Age_10);");
+							.to.equal("INSERT INTO Animal ( IDAnimal, GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, DeletingIDUser, DeleteDate, Name, Age) VALUES ( @IDAnimal_0, @GUIDAnimal_1, @CreateDate_2, @CreatingIDUser_3, @UpdateDate_4, @UpdatingIDUser_5, @Deleted_6, @DeletingIDUser_7, @DeleteDate_8, @Name_9, @Age_10);");
 					}
 				);
 				test
@@ -583,7 +582,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` WHERE  `Animal`.Deleted = :Deleted_w0 LIMIT 100;');
+							.to.equal('SELECT Name, Age, Cost FROM Animal WHERE  Animal.Deleted = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -605,7 +604,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT DISTINCT `Name`, `Age`, `Cost` FROM `Animal` WHERE  `Animal`.Deleted = :Deleted_w0 LIMIT 100;');
+							.to.equal('SELECT DISTINCT Name, Age, Cost FROM Animal WHERE  Animal.Deleted = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -634,7 +633,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` WHERE Age = :Age_w0 AND ( Color = :Color_w2 OR Color = :Color_w3 ) AND Description IS NOT NULL AND IDOffice IN ( :IDOffice_w6 ) AND Deleted = :Deleted_w7 LIMIT 100;');
+							.to.equal('SELECT Name, Age, Cost FROM Animal WHERE Age = @Age_w0 AND ( Color = @Color_w2 OR Color = @Color_w3 ) AND Description IS NOT NULL AND IDOffice IN ( @IDOffice_w6 ) AND Deleted = @Deleted_w7 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -656,7 +655,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` LIMIT 100;');
+							.to.equal('SELECT Name, Age, Cost FROM Animal OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -677,7 +676,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET UpdateDate = NOW(3), Deleted = 1, DeletingIDUser = :DeletingIDUser_2, DeleteDate = NOW(3) WHERE IDAnimal = :IDAnimal_w0 AND  `Animal`.Deleted = :Deleted_w1;');
+							.to.equal('UPDATE Animal SET UpdateDate = NOW(3), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = NOW(3) WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -705,7 +704,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET GUIDAnimal = :GUIDAnimal_0, UpdateDate = NOW(3), UpdatingIDUser = :UpdatingIDUser_2, Name = :Name_3, Age = :Age_4 WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('UPDATE Animal SET GUIDAnimal = @GUIDAnimal_0, UpdateDate = NOW(3), UpdatingIDUser = @UpdatingIDUser_2, Name = @Name_3, Age = @Age_4 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -735,7 +734,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
 						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, Name = @Name_1, Age = @Age_2 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -757,7 +756,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('DELETE FROM `Animal` WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('DELETE FROM Animal WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -777,7 +776,7 @@ suite
 								CreatingIDUser:false,
 								UpdateDate:false,
 								UpdatingIDUser:false,
-								Deleted:false,
+								Deleted:0,
 								DeletingIDUser:false,
 								DeleteDate:false,
 								Name:'Froo Froo',
@@ -789,7 +788,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Update Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET GUIDAnimal = :GUIDAnimal_0, UpdateDate = NOW(3), UpdatingIDUser = :UpdatingIDUser_2, Deleted = :Deleted_3, Name = :Name_4, Age = :Age_5 WHERE IDAnimal = :IDAnimal_w0 AND Deleted = :Deleted_w1;');
+							.to.equal('UPDATE Animal SET GUIDAnimal = @GUIDAnimal_0, UpdateDate = NOW(3), UpdatingIDUser = @UpdatingIDUser_2, Deleted = @Deleted_3, Name = @Name_4, Age = @Age_5 WHERE IDAnimal = @IDAnimal_w0 AND Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -811,7 +810,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('UPDATE `Animal` SET UpdateDate = NOW(3), Deleted = 1, DeletingIDUser = :DeletingIDUser_2, DeleteDate = NOW(3) WHERE IDAnimal = :IDAnimal_w0 AND  `Animal`.Deleted = :Deleted_w1;');
+							.to.equal('UPDATE Animal SET UpdateDate = NOW(3), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = NOW(3) WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -834,7 +833,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Delete Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('DELETE FROM `Animal` WHERE IDAnimal = :IDAnimal_w0;');
+							.to.equal('DELETE FROM Animal WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -854,7 +853,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.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;');
+							.to.equal('UPDATE Animal SET UpdateDate = NOW(3), UpdatingIDUser = @UpdatingIDUser_1, Deleted = 0 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -902,8 +901,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Name`, `Age`, `Cost` FROM `Animal` INNER JOIN Test ON Test.IDAnimal = Animal.IDAnimal WHERE Age = :Age_w0 ORDER BY Age LIMIT 0, 10;');
-					}
+							.to.equal('SELECT Name, Age, Cost FROM Animal INNER JOIN Test ON Test.IDAnimal = Animal.IDAnimal WHERE Age = @Age_w0 ORDER BY Age OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -926,8 +924,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT DISTINCT `Name`, `Age`, `Cost` FROM `Animal` INNER JOIN Test ON Test.IDAnimal = Animal.IDAnimal WHERE Age = :Age_w0 ORDER BY Age LIMIT 0, 10;');
-					}
+							.to.equal('SELECT DISTINCT Name, Age, Cost FROM Animal INNER JOIN Test ON Test.IDAnimal = Animal.IDAnimal WHERE Age = @Age_w0 ORDER BY Age OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -944,7 +941,7 @@ suite
 						// This is the query generated by the MSSQL dialect
 						_Fable.log.trace('Select Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
-							.to.equal('SELECT `Animal`.* FROM `Animal`;'); //bad join is ignored, warn log is generated
+							.to.equal('SELECT Animal.* FROM Animal;'); //bad join is ignored, warn log is generated
 					}
 				);
 			}