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

   Pushed `d8ca35e66fa` on top of your branch, @zhang-arvin, to clear the merge 
conflict in `DmdbTypeConverter.java`.
   
   While resolving it I found that the production change of this PR has already 
landed on `dev` through #11684 (`5ffbce52b18`, "Support Dameng national 
character types in JDBC connector"): `DmdbTypeConverter` on `dev` already has 
`DM_NVARCHAR2` folded into the `NCHAR`/`NVARCHAR` case, and 
`DmdbTypeConverterTest` already has an `nvarchar2(2)` conversion test with the 
same assertions as `testNvarchar2` here. So I resolved the conflict by taking 
the `dev` version of both files and dropped the now-duplicate test method.
   
   What remains in this PR is the documentation note only: the `NVARCHAR2` line 
in `docs/en|zh/connectors/source/Jdbc.md` (+2/+2), which `dev` does not have 
yet. Whether to keep this PR open as a docs-only follow-up to #11684 or to 
close it is a call for the committers; from my side there is nothing left to 
change in it.


-- 
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