DBTOOLS-1689 optimized queries

Author: AXEPOH

src/main/java/org/pgcodekeeper/core/loader/QueryBuilder.java

@@ -33,6 +33,7 @@ public final class QueryBuilder {
     private final List<String> joins = new ArrayList<>();
     private final List<String> wheres = new ArrayList<>();
     private final List<String> groups = new ArrayList<>();
+    private final List<String> orders = new ArrayList<>();
     private String postAction;
 
     /**
@@ -193,6 +194,17 @@ public QueryBuilder groupBy(String group) {
         return this;
     }
 
+    /**
+     * Adds a ORDER BY expression to the query.
+     *
+     * @param order the ORDER BY expression
+     * @return this builder for method chaining
+     */
+    public QueryBuilder orderBy(String order) {
+        orders.add(order);
+        return this;
+    }
+
     /**
      * Builds and returns the complete SQL query string.
      *
@@ -220,13 +232,9 @@ public String build() {
             sb.append("\n").append(join);
         }
 
-        if (!wheres.isEmpty()) {
-            sb.append("\nWHERE ").append(String.join("\n  AND ", wheres));
-        }
-
-        if (!groups.isEmpty()) {
-            sb.append("\nGROUP BY ").append(String.join(", ", groups));
-        }
+        appendList(wheres, "\nWHERE ", "\n  AND ", sb);
+        appendList(groups, "\nGROUP BY ", ", ", sb);
+        appendList(orders, "\nORDER BY ", ", ", sb);
 
         if (postAction != null) {
             sb.append("\n").append(postAction);
@@ -235,6 +243,12 @@ public String build() {
         return sb.toString();
     }
 
+    private void appendList(List<String> list, String prefix, String delimiter, StringBuilder sb) {
+        if (!list.isEmpty()) {
+            sb.append(prefix).append(String.join(delimiter, list));
+        }
+    }
+
     private void appendChild(StringBuilder sb, QueryBuilder childBuilder) {
         appendChild(sb, childBuilder, 2);
     }

src/main/java/org/pgcodekeeper/core/loader/jdbc/AbstractStatementReader.java

@@ -39,7 +39,8 @@ public abstract class AbstractStatementReader {
             .column("roleprinc.name AS r")
             .from("sys.database_principals roleprinc WITH (NOLOCK)")
             .join("JOIN sys.database_permissions perm WITH (NOLOCK) ON perm.grantee_principal_id = roleprinc.principal_id")
-            .join("LEFT JOIN sys.columns col WITH (NOLOCK) ON col.object_id = perm.major_id AND col.column_id = perm.minor_id");
+            .join("LEFT JOIN sys.columns col WITH (NOLOCK) ON col.object_id = perm.major_id AND col.column_id = perm.minor_id")
+            .postAction("FOR XML RAW, ROOT");
 
     protected static final QueryBuilder EXTENSION_DEPS_CTE_BUILDER = new QueryBuilder()
             .column("objid")
@@ -124,11 +125,7 @@ protected void addDescriptionPart(QueryBuilder builder, boolean checkColumn) {
     }
 
     protected void addMsPriviligesPart(QueryBuilder builder) {
-        var subSelect = new QueryBuilder()
-                .column("*")
-                .from(formatMsPriviliges(MS_PRIVILEGES_JOIN_SUBSELECT.copy()), "aa")
-                .postAction("FOR XML RAW, ROOT");
-
+        var subSelect = formatMsPriviliges(MS_PRIVILEGES_JOIN_SUBSELECT.copy());
         builder
                 .column("aa.acl")
                 .join("CROSS APPLY", subSelect, "aa (acl)");

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsExtendedObjectsReader.java

@@ -197,16 +197,12 @@ private void addMsColumnsPart(QueryBuilder builder) {
                 .column("t.is_user_defined AS ud")
                 .from("sys.columns as c WITH (NOLOCK)")
                 .join("JOIN sys.types t WITH (NOLOCK) ON c.user_type_id = t.user_type_id")
-                .where("c.object_id = res.object_id");
-
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "ccc ORDER BY ccc.id")
+                .where("c.object_id = res.object_id")
+                .orderBy("c.column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("ccc.cols");
-        builder.join("CROSS APPLY", cols, "ccc (cols)");
-
+        builder.join("CROSS APPLY", subSelect, "ccc (cols)");
     }
 
     private void addMsArgsPart(QueryBuilder builder) {
@@ -228,15 +224,11 @@ private void addMsArgsPart(QueryBuilder builder) {
                 .join("JOIN sys.parameters p WITH (NOLOCK) ON so.object_id = p.object_id")
                 .join("JOIN sys.types t WITH (NOLOCK) ON p.user_type_id = t.user_type_id")
                 .where("p.parameter_id > 0")
-                .where("so.object_id = res.object_id");
-
-        QueryBuilder args = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc ORDER BY cc.id")
+                .where("so.object_id = res.object_id")
+                .orderBy("id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("cc.args");
-        builder.join("CROSS APPLY", args, "cc (args)");
-
+        builder.join("CROSS APPLY", subSelect, "cc (args)");
     }
 }

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsFKReader.java

@@ -108,21 +108,17 @@ protected void fillQueryBuilder(QueryBuilder builder) {
 
     protected void addMsColsPart(QueryBuilder builder) {
         QueryBuilder subSelect = new QueryBuilder()
-                .column("sfkc.constraint_column_id AS id")
                 .column("fc.name AS f")
                 .column("rc.name AS r")
                 .from("sys.foreign_key_columns AS sfkc WITH (NOLOCK)")
                 .join("JOIN sys.columns fc WITH (NOLOCK) ON sfkc.parent_column_id=fc.column_id AND fc.object_id=sfkc.parent_object_id")
                 .join("JOIN sys.columns rc WITH (NOLOCK) ON sfkc.referenced_column_id=rc.column_id AND rc.object_id=sfkc.referenced_object_id")
-                .where("res.object_id=sfkc.constraint_object_id");
-
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc ORDER BY cc.id")
+                .where("res.object_id=sfkc.constraint_object_id")
+                .orderBy("sfkc.constraint_column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("aa.cols");
-        builder.join("CROSS APPLY", cols, "aa (cols)");
+        builder.join("CROSS APPLY", subSelect, "aa (cols)");
     }
 
     @Override

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsIndicesAndPKReader.java

@@ -213,27 +213,23 @@ protected void fillQueryBuilder(QueryBuilder builder) {
 
     protected void addMsColsPart(QueryBuilder builder) {
         QueryBuilder subSelect = new QueryBuilder()
-                .column("c.key_ordinal AS id")
                 .column("sc.name")
                 .column("c.is_descending_key AS is_desc")
                 .column("c.is_included_column AS is_inc")
                 .from("sys.index_columns c WITH (NOLOCK)")
                 .join("JOIN sys.columns sc WITH (NOLOCK) ON c.object_id = sc.object_id AND c.column_id = sc.column_id")
                 .where("c.object_id = res.object_id")
-                .where("c.index_id = res.index_id");
+                .where("c.index_id = res.index_id")
+                .orderBy("c.key_ordinal")
+                .postAction("FOR XML RAW, ROOT");
 
         if (SupportedMsVersion.VERSION_22.isLE(loader.getVersion())) {
             subSelect.column("c.column_store_order_ordinal AS col_order");
         }
 
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc ORDER BY cc.id")
-                .postAction("FOR XML RAW, ROOT");
-
         builder
                 .column("cc.cols")
-                .join("CROSS APPLY", cols, "cc (cols)");
+                .join("CROSS APPLY", subSelect, "cc (cols)");
     }
 
     @Override

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsRolesReader.java

@@ -83,15 +83,11 @@ private void addMsGroupsPart(QueryBuilder builder) {
                 .column("p1.name AS m")
                 .from("sys.database_role_members AS rm WITH (NOLOCK)")
                 .join("INNER JOIN sys.database_principals p1 WITH (NOLOCK) ON rm.member_principal_id=p1.principal_id")
-                .where("rm.role_principal_id=res.principal_id");
-
-        QueryBuilder group = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc")
+                .where("rm.role_principal_id=res.principal_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("cc.groups");
-        builder.join("CROSS APPLY", group, "cc (groups)");
+        builder.join("CROSS APPLY", subSelect, "cc (groups)");
     }
 
     @Override

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsStatisticsReader.java

@@ -87,15 +87,11 @@ protected void processResult(ResultSet res, AbstractSchema schema) throws SQLExc
     protected void fillQueryBuilder(QueryBuilder builder) {
         QueryBuilder subSelect = new QueryBuilder()
                 .column("s_column.name AS name")
-                .column("st_col.stats_column_id AS id")
                 .from("sys.stats_columns st_col WITH (NOLOCK)")
                 .join("LEFT JOIN sys.columns s_column WITH (NOLOCK) ON s_column.object_id = res.object_id AND s_column.column_id = st_col.column_id")
                 .where("st_col.object_id = res.object_id")
-                .where("st_col.stats_id = res.stats_id");
-
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "st_col ORDER BY id")
+                .where("st_col.stats_id = res.stats_id")
+                .orderBy("st_col.stats_column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder
@@ -106,7 +102,7 @@ protected void fillQueryBuilder(QueryBuilder builder) {
                 .column("res.no_recompute")
                 .column("res.is_incremental")
                 .from("sys.stats res WITH (NOLOCK)")
-                .join("CROSS APPLY", cols, "st_col (cols)")
+                .join("CROSS APPLY", subSelect, "st_col (cols)")
                 .join("LEFT JOIN sys.objects cont WITH (NOLOCK) ON cont.object_id = res.object_id")
                 .where("res.user_created = 1");
 

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsTablesReader.java

@@ -299,16 +299,13 @@ OR TYPE_NAME(t.system_type_id) IN ('TEXT', 'NTEXT','IMAGE' ,'XML')
                 .join("LEFT JOIN sys.default_constraints dc WITH (NOLOCK) ON dc.parent_object_id = c.object_id AND c.column_id = dc.parent_column_id")
                 .join("LEFT JOIN sys.objects so WITH (NOLOCK) ON so.object_id = c.object_id")
                 .join("LEFT JOIN sys.masked_columns mc WITH (NOLOCK) ON mc.object_id = c.object_id AND c.column_id = mc.column_id")
-                .where("c.object_id = res.object_id");
-
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc ORDER BY cc.id")
+                .where("c.object_id = res.object_id")
+                .orderBy("c.column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder
                 .column("cc.cols")
-                .join("CROSS APPLY", cols, "cc (cols)");
+                .join("CROSS APPLY", subSelect, "cc (cols)");
     }
 
     private void addMsTablespacePart(QueryBuilder builder) {

src/main/java/org/pgcodekeeper/core/loader/jdbc/ms/MsTypesReader.java

@@ -182,7 +182,6 @@ private void addMsConstraintsPart(QueryBuilder builder) {
     private void addMsColumnsPart(QueryBuilder builder) {
         QueryBuilder subSelect = new QueryBuilder()
                 .column("c.name")
-                .column("c.column_id AS id")
                 .column("ss.name AS st")
                 .column("usrt.name AS type")
                 .column("usrt.is_user_defined AS ud")
@@ -206,31 +205,23 @@ private void addMsColumnsPart(QueryBuilder builder) {
                 .join("LEFT OUTER JOIN sys.schemas ss WITH (NOLOCK) ON ss.schema_id = usrt.schema_id")
                 .join("LEFT OUTER JOIN sys.types baset WITH (NOLOCK) ON (baset.user_type_id = c.system_type_id AND baset.user_type_id = baset.system_type_id)")
                 .join("  OR (baset.system_type_id = c.system_type_id AND baset.user_type_id = c.user_type_id AND baset.is_user_defined = 0 AND baset.is_assembly_type = 1)")
-                .where("ttt.type_table_object_id=c.object_id");
-
-
-        QueryBuilder cols = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "cc ORDER BY cc.id")
+                .where("ttt.type_table_object_id=c.object_id")
+                .orderBy("c.column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("cc.cols");
-        builder.join("CROSS APPLY", cols, "cc (cols)");
+        builder.join("CROSS APPLY", subSelect, "cc (cols)");
     }
 
     private void addMsIndicesPart(QueryBuilder builder) {
-        QueryBuilder subSubSubSelect = new QueryBuilder()
-                .column("c.index_column_id AS id")
+        QueryBuilder subSubSelect = new QueryBuilder()
                 .column("sc.name")
                 .column("c.is_descending_key AS is_desc")
                 .from("sys.index_columns c WITH (NOLOCK)")
                 .join("JOIN sys.columns sc WITH (NOLOCK) ON c.object_id = sc.object_id AND c.column_id = sc.column_id")
                 .where("c.object_id = si.object_id")
-                .where("c.index_id = si.index_id");
-
-        QueryBuilder subSubSelect = new QueryBuilder()
-                .column("*")
-                .from(subSubSubSelect, "cc ORDER BY cc.id")
+                .where("c.index_id = si.index_id")
+                .orderBy("c.index_column_id")
                 .postAction("FOR XML RAW, ROOT");
 
         QueryBuilder subSelect = new QueryBuilder()
@@ -248,15 +239,11 @@ private void addMsIndicesPart(QueryBuilder builder) {
                 .join("CROSS APPLY", subSubSelect, "ccc (cols)")
                 .where("si.object_id=ttt.type_table_object_id")
                 .where("si.index_id > 0")
-                .where("si.is_hypothetical = 0");
-
-        QueryBuilder indicesBuilder = new QueryBuilder()
-                .column("*")
-                .from(subSelect, "ii")
+                .where("si.is_hypothetical = 0")
                 .postAction("FOR XML RAW, ROOT");
 
         builder.column("ii.indices");
-        builder.join("CROSS APPLY", indicesBuilder, "ii (indices)");
+        builder.join("CROSS APPLY", subSelect, "ii (indices)");
     }
 
     @Override

src/test/java/org/pgcodekeeper/core/loader/QueryBuilderTest.java

@@ -114,6 +114,30 @@ void testGroupBy() {
         assertEquals(expected, actual);
     }
 
+    @Test
+    void testQuery() {
+        String actual = new QueryBuilder()
+                .column("c1")
+                .from("public.t1")
+                .where("c1 > 0")
+                .orderBy("col1")
+                .orderBy("col2")
+                .groupBy("col1")
+                .postAction("FOR XML RAW, ROOT")
+                .build();
+
+        String expected = """
+                SELECT
+                  c1
+                FROM public.t1
+                WHERE c1 > 0
+                GROUP BY col1
+                ORDER BY col1, col2
+                FOR XML RAW, ROOT""";
+
+        assertEquals(expected, actual);
+    }
+
     @Test
     void testPostAction() {
         String actual = new QueryBuilder()