Revise the test data to align with DOMA’s template parsing rules.

Author: xterao

src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt

@@ -110,6 +110,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("Update.sql", "Update$formatDataPrefix.sql")
     }
 
+    fun testUpdatePopulateFormatter() {
+        formatSqlFile("UpdatePopulate.sql", "UpdatePopulate$formatDataPrefix.sql")
+    }
+
     fun testUpdateReturningFormatter() {
         formatSqlFile("UpdateReturning.sql", "UpdateReturning$formatDataPrefix.sql")
     }

src/test/testData/sql/formatter/AlterTableAddColumn_format.sql

@@ -5,4 +5,4 @@ ALTER TABLE /*# tableName */
           ,
           /*%end */
         /*%end */
-        DROP COLUMN /*# column2.name */ /*# column2.type */
+       DROP COLUMN /*# column2.name */ /*# column2.type */

src/test/testData/sql/formatter/ComparisonOperators_format.sql

@@ -21,7 +21,7 @@ SELECT id
          tags && ARRAY[/*%for property : properties */
                        /* property */'property'
                          /*%if property_has_next*/
-                          ,
+                         ,
                          /*%end*/
                        /*%end*/] AS is_urgent
        , ARRAY['tag1', 'tag2'] <@ tags AS has_all_tags

src/test/testData/sql/formatter/ConditionalSubquery.sql

@@ -1,21 +1,15 @@
 SELECT e.id
 , e.name
-,
-/*%if includeSkillCount */
-( SELECT COUNT(DISTINCT es.skill_id)
-FROM employee_skills es
-/*%if onlyActiveSkills */
-INNER JOIN skills sk ON es.skill_id = sk.id
-WHERE es.employee_id = e.id
-AND sk.is_active = true
-/*%if skillCategories != null && skillCategories.size() > 0 */
-AND sk.category IN /* skillCategories */('technical', 'management')
-/*%end*/
-/*%else*/
-WHERE es.employee_id = e.id
-/*%end*/ ),
-/*%end*/
-d.department_name
+, /*%if includeSkillCount */
+ ( SELECT COUNT(DISTINCT es.skill_id)
+     FROM performance_reviews pr WHERE pr.employee_id = e.id
+/*%if reviewPeriod != null */
+AND pr.review_date BETWEEN /* reviewPeriod.startDate */'2023-01-01' AND /* reviewPeriod.endDate */'2023-12-31'              /*%end*/
+/*%if minScore != null */
+AND pr.performance_score >= /* minScore */4.0
+/*%end*/ ) ,
+ /*%end*/
+ d.department_name
 FROM employees e
 INNER JOIN departments d ON e.department_id = d.id
  WHERE/*%if filterByHighPerformers */

src/test/testData/sql/formatter/ConditionalSubquery_format.sql

@@ -2,19 +2,15 @@ SELECT e.id
        , e.name
        , /*%if includeSkillCount */
          ( SELECT COUNT(DISTINCT es.skill_id)
-             FROM employee_skills es
-                  /*%if onlyActiveSkills */
-                  INNER JOIN skills sk
-                          ON es.skill_id = sk.id
-                  WHERE es.employee_id = e.id
-                    AND sk.is_active = true
-                    /*%if skillCategories != null && skillCategories.size() > 0 */
-                    AND sk.category IN /* skillCategories */('technical', 'management')
-                    /*%end*/
-                  /*%else*/
-                  WHERE es.employee_id = e.id
-                  /*%end*/ )
-          ,
+             FROM performance_reviews pr
+            WHERE pr.employee_id = e.id
+              /*%if reviewPeriod != null */
+              AND pr.review_date BETWEEN /* reviewPeriod.startDate */'2023-01-01' AND /* reviewPeriod.endDate */'2023-12-31'
+              /*%end*/
+              /*%if minScore != null */
+              AND pr.performance_score >= /* minScore */4.0
+              /*%end*/ )
+         ,
          /*%end*/
          d.department_name
   FROM employees e

src/test/testData/sql/formatter/LoopDirective_format.sql

@@ -3,7 +3,7 @@ SELECT
          /*%if column_index == 0 */
          /* column.name */'id' AS /* column.alias */'user_id'
          /*%else*/
-          , /* column.name */'name' AS /* column.alias */'user_name'
+         , /* column.name */'name' AS /* column.alias */'user_name'
          /*%end*/
        /*%end*/
   FROM users

src/test/testData/sql/formatter/NestedDirectives_format.sql

@@ -43,7 +43,7 @@ SELECT e.id
               /*%end */ -- END3
               /*%if sort_has_next */ -- IF8
               e.sort_field
-               ,
+              ,
               /*%end */ -- END8
             /*%end */ -- END2
           /*%else */ -- ELSE1

src/test/testData/sql/formatter/OrderByGroupWithConditionDirective.sql

@@ -1,13 +1,10 @@
 SELECT e.id
         -- with condition
          , ROW_NUMBER() /*%if order */OVER(ORDER BY e.manager_id DESC)/*%end*/ AS row_num
-       , RANK() OVER(PARTITION BY department_id
-/*%if order */ORDER BY e.manager_id DESC/*%end */
-ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS rank_num
        , DENSE_RANK() OVER(PARTITION BY department_id
- /*%if order */
+
 ORDER BY e.id ASC, e.manager_id ASC, created_at DESC
-    /*%else */
+ /*%if rows */
 ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING/*%end */) AS dense_rank_num
        , SUM(amount)/*%if filter */ FILTER(WHERE status = 'active')/*%end*/ AS dept_salary_avg
        , COUNT(*) OVER(ORDER BY e.id, e.manager_id, created_at

src/test/testData/sql/formatter/OrderByGroupWithConditionDirective_format.sql

@@ -5,15 +5,9 @@ SELECT e.id
          OVER(ORDER BY e.manager_id DESC)
          /*%end*/
          AS row_num
-       , RANK() OVER(PARTITION BY department_id
-                     /*%if order */
-                     ORDER BY e.manager_id DESC
-                     /*%end */
-                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS rank_num
        , DENSE_RANK() OVER(PARTITION BY department_id
-                           /*%if order */
                            ORDER BY e.id ASC, e.manager_id ASC, created_at DESC
-                           /*%else */
+                           /*%if rows */
                            ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                            /*%end */) AS dense_rank_num
        , SUM(amount)

src/test/testData/sql/formatter/SelectDirectiveTestData.sql

@@ -1,6 +1,4 @@
 SELECT /*%expand */ *
-, /*%populate */
-, extra
   FROM ( SELECT * FROM users ) AS u
                , ( SELECT tag  FROM post WHERE u.usr_id = /*authr.id*/0 ) AS tag          , employee
 where common_id = /*@ example.status. CommonStatus @ id*/1