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.

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

bugfix: fix SQLServer-related SQL error when using database of SQLServer #6493

Merged

Conversation

TakeActionNow2019
Copy link
Contributor

@TakeActionNow2019 TakeActionNow2019 commented Apr 22, 2024

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

1.Fix the failure of seata server's starting because of SQL error in org.apache.seata.core.store.db.sql.lock.SqlServerLockStoreSql#INSERT_LOCK_SQL_SQLSERVER when using database SQLServer;

2.Fix the failure of querying TransactionInfo and GlobalLockInfo at seata server console when using database SQLServer;

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

TakeActionNow2019 added a commit to TakeActionNow2019/incubator-seata that referenced this pull request Apr 22, 2024
@TakeActionNow2019
Copy link
Contributor Author

@funky-eyes As your wish, I have merged the first two issues and then created a separate PR for them. Please help me review and merge it. Thanks a bunch!

@TakeActionNow2019
Copy link
Contributor Author

From #6477

@funky-eyes funky-eyes marked this pull request as ready for review April 23, 2024 01:18
@funky-eyes funky-eyes added this to the 2.1.0 milestone Apr 23, 2024
@funky-eyes funky-eyes added type: bug Category issues or prs related to bug. first-time contributor first-time contributor module/server server module labels Apr 23, 2024
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/home/runner/work/incubator-seata/incubator-seata/server/src/main/java/org/apache/seata/server/console/impl/db/GlobalLockDBServiceImpl.java:120:9: 'if' is not followed by whitespace. [WhitespaceAround]

TakeActionNow2019 added a commit to TakeActionNow2019/incubator-seata that referenced this pull request Apr 23, 2024
@TakeActionNow2019
Copy link
Contributor Author

@funky-eyes As your wish, I have fixed all issures mentioned above. Please help me review and merge it again! Thanks a million!

# Conflicts:
#	changes/en-us/2.x.md
#	changes/zh-cn/2.x.md
#	core/src/main/java/org/apache/seata/core/store/db/sql/lock/SqlServerLockStoreSql.java
#	script/server/db/sqlserver.sql
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please format the code blocks related to your changes to ensure that CI checks pass the code style validation

TakeActionNow2019 added a commit to TakeActionNow2019/incubator-seata that referenced this pull request Apr 25, 2024
@TakeActionNow2019
Copy link
Contributor Author

Please format the code blocks related to your changes to ensure that CI checks pass the code style validation

Done! Please review again! Thank you so much!

Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@funky-eyes funky-eyes merged commit 8c3224f into apache:2.x Apr 26, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-time contributor first-time contributor module/server server module type: bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants