Skip to content

fix(schema-engine): match implicit text casts #5856

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

Open
danez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(schema-engine): match implicit text casts #5856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion schema-engine/connectors/sql-schema-connector/src/flavour/postgres/schema_differ.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ fn idents_semantically_eq(a: &Ident, b: &Ident) -> bool {

// Compares two expressions that have already been normalized by `StripPgNormalization`.
fn exprs_semantically_eq(a: &Expr, b: &Expr) -> bool {
use sqlparser::ast::CastKind;
use sqlparser::ast::{CastKind, DataType};

if a == b {
return true;
Expand Down Expand Up @@ -839,6 +839,29 @@ fn exprs_semantically_eq(a: &Expr, b: &Expr) -> bool {
Expr::Value(va),
) if matches!(expr.as_ref(), Expr::Value(vb) if vb == va) => true,

// PG normalizes varchar column references with an implicit ::text cast.
(
inner,
Expr::Cast {
kind: CastKind::DoubleColon,
expr,
data_type: DataType::Text,
..
},
)
| (
Expr::Cast {
kind: CastKind::DoubleColon,
expr,
data_type: DataType::Text,
..
},
inner,
) if matches!(
expr.as_ref(),
Expr::Identifier(_) | Expr::CompoundIdentifier(_)
) => exprs_semantically_eq(inner, expr),

// Unwrap outer :: cast when inner is also a :: cast (PG annotation wrapping user cast).
(
inner,
Expand Down
29 changes: 29 additions & 0 deletions schema-engine/sql-migration-tests/tests/create_migration/create_migration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,35 @@ fn empty_migrations_should_not_be_created(api: TestApi) {
.assert_migration_directories_count(1);
}

#[test_connector(tags(Postgres), exclude(CockroachDb), preview_features("partialIndexes"))]
fn partial_unique_index_on_varchar_object_predicate_is_not_recreated(mut api: TestApi) {
let dm = api.datamodel_with_provider_and_features(
r#"
model ExternalMappingData {
tenantId String @db.VarChar(255)
mappingType String @db.VarChar(255)
externalId String @db.VarChar(4096)
caralegalId String @db.VarChar(4096)

@@id([tenantId, mappingType, externalId, caralegalId])
@@unique([tenantId, externalId], map: "ExternalMappingData_userId_tenantId_externalId_key", where: { mappingType: "userId", externalId: { not: "" } })
}
"#,
&[],
&["partialIndexes"],
);

let dir = api.create_migrations_directory();

api.create_migration("initial", &dm, &dir)
.send_sync()
.assert_migration_directories_count(1);

api.create_migration("no-op", &dm, &dir)
.send_sync()
.assert_migration_directories_count(1);
}

#[test_connector]
fn migration_name_length_is_validated(api: TestApi) {
let dm = api.datamodel_with_provider(
Expand Down