-
Notifications
You must be signed in to change notification settings - Fork 350
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
Provide more expressive exception for projections without properties. #1896
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,6 @@ | |
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
|
||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.context.annotation.ComponentScan; | ||
import org.springframework.context.annotation.Configuration; | ||
|
@@ -51,14 +50,12 @@ | |
@ExtendWith(SpringExtension.class) | ||
public class ProjectingRepositoryIntegrationTests { | ||
|
||
@Autowired | ||
private ImmutableObjectRepository repository; | ||
@Autowired private ImmutableObjectRepository repository; | ||
private JdbcTemplate jdbc; | ||
|
||
@Configuration | ||
@EnableR2dbcRepositories( | ||
includeFilters = @ComponentScan.Filter(value = ImmutableObjectRepository.class, type = FilterType.ASSIGNABLE_TYPE), | ||
considerNestedRepositories = true) | ||
@EnableR2dbcRepositories(includeFilters = @ComponentScan.Filter(value = ImmutableObjectRepository.class, | ||
type = FilterType.ASSIGNABLE_TYPE), considerNestedRepositories = true) | ||
static class TestConfiguration extends AbstractR2dbcConfiguration { | ||
@Override | ||
public ConnectionFactory connectionFactory() { | ||
|
@@ -74,9 +71,7 @@ void before() { | |
|
||
try { | ||
this.jdbc.execute("DROP TABLE immutable_non_null"); | ||
} | ||
catch (DataAccessException e) { | ||
} | ||
} catch (DataAccessException e) {} | ||
|
||
this.jdbc.execute("CREATE TABLE immutable_non_null (id serial PRIMARY KEY, name varchar(255), email varchar(255))"); | ||
this.jdbc.execute("INSERT INTO immutable_non_null VALUES (42, 'Walter', '[email protected]')"); | ||
|
@@ -100,8 +95,7 @@ protected ConnectionFactory createConnectionFactory() { | |
return H2TestSupport.createConnectionFactory(); | ||
} | ||
|
||
@Test | ||
// GH-1687 | ||
@Test // GH-1687 | ||
void shouldApplyProjectionDirectly() { | ||
|
||
repository.findProjectionByEmail("[email protected]") // | ||
|
@@ -111,8 +105,7 @@ void shouldApplyProjectionDirectly() { | |
}).verifyComplete(); | ||
} | ||
|
||
@Test | ||
// GH-1687 | ||
@Test // GH-1687 | ||
void shouldApplyEntityQueryProjectionDirectly() { | ||
|
||
repository.findAllByEmail("[email protected]") // | ||
|
@@ -134,8 +127,7 @@ interface ImmutableObjectRepository extends ReactiveCrudRepository<ImmutableNonN | |
@Table("immutable_non_null") | ||
static class ImmutableNonNullEntity implements Person { | ||
|
||
final @Nullable | ||
@Id Integer id; | ||
final @Nullable @Id Integer id; | ||
final String name; | ||
final String email; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
.../src/main/java/org/springframework/data/relational/core/sql/EmptySelectListException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Copyright 2024 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.data.relational.core.sql; | ||
|
||
/** | ||
* Exception denoting the absence of a select list from a query. | ||
* | ||
* @author Jens Schauder | ||
* @since 3.4 | ||
*/ | ||
public class EmptySelectListException extends IllegalStateException { | ||
public EmptySelectListException() { | ||
super("SELECT does not declare a select list"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the selection list empty in the first place? I'd assume that we pass-thru
ReturnedType.InputProperties
without checking whether these are empty.