Skip to content

Commit 9093491

Browse files
committed
remove integer fix after the real fix 🛠️
1 parent 0a6d15b commit 9093491

File tree

7 files changed

+30
-54
lines changed

7 files changed

+30
-54
lines changed

packages/transform/__tests__/kitchen-sink/15-16/latest-postgres-create_aggregate.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ it('latest-postgres-create_aggregate', async () => {
5151
"latest/postgres/create_aggregate-45.sql",
5252
"latest/postgres/create_aggregate-46.sql",
5353
"latest/postgres/create_aggregate-47.sql",
54-
// "latest/postgres/create_aggregate-48.sql", // REMOVED: 15-16 transformer fails with Integer object differences
54+
"latest/postgres/create_aggregate-48.sql",
5555
"latest/postgres/create_aggregate-49.sql",
5656
"latest/postgres/create_aggregate-50.sql",
5757
"latest/postgres/create_aggregate-51.sql",

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-alter_generic.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ it('original-upstream-alter_generic', async () => {
1919
"original/upstream/alter_generic-13.sql",
2020
"original/upstream/alter_generic-14.sql",
2121
"original/upstream/alter_generic-15.sql",
22-
// "original/upstream/alter_generic-16.sql", // REMOVED: 15-16 transformer fails with Integer object differences
23-
// "original/upstream/alter_generic-17.sql", // REMOVED: 15-16 transformer fails with Integer object differences
22+
"original/upstream/alter_generic-16.sql",
23+
"original/upstream/alter_generic-17.sql",
2424
"original/upstream/alter_generic-18.sql",
2525
"original/upstream/alter_generic-19.sql",
2626
"original/upstream/alter_generic-20.sql",

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-arrays.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ it('original-upstream-arrays', async () => {
6565
"original/upstream/arrays-59.sql",
6666
"original/upstream/arrays-60.sql",
6767
"original/upstream/arrays-61.sql",
68-
// "original/upstream/arrays-62.sql", // REMOVED: 15-16 transformer fails with Integer object differences
68+
"original/upstream/arrays-62.sql",
6969
"original/upstream/arrays-63.sql",
7070
"original/upstream/arrays-64.sql",
7171
"original/upstream/arrays-65.sql",

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-date.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ it('original-upstream-date', async () => {
260260
"original/upstream/date-254.sql",
261261
"original/upstream/date-255.sql",
262262
"original/upstream/date-256.sql",
263-
// "original/upstream/date-257.sql", // REMOVED: 15-16 transformer fails with Integer object differences
263+
"original/upstream/date-257.sql",
264264
"original/upstream/date-258.sql",
265265
"original/upstream/date-259.sql",
266266
"original/upstream/date-260.sql"

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-json.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ it('original-upstream-json', async () => {
6767
"original/upstream/json-61.sql",
6868
"original/upstream/json-62.sql",
6969
"original/upstream/json-63.sql",
70-
// "original/upstream/json-64.sql", // REMOVED: 15-16 transformer fails with Integer object differences
70+
"original/upstream/json-64.sql",
7171
"original/upstream/json-65.sql",
7272
"original/upstream/json-66.sql",
7373
"original/upstream/json-67.sql",

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-updatable_views.test.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -307,28 +307,28 @@ it('original-upstream-updatable_views', async () => {
307307
"original/upstream/updatable_views-301.sql",
308308
"original/upstream/updatable_views-302.sql",
309309
"original/upstream/updatable_views-303.sql",
310-
// "original/upstream/updatable_views-304.sql", // REMOVED: 15-16 transformer fails with Integer object differences
311-
// "original/upstream/updatable_views-305.sql", // REMOVED: 15-16 transformer fails with Integer object differences
312-
// "original/upstream/updatable_views-306.sql", // REMOVED: 15-16 transformer fails with Integer object differences
313-
// "original/upstream/updatable_views-307.sql", // REMOVED: 15-16 transformer fails with Integer object differences
314-
// "original/upstream/updatable_views-308.sql", // REMOVED: 15-16 transformer fails with Integer object differences
315-
// "original/upstream/updatable_views-309.sql", // REMOVED: 15-16 transformer fails with Integer object differences
316-
// "original/upstream/updatable_views-310.sql", // REMOVED: 15-16 transformer fails with Integer object differences
317-
// "original/upstream/updatable_views-311.sql", // REMOVED: 15-16 transformer fails with Integer object differences
318-
// "original/upstream/updatable_views-312.sql", // REMOVED: 15-16 transformer fails with Integer object differences
319-
// "original/upstream/updatable_views-313.sql", // REMOVED: 15-16 transformer fails with Integer object differences
310+
"original/upstream/updatable_views-304.sql",
311+
"original/upstream/updatable_views-305.sql",
312+
"original/upstream/updatable_views-306.sql",
313+
"original/upstream/updatable_views-307.sql",
314+
"original/upstream/updatable_views-308.sql",
315+
"original/upstream/updatable_views-309.sql",
316+
"original/upstream/updatable_views-310.sql",
317+
"original/upstream/updatable_views-311.sql",
318+
"original/upstream/updatable_views-312.sql",
319+
"original/upstream/updatable_views-313.sql",
320320
"original/upstream/updatable_views-314.sql",
321321
"original/upstream/updatable_views-315.sql",
322322
"original/upstream/updatable_views-316.sql",
323323
"original/upstream/updatable_views-317.sql",
324-
// "original/upstream/updatable_views-318.sql", // REMOVED: 15-16 transformer fails with Integer object differences
324+
"original/upstream/updatable_views-318.sql",
325325
"original/upstream/updatable_views-319.sql",
326326
"original/upstream/updatable_views-320.sql",
327327
"original/upstream/updatable_views-321.sql",
328328
"original/upstream/updatable_views-322.sql",
329329
"original/upstream/updatable_views-323.sql",
330330
"original/upstream/updatable_views-324.sql",
331-
// "original/upstream/updatable_views-325.sql", // REMOVED: 15-16 transformer fails with Integer object differences
331+
"original/upstream/updatable_views-325.sql",
332332
"original/upstream/updatable_views-326.sql",
333333
"original/upstream/updatable_views-327.sql",
334334
"original/upstream/updatable_views-328.sql",
@@ -337,20 +337,20 @@ it('original-upstream-updatable_views', async () => {
337337
"original/upstream/updatable_views-331.sql",
338338
"original/upstream/updatable_views-332.sql",
339339
"original/upstream/updatable_views-333.sql",
340-
// "original/upstream/updatable_views-334.sql", // REMOVED: 15-16 transformer fails with Integer object differences
340+
"original/upstream/updatable_views-334.sql",
341341
"original/upstream/updatable_views-335.sql",
342342
"original/upstream/updatable_views-336.sql",
343343
"original/upstream/updatable_views-337.sql",
344344
"original/upstream/updatable_views-338.sql",
345345
"original/upstream/updatable_views-339.sql",
346346
"original/upstream/updatable_views-340.sql",
347347
"original/upstream/updatable_views-341.sql",
348-
// "original/upstream/updatable_views-342.sql", // REMOVED: 15-16 transformer fails with Integer object differences
348+
"original/upstream/updatable_views-342.sql",
349349
"original/upstream/updatable_views-343.sql",
350350
"original/upstream/updatable_views-344.sql",
351351
"original/upstream/updatable_views-345.sql",
352352
"original/upstream/updatable_views-346.sql",
353-
// "original/upstream/updatable_views-347.sql", // REMOVED: 15-16 transformer fails with Integer object differences
353+
"original/upstream/updatable_views-347.sql",
354354
"original/upstream/updatable_views-348.sql",
355355
"original/upstream/updatable_views-349.sql",
356356
"original/upstream/updatable_views-350.sql",
@@ -362,11 +362,11 @@ it('original-upstream-updatable_views', async () => {
362362
"original/upstream/updatable_views-356.sql",
363363
"original/upstream/updatable_views-357.sql",
364364
"original/upstream/updatable_views-358.sql",
365-
// "original/upstream/updatable_views-359.sql", // REMOVED: 15-16 transformer fails with Integer object differences
365+
"original/upstream/updatable_views-359.sql",
366366
"original/upstream/updatable_views-360.sql",
367-
// "original/upstream/updatable_views-361.sql", // REMOVED: 15-16 transformer fails with Integer object differences
367+
"original/upstream/updatable_views-361.sql",
368368
"original/upstream/updatable_views-362.sql",
369-
// "original/upstream/updatable_views-363.sql", // REMOVED: 15-16 transformer fails with Integer object differences
369+
"original/upstream/updatable_views-363.sql",
370370
"original/upstream/updatable_views-364.sql",
371371
"original/upstream/updatable_views-365.sql",
372372
"original/upstream/updatable_views-366.sql",
@@ -375,7 +375,7 @@ it('original-upstream-updatable_views', async () => {
375375
"original/upstream/updatable_views-369.sql",
376376
"original/upstream/updatable_views-370.sql",
377377
"original/upstream/updatable_views-371.sql",
378-
// "original/upstream/updatable_views-372.sql", // REMOVED: 15-16 transformer fails with Integer object differences
378+
"original/upstream/updatable_views-372.sql",
379379
"original/upstream/updatable_views-373.sql",
380380
"original/upstream/updatable_views-374.sql",
381381
"original/upstream/updatable_views-375.sql",
@@ -405,7 +405,7 @@ it('original-upstream-updatable_views', async () => {
405405
"original/upstream/updatable_views-399.sql",
406406
"original/upstream/updatable_views-400.sql",
407407
"original/upstream/updatable_views-401.sql",
408-
// "original/upstream/updatable_views-402.sql", // REMOVED: 15-16 transformer fails with Integer object differences
408+
"original/upstream/updatable_views-402.sql",
409409
"original/upstream/updatable_views-403.sql",
410410
"original/upstream/updatable_views-404.sql",
411411
"original/upstream/updatable_views-405.sql",
@@ -417,12 +417,12 @@ it('original-upstream-updatable_views', async () => {
417417
"original/upstream/updatable_views-411.sql",
418418
"original/upstream/updatable_views-412.sql",
419419
"original/upstream/updatable_views-413.sql",
420-
// "original/upstream/updatable_views-414.sql", // REMOVED: 15-16 transformer fails with Integer object differences
420+
"original/upstream/updatable_views-414.sql",
421421
"original/upstream/updatable_views-415.sql",
422422
"original/upstream/updatable_views-416.sql",
423423
"original/upstream/updatable_views-417.sql",
424424
"original/upstream/updatable_views-418.sql",
425-
// "original/upstream/updatable_views-419.sql", // REMOVED: 15-16 transformer fails with Integer object differences
425+
"original/upstream/updatable_views-419.sql",
426426
"original/upstream/updatable_views-420.sql",
427427
"original/upstream/updatable_views-421.sql",
428428
"original/upstream/updatable_views-422.sql",
@@ -549,10 +549,10 @@ it('original-upstream-updatable_views', async () => {
549549
"original/upstream/updatable_views-543.sql",
550550
"original/upstream/updatable_views-544.sql",
551551
"original/upstream/updatable_views-545.sql",
552-
// "original/upstream/updatable_views-546.sql", // REMOVED: 15-16 transformer fails with Integer object differences
552+
"original/upstream/updatable_views-546.sql",
553553
"original/upstream/updatable_views-547.sql",
554554
"original/upstream/updatable_views-548.sql",
555-
// "original/upstream/updatable_views-549.sql", // REMOVED: 15-16 transformer fails with Integer object differences
555+
"original/upstream/updatable_views-549.sql",
556556
"original/upstream/updatable_views-550.sql",
557557
"original/upstream/updatable_views-551.sql",
558558
"original/upstream/updatable_views-552.sql",

packages/transform/src/transformers/v15-to-v16.ts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -871,30 +871,6 @@ export class V15ToV16Transformer {
871871

872872
Integer(node: PG15.Integer, context: TransformerContext): { Integer: PG16.Integer } {
873873
const result: any = { ...node };
874-
875-
if (Object.keys(result).length === 0) {
876-
const parentTypes = context.parentNodeTypes || [];
877-
878-
if (parentTypes.includes('TypeName')) {
879-
result.ival = -1; // Based on alter_table test failure pattern and rangetypes-289 arrayBounds
880-
}
881-
// DefineStmt context: Only very specific cases from v14-to-v15
882-
else if (parentTypes.includes('DefineStmt')) {
883-
const defElemName = (context as any).defElemName;
884-
885-
// Only transform for very specific defElemName values that are documented in v14-to-v15
886-
if (defElemName === 'initcond') {
887-
result.ival = -100; // v14-to-v15 line 464: ival === 0 || ival === -100
888-
} else if (defElemName === 'sspace') {
889-
result.ival = 0; // v14-to-v15 line 468: ival === 0
890-
}
891-
// DefineStmt args context: empty Integer objects should transform to ival: -1
892-
else if (!defElemName) {
893-
result.ival = -1; // v14-to-v15 line 473: !defElemName && (ival === -1 || ival === 0), default to -1
894-
}
895-
}
896-
}
897-
898874
return { Integer: result };
899875
}
900876

0 commit comments

Comments
 (0)