Skip to content

Commit e73b3b9

Browse files
committed
chore: single sort for relationships
1 parent 89b5561 commit e73b3b9

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/server/templates/typescript.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ export const apply = async ({
3636
postgrestVersion?: string
3737
}): Promise<string> => {
3838
schemas.sort((a, b) => a.name.localeCompare(b.name))
39+
relationships.sort(
40+
(a, b) =>
41+
a.foreign_key_name.localeCompare(b.foreign_key_name) ||
42+
a.referenced_relation.localeCompare(b.referenced_relation) ||
43+
JSON.stringify(a.referenced_columns).localeCompare(JSON.stringify(b.referenced_columns))
44+
)
3945
const introspectionBySchema = Object.fromEntries<{
4046
tables: {
4147
table: Pick<PostgresTable, 'id' | 'name' | 'schema' | 'columns'>
@@ -97,19 +103,12 @@ export const apply = async ({
97103
GeneratorMetadata['relationships'][number],
98104
'foreign_key_name' | 'columns' | 'is_one_to_one' | 'referenced_relation' | 'referenced_columns'
99105
>[] {
100-
return relationships
101-
.filter(
102-
(relationship) =>
103-
relationship.schema === object.schema &&
104-
relationship.referenced_schema === object.schema &&
105-
relationship.relation === object.name
106-
)
107-
.toSorted(
108-
(a, b) =>
109-
a.foreign_key_name.localeCompare(b.foreign_key_name) ||
110-
a.referenced_relation.localeCompare(b.referenced_relation) ||
111-
JSON.stringify(a.referenced_columns).localeCompare(JSON.stringify(b.referenced_columns))
112-
)
106+
return relationships.filter(
107+
(relationship) =>
108+
relationship.schema === object.schema &&
109+
relationship.referenced_schema === object.schema &&
110+
relationship.relation === object.name
111+
)
113112
}
114113

115114
function generateRelationshiptTsDefinition(relationship: TsRelationship): string {

0 commit comments

Comments
 (0)