Skip to content

Change Fetch First Rendered Syntax - Always use "rows" after "offset" #99

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 26, 2019
Merged

Change Fetch First Rendered Syntax - Always use "rows" after "offset" #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/org/mybatis/dynamic/sql/select/render/FetchFirstPagingModelRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@ private Optional<FragmentAndParameters> renderFetchFirstRowsOnly(Long fetchFirst
}

private Optional<FragmentAndParameters> renderOffsetOnly(Long offset) {
return FragmentAndParameters.withFragment("offset " + renderPlaceholder(OFFSET_PARAMETER)) //$NON-NLS-1$
return FragmentAndParameters.withFragment("offset " + renderPlaceholder(OFFSET_PARAMETER) //$NON-NLS-1$
+ " rows") //$NON-NLS-1$
.withParameter(OFFSET_PARAMETER, offset)
.buildOptional();
}

private Optional<FragmentAndParameters> renderOffsetAndFetchFirstRows(Long offset, Long fetchFirstRows) {
return FragmentAndParameters.withFragment("offset " + renderPlaceholder(OFFSET_PARAMETER) //$NON-NLS-1$
+ " fetch first " + renderPlaceholder(FETCH_FIRST_ROWS_PARAMETER) //$NON-NLS-1$
+ " rows fetch first " + renderPlaceholder(FETCH_FIRST_ROWS_PARAMETER) //$NON-NLS-1$
+ " rows only") //$NON-NLS-1$
.withParameter(OFFSET_PARAMETER, offset)
.withParameter(FETCH_FIRST_ROWS_PARAMETER, fetchFirstRows)
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/examples/animal/data/FetchFirstTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void testOffsetAndFetchFirstAfterFrom() {
assertAll(
() -> assertThat(records.size()).isEqualTo(3),
() -> assertThat(records.get(0).getId()).isEqualTo(23),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset} fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
Expand Down Expand Up @@ -125,7 +125,7 @@ public void testOffsetAndFetchFirstAfterWhere() {
assertAll(
() -> assertThat(records.size()).isEqualTo(3),
() -> assertThat(records.get(0).getId()).isEqualTo(45),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} offset #{parameters._offset} fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
Expand Down Expand Up @@ -171,7 +171,7 @@ public void testOffsetAndFetchFirstAfterOrderBy() {
assertAll(
() -> assertThat(records.size()).isEqualTo(3),
() -> assertThat(records.get(0).getId()).isEqualTo(23),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset} fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/examples/animal/data/LimitAndOffsetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void testOffsetOnlyAfterFrom() {
assertAll(
() -> assertThat(records.size()).isEqualTo(43),
() -> assertThat(records.get(0).getId()).isEqualTo(23),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset}"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset} rows"),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
}
Expand Down Expand Up @@ -191,7 +191,7 @@ public void testOffsetOnlyAfterWhere() {
assertAll(
() -> assertThat(records.size()).isEqualTo(27),
() -> assertThat(records.get(0).getId()).isEqualTo(23),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} offset #{parameters._offset}"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} offset #{parameters._offset} rows"),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
}
Expand Down Expand Up @@ -259,7 +259,7 @@ public void testOffsetOnlyAfterOrderBy() {
assertAll(
() -> assertThat(records.size()).isEqualTo(43),
() -> assertThat(records.get(0).getId()).isEqualTo(23),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset}"),
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset} rows"),
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/examples/groupby/GroupByTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void testOffsetOnlyAfterGroupBy() {
.build()
.render(RenderingStrategy.MYBATIS3);

String expected = "select last_name, count(*) as count from Person group by last_name offset #{parameters._offset}";
String expected = "select last_name, count(*) as count from Person group by last_name offset #{parameters._offset} rows";
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);

List<Map<String, Object>> rows = mapper.generalSelect(selectStatement);
Expand All @@ -279,7 +279,7 @@ public void testOffsetAndFetchFirstAfterGroupBy() {
.build()
.render(RenderingStrategy.MYBATIS3);

String expected = "select last_name, count(*) as count from Person group by last_name offset #{parameters._offset} fetch first #{parameters._fetchFirstRows} rows only";
String expected = "select last_name, count(*) as count from Person group by last_name offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only";
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);

List<Map<String, Object>> rows = mapper.generalSelect(selectStatement);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/examples/joins/JoinMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ public void testOffsetOnlyAfterJoin() {

String expectedStatment = "select ol.order_id, ol.quantity, im.item_id, im.description"
+ " from ItemMaster im left join OrderLine ol on ol.item_id = im.item_id"
+ " offset #{parameters._offset}";
+ " offset #{parameters._offset} rows";
assertThat(selectStatement.getSelectStatement()).isEqualTo(expectedStatment);

List<Map<String, Object>> rows = mapper.generalSelect(selectStatement);
Expand Down Expand Up @@ -630,7 +630,7 @@ public void testOffsetAndFetchFirstAfterJoin() {

String expectedStatment = "select ol.order_id, ol.quantity, im.item_id, im.description"
+ " from ItemMaster im left join OrderLine ol on ol.item_id = im.item_id"
+ " offset #{parameters._offset} fetch first #{parameters._fetchFirstRows} rows only";
+ " offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only";
assertThat(selectStatement.getSelectStatement()).isEqualTo(expectedStatment);

List<Map<String, Object>> rows = mapper.generalSelect(selectStatement);
Expand Down