[BUG] - @Default properties are used in merge statement for h2 and override existing values

[belovaf]

Jimmer Version

0.9.64

JDK Version

23

Database

H2

OS

Mac

Expected behavior

merge sql using when matched syntax and updating only s1 property.

Actual behavior

merge sql overrides existing s2 value.

Description

merge should not override existing values with default ones in case of update.

Also jimmer includes all properties in update part of insert on conflict do nothing for postgres, which is unnecessary.

Reproduction steps

sql.save(A {
    name = "new_name"
    s1 = "new_value"
})

Generated SQL

merge into A(NAME, S1, S2) key(NAME) values(?, ?, ?), variables: [new_name, new_value, q2]

Relation Model

@Entity
@KeyUniqueConstraint
interface A : SerialId {
    @Key val name: String
    @Default("q1") val s1: String
    @Default("q2") val s2: String
}

Screenshots

No response

Logs

No response

[babyfish-ct]

Try 0.9.68