github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#13486] Replace internal ConstantSortField by noField()

Browse Source
This commit is contained in:
Lukas Eder 2022-04-26 14:28:27 +02:00
parent 50bcf05986
commit 15fc42b979
2 changed files with 5 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ/src/main/java/org/jooq/impl/AbstractField.java
View File

@ -299,7 +299,7 @@ abstract class AbstractField<T> extends AbstractTypedNamed<T> implements Field<T
@Override
public final SortField<T> sort(SortOrder order) {
return new SortFieldImpl<>(this, order);
return this instanceof NoField ? (NoField<T>) this : new SortFieldImpl<>(this, order);
}
@Override
@ -337,13 +337,11 @@ abstract class AbstractField<T> extends AbstractTypedNamed<T> implements Field<T
}
@Override
public final <Z> SortField<Z> sort(Map<T, Z> sortMap) {
return sortMap == null || sortMap.isEmpty() ? sortConstant() : DSL.case_(this).mapValues(sortMap).asc();
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private final <Z> SortField<Z> sortConstant() {
return new SortFieldImpl<>(new ConstantSortField<>((Field) this), SortOrder.DEFAULT);
public final <Z> SortField<Z> sort(Map<T, Z> sortMap) {
return sortMap == null || sortMap.isEmpty()
? DSL.noField((Field) this).sortDefault()
: DSL.case_(this).mapValues(sortMap).asc();
}

89
jOOQ/src/main/java/org/jooq/impl/ConstantSortField.java
View File

@ -1,89 +0,0 @@
/*
* 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
*
* http://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.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.one;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.Keywords.K_NULL;
import static org.jooq.impl.Keywords.K_SELECT;
import org.jooq.Context;
import org.jooq.Field;
/**
* @author Lukas Eder
*/
final class ConstantSortField<T> extends CustomField<T> {
ConstantSortField(Field<T> field) {
super(field.getUnqualifiedName(), field.getDataType());
}
@Override
public void accept(Context<?> ctx) {
switch (ctx.family()) {
case DERBY:
case HSQLDB:
case POSTGRES:
case YUGABYTEDB:
ctx.sql('(').visit(select(one())).sql(')');
break;
default:
ctx.visit(DSL.NULL().sortDefault());
break;
}
}
}