foxhound 2.0.5 → 2.0.7

package/package.json

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

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

@@ -19,7 +19,7 @@
 var FoxHoundDialectMSSQL = function(pFable)
 {
 	//Request time from SQL server with microseconds resolution
-	const SQL_NOW = "NOW(3)";
+	const SQL_NOW = "GETUTCDATE()";
 
 	_Fable = pFable;
 
@@ -704,7 +704,7 @@ var FoxHoundDialectMSSQL = function(pFable)
 				}
 			}
 
-			if (tmpCurrentColumn > 0)
+			if ((tmpCurrentColumn > 0) && (tmpCreateSet != ''))
 			{
 				tmpCreateSet += ',';
 			}
@@ -730,7 +730,8 @@ var FoxHoundDialectMSSQL = function(pFable)
 					else
 					{
 						// This is an autoidentity, so we don't parameterize it and just pass in NULL
-						tmpCreateSet += ' NULL';
+						//tmpCreateSet += ' NULL';
+						// For MSSQL we have to skip this.  NULL and DEFAULT both error for autoidentities.
 					}
 					break;
 				case 'AutoGUID':
@@ -846,6 +847,17 @@ var FoxHoundDialectMSSQL = function(pFable)
 			}
 			switch (tmpSchemaEntry.Type)
 			{
+				// We skip these for MSSQL on INSERT or they cause an error for some versions (different errors for different versions)
+				case 'AutoIdentity':
+					if (pParameters.query.disableAutoIdentity)
+					{
+						if (tmpCreateSet != '')
+						{
+							tmpCreateSet += ',';
+						}
+						tmpCreateSet += ' '+tmpColumn;
+					}
+					continue;
 				default:
 					if (tmpCreateSet != '')
 					{

package/test/Foxhound-Dialect-MSSQL_tests.js

@@ -493,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 ( GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -525,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 ( GUIDAnimal, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser, Deleted, Name, Age) VALUES ( @GUIDAnimal_1, GETUTCDATE(), @CreatingIDUser_3, GETUTCDATE(), @UpdatingIDUser_5, @Deleted_6, @Name_7, @Age_8);");
 					}
 				);
 				test
@@ -676,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 = GETUTCDATE(), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = GETUTCDATE() WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -704,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 = GETUTCDATE(), UpdatingIDUser = @UpdatingIDUser_2, Name = @Name_3, Age = @Age_4 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test
@@ -788,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 = GETUTCDATE(), UpdatingIDUser = @UpdatingIDUser_2, Deleted = @Deleted_3, Name = @Name_4, Age = @Age_5 WHERE IDAnimal = @IDAnimal_w0 AND Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -810,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 = GETUTCDATE(), Deleted = 1, DeletingIDUser = @DeletingIDUser_2, DeleteDate = GETUTCDATE() WHERE IDAnimal = @IDAnimal_w0 AND  Animal.Deleted = @Deleted_w1;');
 					}
 				);
 				test
@@ -853,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 = GETUTCDATE(), UpdatingIDUser = @UpdatingIDUser_1, Deleted = 0 WHERE IDAnimal = @IDAnimal_w0;');
 					}
 				);
 				test