Fix newlines for ORDER BY and GROUP BY in ETL DbModel

[smgallo]

Fix newlines for ORDER BY and GROUP BY in ETL DbModel

Description

A new line was missing when both an ORDER BY and GROUP BY was specified in a constructed ETLv2 query.

Motivation and Context

Bugfix

Tests performed

Tested query generation with only GROUP BY, only ORDER BY, and both by modifying the OSG job reporting verification action.

php etl_overseer.php -c ../../../etc/etl/etl.json -a VerifyOsgJobReporting -t -v debug -n 5

Generated queries:

SELECT
r.id AS id,
r.name AS name,
r.code AS code,
max(maxts.max_ts) AS last_entry_date,
5 AS number_of_days
FROM `federated_osg`.`resourcefact` AS r
JOIN `federated_osg`.`raw_jobs_test` AS j ON r.code = 'OSG'
JOIN ( SELECT 2799 as resource_id, max(j.ts) as max_ts FROM federated_osg.raw_jobs_test j ) AS maxts ON maxts.resource_id = r.id
WHERE maxts.max_ts < (NOW() - INTERVAL 5 DAY)
AND r.id IN (2799)
GROUP BY r.id

SELECT
r.id AS id,
r.name AS name,
r.code AS code,
max(maxts.max_ts) AS last_entry_date,
5 AS number_of_days
FROM `federated_osg`.`resourcefact` AS r
JOIN `federated_osg`.`raw_jobs_test` AS j ON r.code = 'OSG'
JOIN ( SELECT 2799 as resource_id, max(j.ts) as max_ts FROM federated_osg.raw_jobs_test j ) AS maxts ON maxts.resource_id = r.id
WHERE maxts.max_ts < (NOW() - INTERVAL 5 DAY)
AND r.id IN (2799)
ORDER BY name asc

SELECT
r.id AS id,
r.name AS name,
r.code AS code,
max(maxts.max_ts) AS last_entry_date,
5 AS number_of_days
FROM `federated_osg`.`resourcefact` AS r
JOIN `federated_osg`.`raw_jobs_test` AS j ON r.code = 'OSG'
JOIN ( SELECT 2799 as resource_id, max(j.ts) as max_ts FROM federated_osg.raw_jobs_test j ) AS maxts ON maxts.resource_id = r.id
WHERE maxts.max_ts < (NOW() - INTERVAL 5 DAY)
AND r.id IN (2799)
GROUP BY r.id
ORDER BY name asc

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project as found in the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

[plessbd]

Update unit tests (I would probably just trim the results) and all good.