svnno****@sourc*****
svnno****@sourc*****
2007年 10月 5日 (金) 18:10:12 JST
Revision: 606
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=606
Author: shinsuke
Date: 2007-10-05 18:10:11 +0900 (Fri, 05 Oct 2007)
Log Message:
-----------
added payment type for card info.
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-05 09:10:11 UTC (rev 606)
@@ -387,6 +387,8 @@
required="true" size="255" type="VARCHAR"/>
<column dbType="VARCHAR" javaType="String" name="CARD_EXPIRES"
required="true" size="255" type="VARCHAR"/>
+ <column dbType="VARCHAR" javaType="String"
+ name="CARD_PAYMENT_TYPE" size="64" type="VARCHAR"/>
</table>
<table name="ORDER_COMMENT" schema="APP" type="TABLE">
<column dbType="BIGINT" javaType="java.math.BigDecimal"
Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-05 09:10:11 UTC (rev 606)
@@ -4270,6 +4270,13 @@
<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
</data-type>
</column>
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CARD_PAYMENT_TYPE" remarks="" uid="8c07e:1156f63c279:-7fce">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
</column-list>
<primary-key alias="" name="PK_ORDER_CARD_INFO" remarks="" uid="1350e24:11525502e7d:-7e47">
<primary-key-description></primary-key-description>
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -28,7 +28,7 @@
* ORDER_CARD_INFO_ID
*
* [column-property]
- * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE
*
* [foreign-property]
*
@@ -643,6 +643,7 @@
if (names.contains("cardOwner")) { destinationMyEntity.setCardOwner(sourceMyEntity.getCardOwner()); }
if (names.contains("cardNumber")) { destinationMyEntity.setCardNumber(sourceMyEntity.getCardNumber()); }
if (names.contains("cardExpires")) { destinationMyEntity.setCardExpires(sourceMyEntity.getCardExpires()); }
+ if (names.contains("cardPaymentType")) { destinationMyEntity.setCardPaymentType(sourceMyEntity.getCardPaymentType()); }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -11,7 +11,7 @@
* ORDER_CARD_INFO_ID
*
* [column-property]
- * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE
*
* [foreign-property]
*
@@ -51,7 +51,7 @@
public int getCountAll();
/** SQL-Annotation for getListAll(). */
- public static final String getListAll_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO";
+ public static final String getListAll_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE from ORDER_CARD_INFO";
/**
* Get list as all.
@@ -61,7 +61,7 @@
public java.util.List<OrderCardInfo> getListAll();
/** SQL-Annotation for getEntity(). */
- public static final String getEntity_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO where ORDER_CARD_INFO.ORDER_CARD_INFO_ID = /*orderCardInfoId*/null";
+ public static final String getEntity_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE from ORDER_CARD_INFO where ORDER_CARD_INFO.ORDER_CARD_INFO_ID = /*orderCardInfoId*/null";
/** Args-Annotation for getEntity(). */
public static final String getEntity_ARGS = "orderCardInfoId";
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -14,7 +14,7 @@
* ORDER_CARD_INFO_ID
*
* [column-property]
- * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE
*
* [foreign-property]
*
@@ -72,6 +72,9 @@
/** The value of cardExpires. VARCHAR(255) : NotNull */
protected String _cardExpires;
+ /** The value of cardPaymentType. VARCHAR(64) */
+ protected String _cardPaymentType;
+
// ===================================================================================
// Constructor
// ===========
@@ -257,20 +260,44 @@
this._cardExpires = cardExpires;
}
+ /** Column Annotation for S2Dao. VARCHAR(64) */
+ public static final String cardPaymentType_COLUMN = "CARD_PAYMENT_TYPE";
+ /**
+ * Get the value of cardPaymentType. <br />
+ * {VARCHAR(64)}
+ *
+ * @return The value of cardPaymentType. (Nullable)
+ */
+ public String getCardPaymentType() {
+ return _cardPaymentType;
+ }
+
+ /**
+ * Set the value of cardPaymentType. <br />
+ * {VARCHAR(64)}
+ *
+ * @param cardPaymentType The value of cardPaymentType. (Nullable)
+ */
+ public void setCardPaymentType(String cardPaymentType) {
+ _modifiedProperties.addPropertyName("cardPaymentType");
+ this._cardPaymentType = cardPaymentType;
+ }
+
+
// ===================================================================================
// Classify Method
// ===============
-
+
// ===================================================================================
// Classification Determination
// ============================
-
+
// ===================================================================================
// Classification Getter
// =====================
-
+
// ===================================================================================
// Foreign Table
@@ -382,6 +409,7 @@
sb.append(delimiter).append(getCardOwner());
sb.append(delimiter).append(getCardNumber());
sb.append(delimiter).append(getCardExpires());
+ sb.append(delimiter).append(getCardPaymentType());
sb.delete(0, delimiter.length());
sb.insert(0, "{").append("}");
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -16,7 +16,7 @@
* ORDER_CARD_INFO_ID
*
* [column-property]
- * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE
*
* [foreign-property]
*
@@ -103,6 +103,8 @@
public static final String DB_NAME_CARD_NUMBER = "CARD_NUMBER";
/** Db-name of CARD_EXPIRES. VARCHAR(255) : NotNull */
public static final String DB_NAME_CARD_EXPIRES = "CARD_EXPIRES";
+ /** Db-name of CARD_PAYMENT_TYPE. VARCHAR(64) */
+ public static final String DB_NAME_CARD_PAYMENT_TYPE = "CARD_PAYMENT_TYPE";
/** @deprecated Deprecated! So use DB_NAME_OrderCardInfoId. */
public static final String COLUMN_DB_NAME_OF_OrderCardInfoId = "ORDER_CARD_INFO_ID";
@@ -114,6 +116,8 @@
public static final String COLUMN_DB_NAME_OF_CardNumber = "CARD_NUMBER";
/** @deprecated Deprecated! So use DB_NAME_CardExpires. */
public static final String COLUMN_DB_NAME_OF_CardExpires = "CARD_EXPIRES";
+ /** @deprecated Deprecated! So use DB_NAME_CardPaymentType. */
+ public static final String COLUMN_DB_NAME_OF_CardPaymentType = "CARD_PAYMENT_TYPE";
// -----------------------------------------------------
// Column Prop-Name(JavaBeansRule)
@@ -128,6 +132,8 @@
public static final String PROPERTY_NAME_cardNumber = "cardNumber";
/** Prop-name(JavaBeansRule) of cardExpires. VARCHAR(255) : NotNull */
public static final String PROPERTY_NAME_cardExpires = "cardExpires";
+ /** Prop-name(JavaBeansRule) of cardPaymentType. VARCHAR(64) */
+ public static final String PROPERTY_NAME_cardPaymentType = "cardPaymentType";
// -----------------------------------------------------
// Column Cap-Prop-Name
@@ -142,6 +148,8 @@
public static final String CAP_PROP_NAME_CardNumber = "CardNumber";
/** Cap-prop-name of cardExpires. VARCHAR(255) : NotNull */
public static final String CAP_PROP_NAME_CardExpires = "CardExpires";
+ /** Cap-prop-name of cardPaymentType. VARCHAR(64) */
+ public static final String CAP_PROP_NAME_CardPaymentType = "CardPaymentType";
/** @deprecated Deprecated! So use CAP_PROP_NAME_OrderCardInfoId. */
public static final String COLUMN_CAP_PROP_NAME_OF_OrderCardInfoId = "OrderCardInfoId";
@@ -153,6 +161,8 @@
public static final String COLUMN_CAP_PROP_NAME_OF_CardNumber = "CardNumber";
/** @deprecated Deprecated! So use CAP_PROP_NAME_CardExpires. */
public static final String COLUMN_CAP_PROP_NAME_OF_CardExpires = "CardExpires";
+ /** @deprecated Deprecated! So use CAP_PROP_NAME_CardPaymentType. */
+ public static final String COLUMN_CAP_PROP_NAME_OF_CardPaymentType = "CardPaymentType";
// -----------------------------------------------------
// Column Uncap-Prop-Name
@@ -167,6 +177,8 @@
public static final String UNCAP_PROP_NAME_cardNumber = "cardNumber";
/** Uncap-prop-name of cardExpires. VARCHAR(255) : NotNull */
public static final String UNCAP_PROP_NAME_cardExpires = "cardExpires";
+ /** Uncap-prop-name of cardPaymentType. VARCHAR(64) */
+ public static final String UNCAP_PROP_NAME_cardPaymentType = "cardPaymentType";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderCardInfoId. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderCardInfoId = "orderCardInfoId";
@@ -178,6 +190,8 @@
public static final String COLUMN_UNCAP_PROP_NAME_OF_CardNumber = "cardNumber";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardExpires. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_CardExpires = "cardExpires";
+ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardPaymentType. */
+ public static final String COLUMN_UNCAP_PROP_NAME_OF_CardPaymentType = "cardPaymentType";
// -----------------------------------------------------
// Foreign Name
@@ -203,6 +217,7 @@
map.put(DB_NAME_CARD_OWNER.toLowerCase(), PROPERTY_NAME_cardOwner);
map.put(DB_NAME_CARD_NUMBER.toLowerCase(), PROPERTY_NAME_cardNumber);
map.put(DB_NAME_CARD_EXPIRES.toLowerCase(), PROPERTY_NAME_cardExpires);
+ map.put(DB_NAME_CARD_PAYMENT_TYPE.toLowerCase(), PROPERTY_NAME_cardPaymentType);
_dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
return _dbNamePropertyNameKeyToLowerMap;
@@ -222,6 +237,7 @@
map.put(PROPERTY_NAME_cardOwner.toLowerCase(), DB_NAME_CARD_OWNER);
map.put(PROPERTY_NAME_cardNumber.toLowerCase(), DB_NAME_CARD_NUMBER);
map.put(PROPERTY_NAME_cardExpires.toLowerCase(), DB_NAME_CARD_EXPIRES);
+ map.put(PROPERTY_NAME_cardPaymentType.toLowerCase(), DB_NAME_CARD_PAYMENT_TYPE);
_propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
return _propertyNameDbNameKeyToLowerMap;
@@ -243,6 +259,7 @@
map.put(DB_NAME_CARD_OWNER, CAP_PROP_NAME_CardOwner);
map.put(DB_NAME_CARD_NUMBER, CAP_PROP_NAME_CardNumber);
map.put(DB_NAME_CARD_EXPIRES, CAP_PROP_NAME_CardExpires);
+ map.put(DB_NAME_CARD_PAYMENT_TYPE, CAP_PROP_NAME_CardPaymentType);
_dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
return _dbNameCapPropNameMap;
@@ -264,6 +281,7 @@
map.put(DB_NAME_CARD_OWNER, UNCAP_PROP_NAME_cardOwner);
map.put(DB_NAME_CARD_NUMBER, UNCAP_PROP_NAME_cardNumber);
map.put(DB_NAME_CARD_EXPIRES, UNCAP_PROP_NAME_cardExpires);
+ map.put(DB_NAME_CARD_PAYMENT_TYPE, UNCAP_PROP_NAME_cardPaymentType);
_dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
return _dbNameUncapPropNameMap;
@@ -285,6 +303,7 @@
map.put(CAP_PROP_NAME_CardOwner, DB_NAME_CARD_OWNER);
map.put(CAP_PROP_NAME_CardNumber, DB_NAME_CARD_NUMBER);
map.put(CAP_PROP_NAME_CardExpires, DB_NAME_CARD_EXPIRES);
+ map.put(CAP_PROP_NAME_CardPaymentType, DB_NAME_CARD_PAYMENT_TYPE);
_capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
return _capPropNameDbNameMap;
@@ -306,6 +325,7 @@
map.put(CAP_PROP_NAME_CardOwner, UNCAP_PROP_NAME_cardOwner);
map.put(CAP_PROP_NAME_CardNumber, UNCAP_PROP_NAME_cardNumber);
map.put(CAP_PROP_NAME_CardExpires, UNCAP_PROP_NAME_cardExpires);
+ map.put(CAP_PROP_NAME_CardPaymentType, UNCAP_PROP_NAME_cardPaymentType);
_capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
return _capPropNameUncapPropNameMap;
@@ -327,6 +347,7 @@
map.put(UNCAP_PROP_NAME_cardOwner, DB_NAME_CARD_OWNER);
map.put(UNCAP_PROP_NAME_cardNumber, DB_NAME_CARD_NUMBER);
map.put(UNCAP_PROP_NAME_cardExpires, DB_NAME_CARD_EXPIRES);
+ map.put(UNCAP_PROP_NAME_cardPaymentType, DB_NAME_CARD_PAYMENT_TYPE);
_uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
return _uncapPropNameDbNameMap;
@@ -348,6 +369,7 @@
map.put(UNCAP_PROP_NAME_cardOwner, CAP_PROP_NAME_CardOwner);
map.put(UNCAP_PROP_NAME_cardNumber, CAP_PROP_NAME_CardNumber);
map.put(UNCAP_PROP_NAME_cardExpires, CAP_PROP_NAME_CardExpires);
+ map.put(UNCAP_PROP_NAME_cardPaymentType, CAP_PROP_NAME_CardPaymentType);
_uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
return _uncapPropNameCapPropNameMap;
@@ -561,6 +583,7 @@
columnInfoList.add(columnCardOwner());
columnInfoList.add(columnCardNumber());
columnInfoList.add(columnCardExpires());
+ columnInfoList.add(columnCardPaymentType());
return columnInfoList;
}
@@ -616,7 +639,7 @@
* @deprecated Please use getColumnInfoList()
*/
public String getColumnDbNameCommaString() {
- return "ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES";
+ return "ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE";
}
/**
@@ -649,6 +672,12 @@
public ColumnInfo columnCardExpires() {
return new ColumnInfo(this, "CARD_EXPIRES", "cardExpires", String.class, false);
}
+ /**
+ * @return Column information of cardPaymentType. (NotNull)
+ */
+ public ColumnInfo columnCardPaymentType() {
+ return new ColumnInfo(this, "CARD_PAYMENT_TYPE", "cardPaymentType", String.class, false);
+ }
// ===================================================================================
// Unique Info
@@ -752,6 +781,7 @@
public RelationTrace columnCardOwner() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardOwner()); }
public RelationTrace columnCardNumber() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardNumber()); }
public RelationTrace columnCardExpires() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardExpires()); }
+ public RelationTrace columnCardPaymentType() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardPaymentType()); }
}
// ===================================================================================
@@ -827,6 +857,7 @@
if (analyzer.init("CARD_OWNER", "cardOwner", "cardOwner")) { myEntity.setCardOwner(analyzer.analyzeString(String.class)); };
if (analyzer.init("CARD_NUMBER", "cardNumber", "cardNumber")) { myEntity.setCardNumber(analyzer.analyzeString(String.class)); };
if (analyzer.init("CARD_EXPIRES", "cardExpires", "cardExpires")) { myEntity.setCardExpires(analyzer.analyzeString(String.class)); };
+ if (analyzer.init("CARD_PAYMENT_TYPE", "cardPaymentType", "cardPaymentType")) { myEntity.setCardPaymentType(analyzer.analyzeString(String.class)); };
}
@@ -904,6 +935,7 @@
helpAppendingColumnValueString(sb, delimiter, equal, "CARD_OWNER", myEntity.getCardOwner());
helpAppendingColumnValueString(sb, delimiter, equal, "CARD_NUMBER", myEntity.getCardNumber());
helpAppendingColumnValueString(sb, delimiter, equal, "CARD_EXPIRES", myEntity.getCardExpires());
+ helpAppendingColumnValueString(sb, delimiter, equal, "CARD_PAYMENT_TYPE", myEntity.getCardPaymentType());
sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
return sb.toString();
@@ -963,6 +995,7 @@
valueMap.put("CARD_OWNER", myEntity.getCardOwner());
valueMap.put("CARD_NUMBER", myEntity.getCardNumber());
valueMap.put("CARD_EXPIRES", myEntity.getCardExpires());
+ valueMap.put("CARD_PAYMENT_TYPE", myEntity.getCardPaymentType());
return valueMap;
}
@@ -990,6 +1023,7 @@
valueMap.put("CARD_OWNER", helpGettingColumnStringValue(myEntity.getCardOwner()));
valueMap.put("CARD_NUMBER", helpGettingColumnStringValue(myEntity.getCardNumber()));
valueMap.put("CARD_EXPIRES", helpGettingColumnStringValue(myEntity.getCardExpires()));
+ valueMap.put("CARD_PAYMENT_TYPE", helpGettingColumnStringValue(myEntity.getCardPaymentType()));
return valueMap;
}
@@ -1014,9 +1048,9 @@
public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
if (preparedInsertClauseOption.getTablePrefix() != null) {
final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
- return "insert into " + tablePrefix + "ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? )";
+ return "insert into " + tablePrefix + "ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE) values(? , ? , ? , ? , ? , ? )";
}
- return "insert into ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? )";
+ return "insert into ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE) values(? , ? , ? , ? , ? , ? )";
}
// ===================================================================================
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -730,6 +730,164 @@
}
abstract protected ConditionValue getCValueCardExpires();
+
+ /** Column db name of cardPaymentType. */
+ protected static final String COL_CARD_PAYMENT_TYPE = "CARD_PAYMENT_TYPE";
+
+ /** Column java name of cardPaymentType. */
+ protected static final String J_CardPaymentType = "CardPaymentType";
+
+ /** Column uncapitalised java name of cardPaymentType. */
+ protected static final String UJ_cardPaymentType = "cardPaymentType";
+
+ /**
+ * Set the value of cardPaymentType using equal. { = }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as equal.
+ */
+ public void setCardPaymentType_Equal(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_EQUAL, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using notEqual. { != }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as notEqual.
+ */
+ public void setCardPaymentType_NotEqual(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using greaterThan. { > }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as greaterThan.
+ */
+ public void setCardPaymentType_GreaterThan(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using lessThan. { < }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as lessThan.
+ */
+ public void setCardPaymentType_LessThan(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using greaterEqual. { >= }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as greaterEqual.
+ */
+ public void setCardPaymentType_GreaterEqual(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using lessEqual. { <= }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as lessEqual.
+ */
+ public void setCardPaymentType_LessEqual(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using prefixSearch. { like 'xxx%' }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as prefixSearch.
+ */
+ public void setCardPaymentType_PrefixSearch(String cardPaymentType) {
+ registerCardPaymentType(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(cardPaymentType));
+ }
+
+ /**
+ * Set the value of cardPaymentType using likeSearch. { like '%xxx%' }
+ * If the value is null or empty-string, this condition is ignored.
+ * You can invoke this method several times and the conditions are set up.
+ *
+ * @param cardPaymentType The value of cardPaymentType as likeSearch.
+ * @param likeSearchOption The option of like-search. (NotNull)
+ */
+ public void setCardPaymentType_LikeSearch(String cardPaymentType, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+ registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(cardPaymentType), getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType, likeSearchOption);
+ }
+
+ /**
+ * Set the value of cardPaymentType using inScope. { in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param cardPaymentTypeList The value of cardPaymentType as inScope.
+ */
+ public void setCardPaymentType_InScope(java.util.List<String> cardPaymentTypeList) {
+ registerCardPaymentType(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(cardPaymentTypeList));
+ }
+
+ /**
+ * Set the value of cardPaymentType using inScope. { in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param cardPaymentType The value of cardPaymentType as inScope.
+ * @param inScopeOption The option of in-scope. (NotNull)
+ */
+ public void setCardPaymentType_InScope(String cardPaymentType, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+ registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(cardPaymentType), getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType, inScopeOption);
+ }
+
+ /**
+ * Set the value of cardPaymentType using notInScope. { not in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param cardPaymentTypeList The value of cardPaymentType as notInScope.
+ */
+ public void setCardPaymentType_NotInScope(java.util.List<String> cardPaymentTypeList) {
+ registerCardPaymentType(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardPaymentTypeList));
+ }
+
+ /**
+ * Set the value of cardPaymentType using isNull. { is null }
+ */
+ public void setCardPaymentType_IsNull() {
+ registerCardPaymentType(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Set the value of cardPaymentType using isNotNull. { is not null }
+ */
+ public void setCardPaymentType_IsNotNull() {
+ registerCardPaymentType(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Register condition of cardPaymentType.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of cardPaymentType. (Nullable)
+ */
+ protected void registerCardPaymentType(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType);
+ }
+
+ /**
+ * Register inline condition of cardPaymentType.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of cardPaymentType. (Nullable)
+ */
+ protected void registerInlineCardPaymentType(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType);
+ }
+
+ abstract protected ConditionValue getCValueCardPaymentType();
// ===================================================================================
// Basic Override
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -143,6 +143,24 @@
registerIncludedSelectColumn(aliasName, getRealColumnName("CARD_EXPIRES"));
}
+ /**
+ * Include select-column of cardPaymentType as mine.
+ * Alias name is java-name of this column.
+ * Be careful to whether your table have the same column.
+ */
+ public void includeAsMine_CardPaymentType() {
+ registerIncludedSelectColumn("CardPaymentType", getRealColumnName("CARD_PAYMENT_TYPE"));
+ }
+
+ /**
+ * Include select-column of cardPaymentType as mine.
+ *
+ * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+ */
+ public void includeAsMine_CardPaymentType(String aliasName) {
+ registerIncludedSelectColumn(aliasName, getRealColumnName("CARD_PAYMENT_TYPE"));
+ }
+
// ===================================================================================
// Query
// =====
@@ -360,6 +378,48 @@
getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_EXPIRES), null, false);return this;
}
+ // /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [CARD_PAYMENT_TYPE]
+ // - - - - - - - - -/
+
+ /** The attribute of cardPaymentType. */
+ protected ConditionValue _cardPaymentType;
+
+ /**
+ * Get the value of cardPaymentType.
+ *
+ * @return The value of cardPaymentType.
+ */
+ public ConditionValue getCardPaymentType() {
+ if (_cardPaymentType == null) {
+ _cardPaymentType = new ConditionValue();
+ }
+ return _cardPaymentType;
+ }
+
+ protected ConditionValue getCValueCardPaymentType() {
+ return getCardPaymentType();
+ }
+
+
+ /**
+ * Add order-by of cardPaymentType as ASC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderCardInfoCQ addOrderBy_CardPaymentType_Asc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_PAYMENT_TYPE), null, true);return this;
+ }
+
+ /**
+ * Add order-by of cardPaymentType as DESC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderCardInfoCQ addOrderBy_CardPaymentType_Desc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_PAYMENT_TYPE), null, false);return this;
+ }
+
// ===================================================================================
// Union Query
// ===========
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java 2007-10-05 09:10:11 UTC (rev 606)
@@ -116,4 +116,12 @@
}
+ // /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [CARD_PAYMENT_TYPE]
+ // - - - - - - - - -/
+ protected ConditionValue getCValueCardPaymentType() {
+ return _myCQ.getCardPaymentType();
+ }
+
+
}
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-05 08:57:34 UTC (rev 605)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-05 09:10:11 UTC (rev 606)
@@ -115,6 +115,7 @@
, CARD_OWNER VARCHAR(255) NOT NULL
, CARD_NUMBER VARCHAR(255) NOT NULL
, CARD_EXPIRES VARCHAR(255) NOT NULL
+ , CARD_PAYMENT_TYPE VARCHAR(64)
, PRIMARY KEY (ORDER_CARD_INFO_ID)
);