Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Fix @Where with ORDER BY query generation #2267

Merged
merged 3 commits into from
Mar 26, 2020

Conversation

s13o
Copy link
Contributor

@s13o s13o commented Mar 21, 2020

Integration test added.
Fixes: #2266.

@codecov
Copy link

codecov bot commented Mar 21, 2020

Codecov Report

Merging #2267 into master will increase coverage by 20.89%.
The diff coverage is 44.44%.

Impacted file tree graph

@@              Coverage Diff              @@
##             master    #2267       +/-   ##
=============================================
+ Coverage     51.64%   72.54%   +20.89%     
- Complexity       47     2055     +2008     
=============================================
  Files            17      258      +241     
  Lines           273     7462     +7189     
  Branches         33      761      +728     
=============================================
+ Hits            141     5413     +5272     
- Misses          117     1699     +1582     
- Partials         15      350      +335     
Flag Coverage Δ Complexity Δ
#unittests 72.54% <44.44%> (+20.89%) 2055.00 <2.00> (+2008.00)
Impacted Files Coverage Δ Complexity Δ
...data/spanner/repository/query/SqlSpannerQuery.java 85.03% <25.00%> (ø) 31.00 <0.00> (?)
...spanner/repository/query/AbstractSpannerQuery.java 44.11% <33.33%> (ø) 6.00 <2.00> (?)
...epository/query/SpannerStatementQueryExecutor.java 84.61% <100.00%> (ø) 68.00 <0.00> (?)
...sub/integration/outbound/PubSubMessageHandler.java 75.00% <0.00%> (ø) 17.00% <0.00%> (?%)
...urity/FirebaseAuthenticationAutoConfiguration.java 100.00% <0.00%> (ø) 5.00% <0.00%> (?%)
...re/mapping/SpannerPersistentEntityInformation.java 100.00% <0.00%> (ø) 3.00% <0.00%> (?%)
...store/repository/query/AbstractDatastoreQuery.java 73.68% <0.00%> (ø) 5.00% <0.00%> (?%)
...sitory/support/DatastoreRepositoryFactoryBean.java 83.33% <0.00%> (ø) 4.00% <0.00%> (?%)
...ta/spanner/core/mapping/SpannerMappingContext.java 100.00% <0.00%> (ø) 10.00% <0.00%> (?%)
...store/mapping/FirestorePersistentPropertyImpl.java 75.00% <0.00%> (ø) 3.00% <0.00%> (?%)
... and 234 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 dd584bc...e195caf. Read the comment docs.

@meltsufin meltsufin requested a review from dmitry-s March 23, 2020 14:15
@meltsufin meltsufin changed the title fix for #2266 Fix @Query with ORDER BY query generation Mar 23, 2020
@meltsufin meltsufin changed the title Fix @Query with ORDER BY query generation Fix @Where with ORDER BY query generation Mar 23, 2020
Copy link
Contributor

@dmitry-s dmitry-s left a comment

Choose a reason for hiding this comment

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

LGTM, but please add a test to verify the final sql string

@s13o s13o requested a review from dmitry-s March 26, 2020 00:41
Copy link
Contributor

@dmitry-s dmitry-s left a comment

Choose a reason for hiding this comment

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

LGTM

@meltsufin meltsufin merged commit 584100e into spring-attic:master Mar 26, 2020
@s13o s13o deleted the bugfix/2266 branch March 26, 2020 21:29
guillaumeblaquiere pushed a commit to guillaumeblaquiere/spring-cloud-gcp that referenced this pull request Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

The @Where is applied in wrong order at SpannerStatementQueryExecutor#applySortingPagingQueryOptions
3 participants