Skip to content

Commit fb6d8b2

Browse files
committed
fixing graphql as v5
1 parent ddfe78c commit fb6d8b2

2 files changed

Lines changed: 37 additions & 46 deletions

File tree

graphql/codegen/src/generators/field-selector.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ function getRelatedTableScalarFields(
319319

320320
// Always try to include stable identifiers first.
321321
push('id');
322+
push('rowId');
322323
push('nodeId');
323324

324325
for (const fieldName of preferred) push(fieldName);

graphql/react/src/use-schema-meta.ts

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ const fieldFragment = `
99
type {
1010
gqlType
1111
isArray
12-
modifier
13-
pgAlias
1412
pgType
15-
subtype
16-
typmod
13+
isNotNull
14+
hasDefault
1715
}
1816
`;
1917

@@ -36,12 +34,14 @@ const primaryConstraintsFragment = `
3634
}
3735
`;
3836

39-
const foreignKeyConstraintsFragments = `
37+
const foreignKeyConstraintsFragment = `
4038
foreignKeyConstraints {
4139
name
4240
fields {
4341
${fieldFragment}
4442
}
43+
referencedTable
44+
referencedFields
4545
refFields {
4646
${fieldFragment}
4747
}
@@ -53,28 +53,18 @@ const foreignKeyConstraintsFragments = `
5353

5454
const inflectionFragment = `
5555
inflection {
56+
tableType
5657
allRows
57-
allRowsSimple
58-
conditionType
5958
connection
60-
createField
61-
createInputType
62-
createPayloadType
63-
deleteByPrimaryKey
64-
deletePayloadType
6559
edge
66-
edgeField
67-
enumType
6860
filterType
69-
inputType
7061
orderByType
71-
patchField
62+
conditionType
7263
patchType
73-
tableFieldName
74-
tableType
75-
typeName
76-
updateByPrimaryKey
64+
createInputType
65+
createPayloadType
7766
updatePayloadType
67+
deletePayloadType
7868
}
7969
`;
8070

@@ -93,7 +83,7 @@ const metaQuery = gql`
9383
9484
${primaryConstraintsFragment}
9585
96-
${foreignKeyConstraintsFragments}
86+
${foreignKeyConstraintsFragment}
9787
9888
uniqueConstraints {
9989
name
@@ -112,9 +102,6 @@ const metaQuery = gql`
112102
}
113103
references {
114104
name
115-
fields {
116-
${fieldFragment}
117-
}
118105
}
119106
}
120107
has {
@@ -126,11 +113,6 @@ const metaQuery = gql`
126113
}
127114
referencedBy {
128115
name
129-
fields {
130-
${fieldFragment}
131-
}
132-
${primaryConstraintsFragment}
133-
${foreignKeyConstraintsFragments}
134116
}
135117
}
136118
hasMany {
@@ -142,11 +124,6 @@ const metaQuery = gql`
142124
}
143125
referencedBy {
144126
name
145-
fields {
146-
${fieldFragment}
147-
}
148-
${primaryConstraintsFragment}
149-
${foreignKeyConstraintsFragments}
150127
}
151128
}
152129
hasOne {
@@ -158,11 +135,6 @@ const metaQuery = gql`
158135
}
159136
referencedBy {
160137
name
161-
fields {
162-
${fieldFragment}
163-
}
164-
${primaryConstraintsFragment}
165-
${foreignKeyConstraintsFragments}
166138
}
167139
}
168140
manyToMany {
@@ -176,21 +148,39 @@ const metaQuery = gql`
176148
}
177149
junctionTable {
178150
name
151+
}
152+
junctionLeftConstraint {
153+
name
179154
fields {
180155
${fieldFragment}
181156
}
182-
${queryFragment}
183-
${primaryConstraintsFragment}
184-
${foreignKeyConstraintsFragments}
157+
refFields {
158+
${fieldFragment}
159+
}
160+
refTable {
161+
name
162+
}
185163
}
186-
rightTable {
164+
junctionRightConstraint {
187165
name
188166
fields {
189167
${fieldFragment}
190168
}
191-
${queryFragment}
192-
${primaryConstraintsFragment}
193-
${foreignKeyConstraintsFragments}
169+
refFields {
170+
${fieldFragment}
171+
}
172+
refTable {
173+
name
174+
}
175+
}
176+
junctionLeftKeyAttributes {
177+
${fieldFragment}
178+
}
179+
junctionRightKeyAttributes {
180+
${fieldFragment}
181+
}
182+
rightTable {
183+
name
194184
}
195185
}
196186
}

0 commit comments

Comments
 (0)