Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DONOT MERGE]fix: handle Enums correctly on Typescript data schema generation #2965

Draft
wants to merge 105 commits into
base: main
Choose a base branch
from
Draft

[DONOT MERGE]fix: handle Enums correctly on Typescript data schema generation #2965

wants to merge 105 commits into from

Conversation

tejas2008
Copy link
Contributor

@tejas2008 tejas2008 commented Oct 17, 2024 •
edited
Loading

Description of changes

  • Update Schema generator package to add handling of enums globally
  • Inside the model use ref() to define those enums
  • Added unit test to handle various combination of enum possibilities for Postgresql and mysql
CDK / CloudFormation Parameters Changed

Issue #, if available

#2596

Description of how you validated changes

  • Updated a current test snapshot
  • Added more unit tests to validate proper enum handling generating snapshots and passing tests.

Checklist

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

tejas2008 and others added 25 commits September 12, 2024 10:40
@tejas2008
added enums via ref for single models
3e4a3a2
@tejas2008
extended implementation to enums for multiple models and added filter…
7bc5b64 
… to fix undefined field
@tejas2008
added naming in npascal case
6161264
@tejas2008
added enum support for postgresql multiple models same enum
07535fa
@tejas2008
added unit tests to test working enum handling
3436237
@tejas2008
Merge branch 'aws-amplify:main' into Handle-enums-sql
6aed951
@tejas2008
added error handling for unsupported engines removed unused code and …
4030828 
…comments for more clarity
@tejas2008
variable naming updated for enums
c4f9b4d
@tejas2008
fix linting issues
c3d3ee1
@tejas2008
refactored code for readbility and updated unit tests
8227f72
@tejas2008
fixed linting issues
bb0a235
@tejas2008
updated one comment and fixed lint issue
5ab00c2
@tejas2008
fixed nit
b064a2d
@tejas2008
fixed nit naming
4e52a85
@tejas2008
fixed nit naming
2a88fb9
@tejas2008
lint errors fixed
3734e8f
@tejas2008
extracted api
94b0767
@tejas2008
Merge branch 'main' into Handle-enums-sql
c383ec5
@tejas2008
extracted api transformer common
47697f4
@tejas2008
Merge branch 'Handle-enums-sql' of https://github.com/tejas2008/ampli…
1b80f3b 
…fy-category-api into Handle-enums-sql
@tejas2008
helper lint
f11e13c
@tejas2008
lint fix
9b04649
@tejas2008
Merge branch 'main' of https://github.com/aws-amplify/amplify-categor…
19273c7 
…y-api into Handle-enums-sql
@tejas2008
chore: update .jsii assembly
0e24671
@tejas2008
chore: update .jsii assembly
1fe43f3
@tejas2008 tejas2008 requested review from a team as code owners October 17, 2024 20:21
amplify-data-ci and others added 24 commits October 29, 2024 16:01
@amplify-data-ci @tejas2008
chore: update .jsii assembly
1d49202
@amplify-data-ci @tejas2008
chore: update .jsii assembly
a422175
@tejas2008
updated postgresql enum naming
0199eeb
@dpilch @tejas2008
feat: import existing table to amplify managed table (#2634)
ac0492c
@dpilch @tejas2008
feat: get datasource map for migration (#2668)
867c356
@dpilch @tejas2008
feat: validate imported tables (#2696)
0f55f48
@dpilch @tejas2008
test: basic migration e2es (#2703)
21c4037
@dpilch @tejas2008
fix: adjust default table properties (#2726)
ea70f6d
@dpilch @tejas2008
feat: add overrideIndexName to configure index name (#2738)
1941b78
@dpilch @tejas2008
refactor: a few migration pr followups (#2753)
990a850 
* refactor: combine indexName assignment branches

* refactor: explicitly assign undefined in falsy condition for table validation

* docs: remove unnecessary comment
@dpilch @tejas2008
test: migration validation e2e (#2752)
981798a 
* test: add some migration validation tests

* test: override migration e2es to use ddb managed encryption

* chore: split e2e tests

* test: temp for testing

* Revert "test: temp for testing"

This reverts commit 84ff77b.
@dpilch @tejas2008
test: add additional migration validation test cases (#2792)
4e51d2a
@dpilch @tejas2008
Revert "feat: get datasource map for migration (#2668)" (#2907)
7ab0cd3 
This reverts commit 02c7da0.
@dpilch @tejas2008
fix: allowlist comparison properties on imported table (#2908)
89c3f71
@dpilch @tejas2008
feat: add metrics metadata for auth mode and custom operations (#2966)
e85f50f
@palpatim @tejas2008
fix: enable IAM auth for custom types (#2961) (#2971)
0a3b929
@p5quared @tejas2008
feat: generate ts schema from pg serial field (#2952)
cb2113b 
* chore: add missing types

* test: ts schema serial field gen happy case

* test: ts schema serial field gen sad cases

* chore: add DEFAULT_METHOD to TS schema constants

* feat: intepret pg serial fields in ts schema gen

* test: do not handle db provided int constants

* refactor: simpler serial field default condition

* test: pg string adapter sets model field correctly from a schema with a SERIAL field

* test: align text in template string

the text alignment was causing weird names in snaphot

* test: serial gen snapshots against all of getModels()

* refactor: extract sequence field identification logic

* chore: no-op change to force rebuild
@Siqi-Shan @tejas2008
chore: add region to sync with the lambda layer (#2973)
19d0734 
Signed-off-by: Kevin Shan <[email protected]>
@atierian @tejas2008
feat(conversation): enable update mutations on conversation model (#2948
a395e8d 
)
@palpatim @tejas2008
Revert "fix: enable IAM auth for custom types (#2961) (#2971)" (#2975)
f329f1e 
This reverts commit 0e003d2.
@dpilch @tejas2008
Revert "Merge pull request #2976 from aws-amplify/merge-main-to-migra…
bb2325a 
…tion"

This reverts commit 2f303b4, reversing
changes made to 8da7802.
@atierian @tejas2008
refactor(conversation): consolidate resolver generation logic (#2957)
9730c1b
@tejas2008
updated .jsii data-construct to merge conflict
ecf79ac
@tejas2008
rebased with main
a418d5e
@tejas2008 tejas2008 changed the title fix: handle Enums correctly on Typescript data schema generation [DONOT MERGE]fix: handle Enums correctly on Typescript data schema generation Oct 30, 2024
@tejas2008 tejas2008 marked this pull request as draft October 30, 2024 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sundersc sundersc sundersc left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@tejas2008 @sundersc @atierian @phani-srikar @dpilch @p5quared @palpatim @Siqi-Shan @amplify-data-ci @sobolk