chore: simplify referenced_columns comparison

Author: soedirgo

src/server/templates/typescript.ts

@@ -155,33 +155,14 @@ export type Database = {
                           relationship.referenced_schema === table.schema &&
                           relationship.relation === table.name
                       )
-                      .sort((a, b) => {
-                        // First try to sort by foreign key name.
-                        const foreignKeyCompare = a.foreign_key_name.localeCompare(
-                          b.foreign_key_name
-                        )
-                        if (foreignKeyCompare !== 0) return foreignKeyCompare
-
-                        // Then try to sort by referenced relation.
-                        const referencedRelationCompare = a.referenced_relation.localeCompare(
-                          b.referenced_relation
-                        )
-                        if (referencedRelationCompare !== 0) return referencedRelationCompare
-
-                        // Then try to sort by referenced columns, finding the first difference.
-                        for (
-                          let i = 0;
-                          i < Math.min(a.referenced_columns.length, b.referenced_columns.length);
-                          i++
-                        ) {
-                          const refColCompare = a.referenced_columns[i].localeCompare(
-                            b.referenced_columns[i]
+                      .sort(
+                        (a, b) =>
+                          a.foreign_key_name.localeCompare(b.foreign_key_name) ||
+                          a.referenced_relation.localeCompare(b.referenced_relation) ||
+                          JSON.stringify(a.referenced_columns).localeCompare(
+                            JSON.stringify(b.referenced_columns)
                           )
-                          if (refColCompare !== 0) return refColCompare
-                        }
-                        // If all referenced columns are the same, sort by the number of referenced columns.
-                        return a.referenced_columns.length - b.referenced_columns.length
-                      })
+                      )
                       .map(
                         (relationship) => `{
                         foreignKeyName: ${JSON.stringify(relationship.foreign_key_name)}
@@ -254,33 +235,14 @@ export type Database = {
                           relationship.referenced_schema === view.schema &&
                           relationship.relation === view.name
                       )
-                      .sort((a, b) => {
-                        // First try to sort by foreign key name.
-                        const foreignKeyCompare = a.foreign_key_name.localeCompare(
-                          b.foreign_key_name
-                        )
-                        if (foreignKeyCompare !== 0) return foreignKeyCompare
-
-                        // Then try to sort by referenced relation.
-                        const referencedRelationCompare = a.referenced_relation.localeCompare(
-                          b.referenced_relation
-                        )
-                        if (referencedRelationCompare !== 0) return referencedRelationCompare
-
-                        // Then try to sort by referenced columns, finding the first difference.
-                        for (
-                          let i = 0;
-                          i < Math.min(a.referenced_columns.length, b.referenced_columns.length);
-                          i++
-                        ) {
-                          const refColCompare = a.referenced_columns[i].localeCompare(
-                            b.referenced_columns[i]
+                      .sort(
+                        (a, b) =>
+                          a.foreign_key_name.localeCompare(b.foreign_key_name) ||
+                          a.referenced_relation.localeCompare(b.referenced_relation) ||
+                          JSON.stringify(a.referenced_columns).localeCompare(
+                            JSON.stringify(b.referenced_columns)
                           )
-                          if (refColCompare !== 0) return refColCompare
-                        }
-                        // If all referenced columns are the same, sort by the number of referenced columns.
-                        return a.referenced_columns.length - b.referenced_columns.length
-                      })
+                      )
                       .map(
                         (relationship) => `{
                         foreignKeyName: ${JSON.stringify(relationship.foreign_key_name)}

test/db/00-init.sql

@@ -158,4 +158,4 @@ second_user AS (
   where u.id = 2
 )
 SELECT * from initial_user iu 
-cross join second_user su;
+cross join second_user su;