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

fix(introspection-warnings): Change wording #4834

Merged
merged 3 commits into from May 14, 2024
Merged

fix(introspection-warnings): Change wording #4834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1d14e5
fix(introspection-warnings): Change wording
janpio Apr 23, 2024
7a9ecde
this => the
janpio May 13, 2024
6a0c59c
Merge branch 'main' into janpio/introspection-warning-rewording
janpio May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion schema-engine/connectors/schema-connector/src/warnings.rs
View file
Open in desktop
Expand Up @@ -298,7 +298,7 @@ impl fmt::Display for Warnings {
)?;

render_warnings(
"These items were renamed due to their names being duplicates in the Prisma Schema Language:",
"These items were renamed due to their names being duplicates in the Prisma schema:",
&self.duplicate_names,
f,
)?;
Expand Down
8 changes: 4 additions & 4 deletions schema-engine/sql-introspection-tests/tests/multi_schema/postgres.rs
View file
Open in desktop
Expand Up @@ -195,7 +195,7 @@ async fn multiple_schemas_w_duplicate_table_names_are_introspected(api: &mut Tes
let expected = expect![[r#"
*** WARNING ***

These items were renamed due to their names being duplicates in the Prisma Schema Language:
These items were renamed due to their names being duplicates in the Prisma schema:
- Type: "model", name: "first_A"
- Type: "model", name: "second_A"
"#]];
Expand Down Expand Up @@ -257,7 +257,7 @@ async fn multiple_schemas_w_duplicate_sanitized_table_names_are_introspected(api
let expected = expect![[r#"
*** WARNING ***

These items were renamed due to their names being duplicates in the Prisma Schema Language:
These items were renamed due to their names being duplicates in the Prisma schema:
- Type: "model", name: "first_2A"
- Type: "model", name: "second_1A"
"#]];
Expand Down Expand Up @@ -539,7 +539,7 @@ async fn multiple_schemas_w_duplicate_enums_are_introspected(api: &mut TestApi)
let expected = expect![[r#"
*** WARNING ***

These items were renamed due to their names being duplicates in the Prisma Schema Language:
These items were renamed due to their names being duplicates in the Prisma schema:
- Type: "enum", name: "first_HappyMood"
- Type: "enum", name: "second_HappyMood"
- Type: "model", name: "first_HappyPerson"
Expand Down Expand Up @@ -667,7 +667,7 @@ async fn multiple_schemas_w_duplicate_models_are_reintrospected_never_renamed(ap
let expected = expect![[r#"
*** WARNING ***

These items were renamed due to their names being duplicates in the Prisma Schema Language:
These items were renamed due to their names being duplicates in the Prisma schema:
- Type: "model", name: "second_HappyPerson"
"#]];

Expand Down
2 changes: 1 addition & 1 deletion schema-engine/sql-introspection-tests/tests/views/postgresql.rs
View file
Open in desktop
Expand Up @@ -1099,7 +1099,7 @@ async fn dupes_are_renamed(api: &mut TestApi) -> TestResult {
The following views were ignored as they do not have a valid unique identifier or id. This is currently not supported by Prisma Client. Please refer to the documentation on defining unique identifiers in views: https://pris.ly/d/view-identifiers
- "public_A"

These items were renamed due to their names being duplicates in the Prisma Schema Language:
These items were renamed due to their names being duplicates in the Prisma schema:
- Type: "model", name: "private_A"
- Type: "view", name: "public_A"
"#]];
Expand Down