foxhound 2.0.25 → 2.0.27

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

package/test/Foxhound-Dialect-MSSQL_tests.js

@@ -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 [Deleted] = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.to.equal('SELECT [Name], [Age], [Cost] FROM [Animal] WHERE [Deleted] = @Deleted_w0 ORDER BY [IDAnimal] 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 [Deleted] = @Deleted_w0 OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+							.to.equal('SELECT DISTINCT [Name], [Age], [Cost] FROM [Animal] WHERE [Deleted] = @Deleted_w0 ORDER BY [IDAnimal] 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 ORDER BY [IDAnimal] OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
 					}
 				);
 				test
@@ -691,7 +691,62 @@ 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] ORDER BY [IDAnimal] OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY;');
+					}
+				);
+				test
+				(
+					'Read Query with legacyPagination uses ROW_NUMBER() wrapper (caller sort)',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(_Fable)
+							.setDialect('MSSQL')
+							.setScope('Animal')
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(10)
+							.setBegin(20)
+							.setSort([{Column:'Age',Direction:'Ascending'}]);
+						tmpQuery.query.schema = _AnimalSchema;
+						tmpQuery.parameters.legacyPagination = true;
+						tmpQuery.buildReadQuery();
+						_Fable.log.trace('Legacy Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT [Name], [Age], [Cost] FROM (SELECT [Name], [Age], [Cost], ROW_NUMBER() OVER (ORDER BY [Age]) AS [_RowNum] FROM [Animal] WHERE [Deleted] = @Deleted_w0) AS [_Paged] WHERE [_RowNum] > 20 AND [_RowNum] <= 30;');
+					}
+				);
+				test
+				(
+					'Read Query with legacyPagination injects PK ORDER BY when caller omits sort',
+					function()
+					{
+						var tmpQuery = libFoxHound.new(_Fable)
+							.setDialect('MSSQL')
+							.setScope('Animal')
+							.setDataElements(['Name', 'Age', 'Cost'])
+							.setCap(10);
+						tmpQuery.query.schema = _AnimalSchema;
+						tmpQuery.parameters.legacyPagination = true;
+						tmpQuery.buildReadQuery();
+						_Fable.log.trace('Legacy Select Query', tmpQuery.query);
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT [Name], [Age], [Cost] FROM (SELECT [Name], [Age], [Cost], ROW_NUMBER() OVER (ORDER BY [IDAnimal]) AS [_RowNum] FROM [Animal] WHERE [Deleted] = @Deleted_w0) AS [_Paged] WHERE [_RowNum] > 0 AND [_RowNum] <= 10;');
+					}
+				);
+				test
+				(
+					'Read Query with legacyPagination is inert without cap',
+					function()
+					{
+						// No cap → no pagination at all (legacy or otherwise);
+						// the flag should be a no-op and not produce a ROW_NUMBER wrapper.
+						var tmpQuery = libFoxHound.new(_Fable)
+							.setDialect('MSSQL')
+							.setScope('Animal');
+						tmpQuery.addSort({Column:'Cost',Direction:'Descending'});
+						tmpQuery.parameters.legacyPagination = true;
+						tmpQuery.buildReadQuery();
+						Expect(tmpQuery.query.body)
+							.to.equal('SELECT [Animal].* FROM [Animal] ORDER BY [Cost] DESC;');
 					}
 				);
 				test