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.

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

Jump to bottom

add extraction condition methods in SqlEntityQuery #157

Merged
merged 6 commits into from
Feb 18, 2019
Merged

add extraction condition methods in SqlEntityQuery #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfddee6
Work In Progress.
HidekiSugimoto189 Feb 11, 2019
5821d88
- fix change request.
HidekiSugimoto189 Feb 16, 2019
675e5f8
- fix change request.
HidekiSugimoto189 Feb 16, 2019
2a49f30
fix review
HidekiSugimoto189 Feb 17, 2019
29d008d
fix review
HidekiSugimoto189 Feb 17, 2019
6d55d42
fix javadoc comment
HidekiSugimoto189 Feb 17, 2019
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
15 changes: 8 additions & 7 deletions src/main/java/jp/co/future/uroborosql/AbstractAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jp.co.future.uroborosql.config.SqlConfig;
import jp.co.future.uroborosql.context.SqlContext;
import jp.co.future.uroborosql.coverage.CoverageData;
Expand All @@ -47,10 +51,6 @@
import jp.co.future.uroborosql.utils.CaseFormat;
import jp.co.future.uroborosql.utils.StringFunction;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* SqlAgentの抽象親クラス
*
Expand Down Expand Up @@ -294,7 +294,8 @@ protected void transformContext(final SqlContext sqlContext, final boolean isQue
}

LOG.trace("Template SQL[{}{}{}]", System.lineSeparator(), originalSql, System.lineSeparator());
LOG.debug("Executed SQL[{}{}{}]", System.lineSeparator(), sqlContext.getExecutableSql(), System.lineSeparator());
LOG.debug("Executed SQL[{}{}{}]", System.lineSeparator(), sqlContext.getExecutableSql(),
System.lineSeparator());
}

/**
Expand Down Expand Up @@ -609,9 +610,9 @@ public <E> SqlEntityQuery<E> query(final Class<? extends E> entityType) {
try {
TableMetadata metadata = handler.getMetadata(this.transactionManager, entityType);

SqlContext context = handler.createSelectContext(this, metadata, entityType);
SqlContext context = handler.createSelectContext(this, metadata, entityType, false);

return new SqlEntityQueryImpl<>(this, handler, context, entityType);
return new SqlEntityQueryImpl<>(this, handler, metadata, context, entityType);
} catch (SQLException e) {
throw new EntitySqlRuntimeException(EntitySqlRuntimeException.EntityProcKind.SELECT, e);
}
Expand Down
29 changes: 15 additions & 14 deletions src/main/java/jp/co/future/uroborosql/SqlAgentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import org.apache.commons.lang3.time.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;

import jp.co.future.uroborosql.config.SqlConfig;
import jp.co.future.uroborosql.context.SqlContext;
import jp.co.future.uroborosql.context.SqlContextImpl;
Expand All @@ -39,11 +44,6 @@
import jp.co.future.uroborosql.parameter.Parameter;
import jp.co.future.uroborosql.utils.CaseFormat;

import org.apache.commons.lang3.time.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;

/**
* SQL実行用クラス。
*
Expand Down Expand Up @@ -118,7 +118,8 @@ public ResultSet query(final SqlContext sqlContext) throws SQLException {
if (maxRetryCount > 0 && getSqlConfig().getDialect().isRollbackToSavepointBeforeRetry()) {
setSavepoint(RETRY_SAVEPOINT_NAME);
}
rs = new InnerResultSet(getSqlFilterManager().doQuery(sqlContext, stmt, stmt.executeQuery()), stmt);
rs = new InnerResultSet(getSqlFilterManager().doQuery(sqlContext, stmt, stmt.executeQuery()),
stmt);
stmt.closeOnCompletion();
return rs;
} catch (SQLException ex) {
Expand Down Expand Up @@ -154,7 +155,7 @@ public ResultSet query(final SqlContext sqlContext) throws SQLException {
}
} while (maxRetryCount > loopCount++);
} catch (SQLException | RuntimeException e) {
if(rs != null && !rs.isClosed()) {
if (rs != null && !rs.isClosed()) {
rs.close();
}
throw e;
Expand Down Expand Up @@ -571,15 +572,15 @@ protected void handleException(final SqlContext sqlContext, final SQLException e
if (LOG.isErrorEnabled() && isOutputExceptionLog()) {
StringBuilder builder = new StringBuilder();
builder.append(System.lineSeparator()).append("Exception occurred in SQL execution.")
.append(System.lineSeparator());
.append(System.lineSeparator());
builder.append("Executed SQL[").append(sqlContext.getExecutableSql()).append("]")
.append(System.lineSeparator());
.append(System.lineSeparator());
if (sqlContext instanceof SqlContextImpl) {
Parameter[] bindParameters = ((SqlContextImpl) sqlContext).getBindParameters();
for (int i = 0; i < bindParameters.length; i++) {
Parameter parameter = getSqlFilterManager().doParameter(bindParameters[i]);
builder.append("Bind Parameter.[INDEX[").append(i + 1).append("], ").append(parameter.toString())
.append("]").append(System.lineSeparator());
.append("]").append(System.lineSeparator());
}
}
LOG.error(builder.toString(), cause);
Expand Down Expand Up @@ -631,7 +632,7 @@ public <E> Optional<E> find(final Class<? extends E> entityType, final Object...
params.put(keyNames[i], keys[i]);
}

SqlContext context = handler.createSelectContext(this, metadata, entityType);
SqlContext context = handler.createSelectContext(this, metadata, entityType, true);
context.paramMap(params);

try (Stream<E> stream = handler.doSelect(this, context, entityType)) {
Expand Down Expand Up @@ -684,7 +685,7 @@ public int update(final Object entity) {
try {
Class<?> type = entity.getClass();
TableMetadata metadata = handler.getMetadata(this.transactionManager, type);
SqlContext context = handler.createUpdateContext(this, metadata, type);
SqlContext context = handler.createUpdateContext(this, metadata, type, true);
handler.setUpdateParams(context, entity);
int count = handler.doUpdate(this, context, entity);

Expand Down Expand Up @@ -714,7 +715,7 @@ public int delete(final Object entity) {
try {
Class<?> type = entity.getClass();
TableMetadata metadata = handler.getMetadata(this.transactionManager, type);
SqlContext context = handler.createDeleteContext(this, metadata, type);
SqlContext context = handler.createDeleteContext(this, metadata, type, true);
handler.setDeleteParams(context, entity);
return handler.doDelete(this, context, entity);
} catch (SQLException e) {
Expand Down Expand Up @@ -873,7 +874,7 @@ public boolean tryAdvance(final Consumer<? super T> action) {
*/
private static class InnerResultSet extends AbstractResultSetWrapper {
/** 同期してクローズするStatement */
private Statement stmt;
private final Statement stmt;

/**
* コンストラクタ
Expand Down
Loading