Skip to content

Commit

Permalink
upgrade DBFlute to 1.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
jflute committed Mar 29, 2018
1 parent 1ae486a commit 692a6d5
Show file tree
Hide file tree
Showing 33 changed files with 73 additions and 7 deletions.
2 changes: 0 additions & 2 deletions README.txt
Expand Up @@ -21,7 +21,6 @@ docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=MSSQL@ps' \
-p 1433:1433 --name mssqlflute \
-d microsoft/mssql-server-linux:2017-latest

(begin batch)
docker exec -it mssqlflute "bash"
/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'MSSQL@ps'
create database maihamadb
Expand All @@ -46,7 +45,6 @@ exec sp_addrolemember 'db_datawriter','maihamadb'
go
grant execute on SCHEMA::dbo to maihamadb
go
(end batch)

[remove]
docker stop mssqlflute
Expand Down
1 change: 1 addition & 0 deletions mydbflute/dbflute-1.x/build-torque.xml
Expand Up @@ -45,6 +45,7 @@

<!-- Embedded Libraries -->
<fileset dir="${torque.lib.dir}">
<exclude name="extlib/*.jar"/> <!-- not to be duplicate -->
<include name="**/*.jar"/>
</fileset>
</path>
Expand Down
Binary file modified mydbflute/dbflute-1.x/lib/dbflute-runtime.jar
Binary file not shown.
Binary file modified mydbflute/dbflute-1.x/lib/dbflute.jar
Binary file not shown.
Binary file removed mydbflute/dbflute-1.x/lib/h2-1.4.193.jar
Binary file not shown.
Binary file added mydbflute/dbflute-1.x/lib/h2-1.4.196.jar
Binary file not shown.
Expand Up @@ -4,7 +4,7 @@ It's a mark file!
DBFlute

[Product Version]
1.1.6
1.1.7

[Deploy Date]
2018-03-02 17:03:35.910
2018-03-30 02:58:13.179
14 changes: 14 additions & 0 deletions mydbflute/dbflute-1.x/templates/om/java/allcommon/DBFluteConfig.vm
Expand Up @@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.dbflute.bhv.core.context.mapping.MappingDateTimeZoneProvider;
import org.dbflute.bhv.core.supplement.SequenceCacheKeyGenerator;
import org.dbflute.cbean.garnish.SpecifyColumnRequiredExceptDeterminer;
import org.dbflute.cbean.cipher.GearedCipherManager;
import org.dbflute.cbean.sqlclause.SqlClauseCreator;
import org.dbflute.dbmeta.name.SqlNameFilter;
Expand Down Expand Up @@ -94,6 +95,7 @@ public class ${glDBFluteConfig} {
protected boolean _overridingQueryAllowed = ${database.isOverridingQueryAllowed()};
protected boolean _nonSpecifiedColumnAccessAllowed = ${database.isNonSpecifiedColumnAccessAllowed()};
protected boolean _specifyColumnRequired = ${database.isSpecifyColumnRequired()};
protected SpecifyColumnRequiredExceptDeterminer _specifyColumnRequiredExceptDeterminer;
protected boolean _columnNullObjectAllowed = ${database.isColumnNullObjectAllowed()};
protected boolean _columnNullObjectGearedToSpecify = ${database.isColumnNullObjectGearedToSpecify()};
protected boolean _datetimePrecisionTruncationOfCondition = ${database.isDatetimePrecisionTruncationOfCondition()};
Expand Down Expand Up @@ -363,6 +365,18 @@ public class ${glDBFluteConfig} {
_specifyColumnRequired = specifyColumnRequired;
}

public SpecifyColumnRequiredExceptDeterminer getSpecifyColumnRequiredExceptDeterminer() {
return _specifyColumnRequiredExceptDeterminer;
}

public void setSpecifyColumnRequiredExceptDeterminer(SpecifyColumnRequiredExceptDeterminer specifyColumnRequiredExceptDeterminer) {
assertUnlocked();
if (_log.isInfoEnabled()) {
_log.info("...Setting specifyColumnRequiredExceptDeterminer: " + specifyColumnRequiredExceptDeterminer);
}
_specifyColumnRequiredExceptDeterminer = specifyColumnRequiredExceptDeterminer;
}

// ===================================================================================
// Column Null Object
// ==================
Expand Down
Expand Up @@ -70,7 +70,7 @@ public class ${glImplementedInvokerAssistant} implements InvokerAssistant {
// Attribute
// =========
protected static final String[] DEFAULT_CLIENT_INVOKE_NAMES
= new String[] { "Page", "Action", "Controller", "ControllerImpl", "Task", "Test" };
= new String[] { "Page", "Action", "Controller", "ControllerImpl", "Job", "Task", "Test" };

protected static final String[] DEFAULT_BYPASS_INVOKE_NAMES
= new String[] { "Service", "ServiceImpl", "Facade", "FacadeImpl", "Logic", "LogicImpl" };
Expand Down
9 changes: 9 additions & 0 deletions mydbflute/dbflute-1.x/templates/om/java/bsbhv/BaseBhv.vm
Expand Up @@ -352,6 +352,9 @@ public abstract class ${myClassName} extends ${table.baseBehaviorExtendsClassNam
#end
* @throws EntityDuplicatedException When the entity has been duplicated.
* @throws SelectEntityConditionNotFoundException When the condition for selecting an entity is not found.
#if ($table.isDeprecatedSelectByPKUQ())
* @deprecated ${table.deprecatedSelectByPKUQComment}
#end
*/
public ${table.filterSelectByPKOptionalReturnIfNeeds($myExtendedObjectClassName)} selectByPK${table.selectByPKSuffix}(${table.primaryKeyArgsString}) {
return facadeSelectByPK${table.selectByPKSuffix}(${table.primaryKeyArgsCallingString});
Expand Down Expand Up @@ -381,6 +384,9 @@ public abstract class ${myClassName} extends ${table.baseBehaviorExtendsClassNam
* @throws EntityAlreadyDeletedException When the entity has already been deleted. (not found)
* @throws EntityDuplicatedException When the entity has been duplicated.
* @throws SelectEntityConditionNotFoundException When the condition for selecting an entity is not found.
#if ($table.isDeprecatedSelectByPKUQ())
* @deprecated ${table.deprecatedSelectByPKUQComment}
#end
*/
public ${myExtendedObjectClassName} selectByPK${table.selectByPKSuffix}WithDeletedCheck(${table.primaryKeyArgsString}) {
return doSelectByPKWithDeletedCheck(${table.primaryKeyArgsCallingString}, typeOfSelectedEntity());
Expand All @@ -405,6 +411,9 @@ public abstract class ${myClassName} extends ${table.baseBehaviorExtendsClassNam
* @throws EntityAlreadyDeletedException When get(), required() of return value is called and the value is null, which means entity has already been deleted (not found).
* @throws EntityDuplicatedException When the entity has been duplicated.
* @throws SelectEntityConditionNotFoundException When the condition for selecting an entity is not found.
#if ($table.isDeprecatedSelectByPKUQ())
* @deprecated ${table.deprecatedSelectByPKUQComment}
#end
*/
public ${table.filterSelectEntityOptionalReturn(${myExtendedObjectClassName})} selectByUniqueOf${uq.javaNameKeyword}(${uq.argsString}) {
return facadeSelectByUniqueOf${uq.javaNameKeyword}(${uq.argsCallingString});
Expand Down
11 changes: 11 additions & 0 deletions mydbflute/dbflute-1.x/templates/om/java/cbean/BsConditionBean.vm
Expand Up @@ -68,6 +68,7 @@ public class ${myClassName} extends AbstractConditionBean {
if (${glDBFluteConfig}.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(${glDBFluteConfig}.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (${glDBFluteConfig}.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down Expand Up @@ -528,8 +529,18 @@ public class ${myClassName} extends AbstractConditionBean {
* @return The information object of specified column. (NotNull)
*/
public SpecifiedColumn column${col.javaName}() { return doColumn("${col.name}"); }
#end
#if ($table.isDeprecatedSpecifyBatchColumn())
/**
* @deprecated ${table.deprecatedSpecifyBatchColumnComment}
*/
#end
public void everyColumn() { doEveryColumn(); }
#if ($table.isDeprecatedSpecifyBatchColumn())
/**
* @deprecated ${table.deprecatedSpecifyBatchColumnComment}
*/
#end
public void exceptRecordMetaColumn() { doExceptRecordMetaColumn(); }
@Override
protected void doSpecifyRequiredColumn() {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -13,7 +13,7 @@
<inceptionYear>2014</inceptionYear>

<properties>
<dbflute.version>1.1.6</dbflute.version>
<dbflute.version>1.1.7</dbflute.version>
<seasar.version>2.4.46</seasar.version>
<sqlserver.jdbc.version>1.0.0</sqlserver.jdbc.version>
<utflute.version>0.8.5</utflute.version>
Expand Down
Expand Up @@ -10,6 +10,7 @@
import org.slf4j.LoggerFactory;
import org.dbflute.bhv.core.context.mapping.MappingDateTimeZoneProvider;
import org.dbflute.bhv.core.supplement.SequenceCacheKeyGenerator;
import org.dbflute.cbean.garnish.SpecifyColumnRequiredExceptDeterminer;
import org.dbflute.cbean.cipher.GearedCipherManager;
import org.dbflute.cbean.sqlclause.SqlClauseCreator;
import org.dbflute.dbmeta.name.SqlNameFilter;
Expand Down Expand Up @@ -62,6 +63,7 @@ public class DBFluteConfig {
protected boolean _overridingQueryAllowed = true;
protected boolean _nonSpecifiedColumnAccessAllowed = true;
protected boolean _specifyColumnRequired = false;
protected SpecifyColumnRequiredExceptDeterminer _specifyColumnRequiredExceptDeterminer;
protected boolean _columnNullObjectAllowed = false;
protected boolean _columnNullObjectGearedToSpecify = false;
protected boolean _datetimePrecisionTruncationOfCondition = false;
Expand Down Expand Up @@ -296,6 +298,18 @@ public void setSpecifyColumnRequired(boolean specifyColumnRequired) {
_specifyColumnRequired = specifyColumnRequired;
}

public SpecifyColumnRequiredExceptDeterminer getSpecifyColumnRequiredExceptDeterminer() {
return _specifyColumnRequiredExceptDeterminer;
}

public void setSpecifyColumnRequiredExceptDeterminer(SpecifyColumnRequiredExceptDeterminer specifyColumnRequiredExceptDeterminer) {
assertUnlocked();
if (_log.isInfoEnabled()) {
_log.info("...Setting specifyColumnRequiredExceptDeterminer: " + specifyColumnRequiredExceptDeterminer);
}
_specifyColumnRequiredExceptDeterminer = specifyColumnRequiredExceptDeterminer;
}

// ===================================================================================
// Column Null Object
// ==================
Expand Down
Expand Up @@ -44,7 +44,7 @@ public class ImplementedInvokerAssistant implements InvokerAssistant {
// Attribute
// =========
protected static final String[] DEFAULT_CLIENT_INVOKE_NAMES
= new String[] { "Page", "Action", "Controller", "ControllerImpl", "Task", "Test" };
= new String[] { "Page", "Action", "Controller", "ControllerImpl", "Job", "Task", "Test" };

protected static final String[] DEFAULT_BYPASS_INVOKE_NAMES
= new String[] { "Service", "ServiceImpl", "Facade", "FacadeImpl", "Logic", "LogicImpl" };
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberAddressCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberLoginCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberSecurityCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberServiceCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsMemberStatusCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsMemberWithdrawalCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsProductCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsProductCategoryCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsProductStatusCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -47,6 +47,7 @@ public BsPurchaseCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsRegionCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsServiceRankCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsSummaryProductCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsSummaryWithdrawalCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsVendorCheckCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsVendorSymmetricCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsWhiteDelimiterCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down
Expand Up @@ -46,6 +46,7 @@ public BsWithdrawalReasonCB() {
if (DBFluteConfig.getInstance().isSpecifyColumnRequired()) {
enableSpecifyColumnRequired();
}
xsetSpecifyColumnRequiredExceptDeterminer(DBFluteConfig.getInstance().getSpecifyColumnRequiredExceptDeterminer());
if (DBFluteConfig.getInstance().isQueryUpdateCountPreCheck()) {
enableQueryUpdateCountPreCheck();
}
Expand Down

0 comments on commit 692a6d5

Please sign in to comment.