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.

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

fix(delegate): generated logical prisma schema has errors when abstra… #1490

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented Jun 7, 2024

Fixes #1474

Copy link
Contributor

coderabbitai bot commented Jun 7, 2024

Walkthrough

Walkthrough

The changes enhance the handling of inherited fields and relationships in data models. By introducing new methods for traversing inheritance chains and refining logic for processing inherited fields, the updates ensure that polymorphic models with inherited relations are correctly recognized. This resolves issues related to inverse relationships in inherited models.

Changes

File Path Change Summary
.../validator/datamodel-validator.ts Added import for findUpInheritance, modified logic for inherited fields, and introduced a new method.
.../plugins/prisma/schema-generator.ts Refined logic for relation fields, added findUpMatchingFieldFromDelegate method.
.../utils/ast-utils.ts Added findUpInheritance function to traverse inheritance chains.
tests/regression/tests/issue-1474.test.ts Introduced a regression test case for issue 1474 regarding schema loading and model definitions.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant Validator as DataModelValidator
    participant Generator as PrismaSchemaGenerator
    participant Utils as ast-utils

    Validator->>Utils: Call findUpInheritance()
    Utils-->>Validator: Return inheritance path
    Validator->>Validator: Check if field is inherited
    Generator->>Utils: Call findUpMatchingFieldFromDelegate()
    Utils-->>Generator: Return base field
    Generator->>Generator: Process inherited fields
Loading

Assessment against linked issues

Objective Addressed Explanation
Correctly recognize inverse relationships in polymorphic models with inherited references (#1474)
Ensure no errors are raised when subclassing models with inherited references (#1474)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ba636c8 and 810070a.

Files selected for processing (4)
  • packages/schema/src/language-server/validator/datamodel-validator.ts (3 hunks)
  • packages/schema/src/plugins/prisma/schema-generator.ts (2 hunks)
  • packages/schema/src/utils/ast-utils.ts (1 hunks)
  • tests/regression/tests/issue-1474.test.ts (1 hunks)
Additional comments not posted (4)
tests/regression/tests/issue-1474.test.ts (1)

1-27: The test case correctly implements the schema for regression testing of issue #1474.

packages/schema/src/utils/ast-utils.ts (1)

299-314: The findUpInheritance function correctly implements the logic to walk up the inheritance chain, aligning with the PR objectives.

packages/schema/src/language-server/validator/datamodel-validator.ts (1)

18-18: The integration of isFieldInheritedFromDelegateModel enhances code maintainability by centralizing the inheritance logic.

Also applies to: 242-402

packages/schema/src/plugins/prisma/schema-generator.ts (1)

Line range hint 582-664: The findUpMatchingFieldFromDelegate method and related modifications correctly handle inherited fields and relations in the schema generation process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant