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 use 'in' and 'between' in where condition for Oracle and Mysql #1699

Merged

Conversation

l81893521
Copy link
Contributor

@l81893521 l81893521 commented Sep 23, 2019

Ⅰ. Describe what this PR did

fix where condition like

delete from table where id in (1)

or

delete from table where id between 1 and 2

Ⅱ. Does this pull request fix one issue?

#1697 #1714

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Sep 23, 2019

Codecov Report

Merging #1699 into develop will increase coverage by 1.63%.
The diff coverage is 97.56%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1699      +/-   ##
=============================================
+ Coverage      48.42%   50.06%   +1.63%     
- Complexity      2036     2130      +94     
=============================================
  Files            409      411       +2     
  Lines          14234    14200      -34     
  Branches        1726     1713      -13     
=============================================
+ Hits            6893     7109     +216     
+ Misses          6633     6401     -232     
+ Partials         708      690      -18
Impacted Files Coverage Δ Complexity Δ
...ource/sql/druid/oracle/OracleInsertRecognizer.java 100% <ø> (+100%) 16 <0> (+16) ⬆️
...rm/datasource/sql/druid/MySQLInsertRecognizer.java 100% <ø> (+35%) 15 <0> (+8) ⬆️
.../seata/rm/datasource/sql/druid/BaseRecognizer.java 100% <ø> (+50%) 2 <0> (-1) ⬇️
.../druid/oracle/OracleSelectForUpdateRecognizer.java 100% <100%> (+100%) 9 <0> (+9) ⬆️
...rm/datasource/sql/druid/MySQLUpdateRecognizer.java 97.56% <100%> (+35.26%) 14 <0> (+4) ⬆️
...rm/datasource/sql/druid/MySQLDeleteRecognizer.java 100% <100%> (+25.8%) 6 <0> (ø) ⬇️
...urce/sql/druid/MySQLSelectForUpdateRecognizer.java 100% <100%> (+31.81%) 9 <0> (+2) ⬆️
...ource/sql/druid/oracle/OracleUpdateRecognizer.java 97.56% <100%> (+97.56%) 14 <0> (+14) ⬆️
...ource/sql/druid/oracle/OracleDeleteRecognizer.java 100% <100%> (+100%) 6 <0> (+6) ⬆️
...asource/sql/druid/oracle/BaseOracleRecognizer.java 97.14% <97.14%> (ø) 12 <12> (?)
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1833cbb...118ce56. Read the comment docs.

@l81893521 l81893521 changed the title bugfix: fix use 'in' and 'between' in where condition for Oracle bugfix: fix use 'in' and 'between' in where condition for Oracle and Mysql Sep 26, 2019
l81893521 and others added 6 commits September 27, 2019 11:21
…re_condition_oracle_1

# Conflicts:
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLDeleteRecognizer.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLSelectForUpdateRecognizer.java
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

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

LGTM

@xingfudeshi xingfudeshi self-requested a review October 11, 2019 09:37
Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

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

LGTM.

@xingfudeshi xingfudeshi merged commit 5b8e453 into apache:develop Oct 11, 2019
dangquocbang pushed a commit to dangquocbang/seata that referenced this pull request Oct 14, 2019
* 'develop' of https://github.com/seata/seata:
  test: enhance test coverage of seata common (apache#1755)
  security: upgrade jackson to avoid security vulnerabilities (apache#1756)
  bugfix:rm channel register null resource (apache#1401)
  bugfix:fix memory lock is not released due to hash conflict (apache#1751)
  optimize:use raw types instead of boxing types (apache#1747)
  change get charset (apache#1707)
  fix undo support oracle table meta cache (apache#1749)
  bugfix: fix use 'in' and 'between' in where condition for Oracle and Mysql (apache#1699)
  optimize:add some server's jvm parameters (apache#1738)
  Saga implementation base on state machine (apache#1608)
  optimize:inner class may be static (apache#1706)
  feature: retry when tm commit or rollback failed (apache#1739)
  optimize: abstract common undolog manager method (apache#1712)
  bugfix: when tm commit or rollback failed,xid need to be clean (apache#1735)
  optimize: eliminate the possibility of allocating too much direct memory (apache#1657)
  Based on Java 5 optimization (apache#1705)
  bugfix: oracle batch insert error (apache#1729)

# Conflicts:
#	pom.xml
@l81893521 l81893521 deleted the fix_in_between_where_condition_oracle branch October 16, 2019 02:24
@wangliang181230 wangliang181230 added this to the 0.9.0 milestone Aug 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants