foxhound 2.0.9 → 2.0.10

package/package.json

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

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

@@ -38,7 +38,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 		{
 			pParameters.query.parameterTypes = {};
 		}
-		return ' '+pParameters.scope;
+		return ' ['+pParameters.scope+']';
 	};
 
 	var generateMSSQLParameterTypeEntry = function(pParameters, pColumnParameterName, pColumn)
@@ -152,7 +152,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 				// this means there is no autoincrementing unique ID column; treat as above
 				return '';
 			}
-			const qualifiedIDColumn = `${tmpTableName}.${idColumn.Column}`;
+			const qualifiedIDColumn = `${idColumn.Column}`;
 			return ` ${generateSafeFieldName(qualifiedIDColumn)}`;
 		}
 
@@ -184,7 +184,15 @@ var FoxHoundDialectMSSQL = function(pFable)
 	*/
 	var generateSafeFieldName = function(pFieldName)
 	{
-		return pFieldName;
+		// This isn't great but best we can do for MS SQL needing brackets around field names for reserved keywords
+		if ((pFieldName != '*') && (pFieldName.indexOf('[') < 0) && pFieldName.indexOf('.') < 0)
+		{
+			return '['+pFieldName+']';
+		}
+		else
+		{
+			return pFieldName;
+		}
 	}
 
 	/**
@@ -238,7 +246,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 						//if not, we need to add it
 						tmpFilter.push(
 						{
-							Column: tmpTableName + '.' + tmpSchemaEntry.Column,
+							Column: tmpSchemaEntry.Column,
 							Operator: '=',
 							Value: 0,
 							Connector: 'AND',
@@ -287,7 +295,7 @@ 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)
@@ -295,18 +303,18 @@ var FoxHoundDialectMSSQL = function(pFable)
 			else if (tmpFilter[i].Operator === 'IS NULL')
 			{
 				// IS NULL is a special operator which doesn't require a value, or parameter
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator;
 			}
 			else if (tmpFilter[i].Operator === 'IS NOT NULL')
 			{
 				// IS NOT NULL is a special operator which doesn't require a value, or parameter
-				tmpWhere += ' '+tmpFilter[i].Column+' '+tmpFilter[i].Operator;
+				tmpWhere += ' ['+tmpFilter[i].Column+'] '+tmpFilter[i].Operator;
 			}
 			else
 			{
 				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)
 			}
@@ -340,7 +348,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				tmpOrderClause += ',';
 			}
-			tmpOrderClause += ' '+tmpOrderBy[i].Column;
+			tmpOrderClause += ' ['+tmpOrderBy[i].Column+']';
 
 			if (tmpOrderBy[i].Direction == 'Descending')
 			{
@@ -419,7 +427,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 			//verify that all required fields are valid
 			if (join.Type && join.Table && join.From && join.To)
 			{
-				tmpJoinClause += ` ${join.Type} ${join.Table} ON ${join.From} = ${join.To}`;
+				tmpJoinClause += ` ${join.Type} [${join.Table}] ON ${join.From} = ${join.To}`;
 			}
 		}
 
@@ -494,20 +502,20 @@ var FoxHoundDialectMSSQL = function(pFable)
 			{
 				case 'UpdateDate':
 					// This is an autoidentity, so we don't parameterize it and just pass in NULL
-					tmpUpdate += ' '+tmpColumn+' = ' + SQL_NOW;
+					tmpUpdate += ' ['+tmpColumn+'] = ' + SQL_NOW;
 					break;
 				case 'UpdateIDUser':
 					// 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];
@@ -561,21 +569,21 @@ var FoxHoundDialectMSSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 1';
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = 1';
 					tmpHasDeletedField = true; //this field is required in order for query to be built
 					break;
 				case 'DeleteDate':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					break;
 				case 'UpdateDate':
 					// Delete operation is an Update, so we should stamp the update time
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					break;
 				case 'DeleteIDUser':
 					// 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)
@@ -634,16 +642,16 @@ var FoxHoundDialectMSSQL = function(pFable)
 			switch (tmpSchemaEntry.Type)
 			{
 				case 'Deleted':
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = 0';
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = 0';
 					tmpHasDeletedField = true; //this field is required in order for query to be built
 					break;
 				case 'UpdateDate':
 					// The undelete operation is an Update, so we should stamp the update time
-					tmpUpdateSql = ' '+tmpSchemaEntry.Column+' = ' + SQL_NOW;
+					tmpUpdateSql = ' ['+tmpSchemaEntry.Column+'] = ' + SQL_NOW;
 					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;
@@ -872,7 +880,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 						{
 							tmpCreateSet += ',';
 						}
-						tmpCreateSet += ' '+tmpColumn;
+						tmpCreateSet += ' ['+tmpColumn+']';
 					}
 					continue;
 				default:
@@ -880,7 +888,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 					{
 						tmpCreateSet += ',';
 					}
-					tmpCreateSet += ' '+tmpColumn;
+					tmpCreateSet += ' ['+tmpColumn+']';
 					break;
 			}
 		}

package/test/Foxhound-Dialect-MSSQL_tests.js

@@ -91,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
@@ -122,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
@@ -138,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 Animal.* FROM Animal WITH(INDEX(AnimalIndex_1)) ORDER BY Cost DESC;');
+							.to.equal('SELECT [Animal].* FROM [Animal] WITH(INDEX(AnimalIndex_1)) ORDER BY [Cost] DESC;');
 					}
 				);
 				test
@@ -154,7 +154,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
@@ -176,7 +176,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 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.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
 				(
@@ -188,7 +188,7 @@ suite
 							.setScope('Animal')
 							.setCap(10)
 							.setBegin(0)
-							.setDataElements(['*', 'Name', 'Age', 'Cost', 'Animal.*'])
+							.setDataElements(['*', 'Name', 'Age', 'Cost', '[Animal].*'])
 							.setSort([{Column:'Age',Direction:'Ascending'}])
 							.setFilter({Column:'Age',Operator:'=',Value:'15',Connector:'AND',Parameter:'Age'});
 						tmpQuery.addSort('Cost');
@@ -197,7 +197,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 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.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
 				(
@@ -222,7 +222,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 ) ORDER BY Age OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.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
@@ -244,7 +244,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  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.to.equal('SELECT Name, Age * 5, Cost FROM  [Animal]  WHERE [Age] = @Age_w0  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -266,7 +266,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  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.to.equal('SELECT Name, Age * 5, Cost FROM  [Animal]  WHERE [Age] = @Age_w0  OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
 				);
 				test
 				(
@@ -323,7 +323,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
@@ -342,7 +342,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 WITH(INDEX(AnimalIndex_1))  WHERE Age = @Age_w0;');
+							.to.equal('SELECT COUNT(*) AS RowCount FROM  [Animal] WITH(INDEX(AnimalIndex_1))  WHERE [Age] = @Age_w0;');
 					}
 				);
 				test
@@ -361,7 +361,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
@@ -380,7 +380,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
@@ -414,7 +414,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
@@ -432,7 +432,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 Row_Count FROM Animal WITH(INDEX(AnimalIndex_1));');
+							.to.equal('SELECT COUNT(*) AS Row_Count FROM [Animal] WITH(INDEX(AnimalIndex_1));');
 					}
 				);
 				test
@@ -452,7 +452,7 @@ suite
 						_Fable.log.trace('Count Distinct Query', tmpQuery.query);
 						Expect(tmpQuery.query.body)
 						// 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;');
+							.to.equal('SELECT COUNT(DISTINCT [IDAnimal]) AS Row_Count FROM [Animal] WHERE [Deleted] = @Deleted_w0;');
 					}
 				);
 				test
@@ -470,7 +470,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 Row_Count FROM Animal;');
+							.to.equal('SELECT COUNT(*) AS Row_Count FROM [Animal];');
 					}
 				);
 				test
@@ -489,7 +489,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) AS Row_Count FROM Animal;');
+							.to.equal('SELECT COUNT(DISTINCT [Name]) AS Row_Count FROM [Animal];');
 					}
 				);
 			}
@@ -529,7 +529,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 ( GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
+							.to.equal("INSERT INTO [Animal] ( [GUIDAnimal], [CreateDate], [CreatingIDUser], [UpdateDate], [UpdatingIDUser], [Deleted], [Name], [Age]) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -561,7 +561,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 ( GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
+							.to.equal("INSERT INTO [Animal] ( [GUIDAnimal], [CreateDate], [CreatingIDUser], [UpdateDate], [UpdatingIDUser], [Deleted], [Name], [Age]) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -597,7 +597,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
@@ -618,7 +618,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 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.to.equal('SELECT [Name], [Age], [Cost] FROM [Animal] WHERE [Deleted] = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -640,7 +640,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 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.to.equal('SELECT DISTINCT [Name], [Age], [Cost] FROM [Animal] WHERE [Deleted] = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -669,7 +669,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 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.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
@@ -691,7 +691,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 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.to.equal('SELECT [Name], [Age], [Cost] FROM [Animal] OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -712,7 +712,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 = GETUTCDATE(), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = GETUTCDATE() WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
+							.to.equal('UPDATE [Animal] SET [UpdateDate] = GETUTCDATE(), [Deleted] = 1, [DeletingIDUser] = @DeletingIDUser_2, [DeleteDate] = GETUTCDATE() WHERE [IDAnimal] = @IDAnimal_w0 AND [Deleted] = @Deleted_w1;');
 					}
 				);
 				test
@@ -740,7 +740,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 = GETUTCDATE(), UpdatingIDUser = @UpdatingIDUser_2, Name = @Name_3, Age = @Age_4 WHERE IDAnimal = @IDAnimal_w0;');
+							.to.equal('UPDATE [Animal] SET [GUIDAnimal] = @GUIDAnimal_0, [UpdateDate] = GETUTCDATE(), [UpdatingIDUser] = @UpdatingIDUser_2, [Name] = @Name_3, [Age] = @Age_4 WHERE [IDAnimal] = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -770,7 +770,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
@@ -792,7 +792,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
@@ -824,7 +824,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 = GETUTCDATE(), 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] = GETUTCDATE(), [UpdatingIDUser] = @UpdatingIDUser_2, [Deleted] = @Deleted_3, [Name] = @Name_4, [Age] = @Age_5 WHERE [IDAnimal] = @IDAnimal_w0 AND [Deleted] = @Deleted_w1;');
 					}
 				);
 				test
@@ -846,7 +846,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 = GETUTCDATE(), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = GETUTCDATE() WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
+							.to.equal('UPDATE [Animal] SET [UpdateDate] = GETUTCDATE(), [Deleted] = 1, [DeletingIDUser] = @DeletingIDUser_2, [DeleteDate] = GETUTCDATE() WHERE [IDAnimal] = @IDAnimal_w0 AND [Deleted] = @Deleted_w1;');
 					}
 				);
 				test
@@ -869,7 +869,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
@@ -889,7 +889,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 = GETUTCDATE(), UpdatingIDUser = @UpdatingIDUser_1, Deleted = 0 WHERE IDAnimal = @IDAnimal_w0;');
+							.to.equal('UPDATE [Animal] SET [UpdateDate] = GETUTCDATE(), [UpdatingIDUser] = @UpdatingIDUser_1, [Deleted] = 0 WHERE [IDAnimal] = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -937,7 +937,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 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.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
 				(
@@ -960,7 +960,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 OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY;');					}
+							.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
 				(
@@ -977,7 +977,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
 					}
 				);
 			}