DanielLeens commented on PR #11485:
URL: https://github.com/apache/seatunnel/pull/11485#issuecomment-6538592510

   Merged `dev` (`3ac2d1cec6a`) into this branch with a plain merge commit (no 
rebase, no force push). New head: `20808462f06` (previous head `691c50090b`). 
Only formatting was run locally (module-scoped `spotless:apply`); `git diff 
origin/dev --name-status` lists only this PR's own 17 files and no deletions.
   
   Conflicts and resolution:
   - `JdbcFieldTypeUtils.java`: import-only conflict, kept 
`javax.annotation.Nullable` (from `dev`) and `java.lang.reflect.Method` (this 
PR).
   - `JdbcFieldTypeUtilsTest.java`: kept both the `DBTimestamp` import and 
`BigDecimal` import, and both test groups (this PR's Db2 `DBTimestamp` test and 
`dev`'s `getBigDecimal` tests), closing the adjacent methods properly. No 
assertion was removed or changed.
   - The four connector docs merged without conflict.
   
   PR description: added a short "Behavior change" paragraph acknowledging, as 
requested in the 2026-09-14 review (Issue 1), that mapping the generic JDBC 
`TIMESTAMP_WITH_TIMEZONE` type code to `TIMESTAMP_TZ` in `JdbcColumnConverter` 
is an intentional type-mapping correction; the rest of the description is 
unchanged.
   
   Compile and tests are left to the fork CI run per the validation policy 
(queued at the time of writing, no result claimed): 
https://github.com/DanielLeens/seatunnel/actions/runs/41164811654
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to