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): several generation issues #1417

Merged
merged 2 commits into from
May 8, 2024
Merged

fix(delegate): several generation issues #1417

merged 2 commits into from
May 8, 2024

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented May 8, 2024

  • TS code compilation errors when delegate models don't have concrete sub types
  • Prisma schema error when a delegate model has relation to another delegate model

Fixes #1415 #1416

ymc9 added 2 commits May 8, 2024 21:59
- TS code compilation errors when delegate models don't have concrete sub types
- Prisma schema error when a delegate model has relation to another delegate model
Copy link
Contributor

coderabbitai bot commented May 8, 2024

Walkthrough

Walkthrough

The recent updates primarily focus on enhancing schema generation and error handling in the Prisma client. Changes include direct execution of prisma generate, adjustments in error handling without using try-catch blocks, and modifications to delegate model processing to ensure robustness in scenarios where delegate models don't have corresponding concrete models.

Changes

File Path Change Summary
.../enhancer/enhance/index.ts Adjusted error handling and execution order for prisma generate.
.../prisma/schema-generator.ts Added logic to skip fields from delegate models before generating auxiliary relation fields.
tests/regression/tests/issue-1415.test.ts Introduced regression tests for issues related to delegate models in schemas.
tests/regression/tests/issue-1416.test.ts Added tests focusing on schema loading for various models.

Assessment against linked issues

Objective Addressed Explanation
Allow delegating models to use @@map() without errors (#1167 Objective 1) It's unclear if @@map() specifically is addressed as changes focus on delegate model handling.
Correct handling of delegated relationships in generated schema (#1167 Objective 2) Changes might indirectly influence this, but specific handling of @@map() is not mentioned.
Resolve multiple fields referencing the same model without validation issues (#653) The changes do not specifically address issues with multiple references in a single model.
Address error in generating PrismaClient enhancer due to uniqueness constraints (#1058) No direct mention of handling map properties or uniqueness constraints in the PR.

Possibly related issues


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:

Note: Auto-reply has been disabled for this repository by the repository owner. 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.

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 a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @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 00250ea and a87ce61.
Files selected for processing (4)
  • packages/schema/src/plugins/enhancer/enhance/index.ts (2 hunks)
  • packages/schema/src/plugins/prisma/schema-generator.ts (1 hunks)
  • tests/regression/tests/issue-1415.test.ts (1 hunks)
  • tests/regression/tests/issue-1416.test.ts (1 hunks)
Files skipped from review due to trivial changes (1)
  • tests/regression/tests/issue-1415.test.ts
Additional comments not posted (3)
tests/regression/tests/issue-1416.test.ts (1)

3-37: The test case appears to correctly simulate the scenario described in issue 1416, focusing on delegate models and their relationships. The schema includes models with delegate relationships and inheritance, which are central to the issue.

packages/schema/src/plugins/enhancer/enhance/index.ts (1)

217-269: The logic for generating a logical Prisma client and handling typing fixes appears to be correctly implemented. The use of a temporary schema file and the cleanup process are well-handled, ensuring that resources are managed properly.

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

377-381: The adjustment to skip processing fields inherited from a delegate model before generating auxiliary opposite relation fields is a crucial change. This should effectively prevent the schema errors related to delegate relations that were previously occurring.

@ymc9 ymc9 merged commit 153dd4f into dev May 8, 2024
13 checks passed
@ymc9 ymc9 deleted the fix/issue-1415-1416 branch May 8, 2024 14:21
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