svnno****@sourc*****
svnno****@sourc*****
2008年 11月 13日 (木) 15:13:30 JST
Revision: 1342
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1342
Author: shinsuke
Date: 2008-11-13 15:13:30 +0900 (Thu, 13 Nov 2008)
Log Message:
-----------
added gender, birthdate,nickname to userinfo.
Modified Paths:
--------------
todolist/trunk/src/main/config/erd/todolist.erd
todolist/trunk/src/main/config/sql/todolist.ddl
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsbhv/BsUserInfoBhv.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/BsUserInfo.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/dbmeta/UserInfoDbm.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/bs/BsUserInfoCB.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/AbstractBsUserInfoCQ.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/BsUserInfoCQ.java
todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/ciq/UserInfoCIQ.java
todolist/trunk/src/main/webapp/WEB-INF/db/todolist.1.log.db
todolist/trunk/src/main/webapp/WEB-INF/db/todolist.data.db
-------------- next part --------------
Modified: todolist/trunk/src/main/config/erd/todolist.erd
===================================================================
--- todolist/trunk/src/main/config/erd/todolist.erd 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/config/erd/todolist.erd 2008-11-13 06:13:30 UTC (rev 1342)
@@ -85,6 +85,49 @@
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>nickname</columnName>
+ <logicalName>Nickname</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>VARCHAR</name>
+ <logicalName>String</logicalName>
+ <supportSize>true</supportSize>
+ <type>12</type>
+ </columnType>
+ <size>100</size>
+ <notNull>false</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>gender</columnName>
+ <logicalName>Gender</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+ <size>1</size>
+ <notNull>false</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>birth_date</columnName>
+ <logicalName>Birth Date</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>DATE</name>
+ <logicalName>Date</logicalName>
+ <supportSize>false</supportSize>
+ <type>91</type>
+ </columnType>
+ <size>10</size>
+ <notNull>false</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
<columnName>email</columnName>
<logicalName>Email</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
@@ -174,7 +217,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -196,7 +239,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -255,7 +298,7 @@
<autoIncrement>false</autoIncrement>
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[11]"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[14]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -325,7 +368,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -347,7 +390,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -369,7 +412,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -391,7 +434,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>versionNo</columnName>
<logicalName>Version No.</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[18]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[21]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -403,7 +446,7 @@
<indices/>
<constraint>
<x>40</x>
- <y>1201</y>
+ <y>1258</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -557,7 +600,7 @@
<autoIncrement>false</autoIncrement>
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[10]"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[13]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -627,7 +670,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -649,7 +692,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -671,7 +714,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -693,7 +736,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>versionNo</columnName>
<logicalName>Version No.</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[18]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[21]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -705,7 +748,7 @@
<indices/>
<constraint>
<x>864</x>
- <y>1201</y>
+ <y>1258</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -1132,7 +1175,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1154,7 +1197,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1176,7 +1219,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -1198,7 +1241,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>versionNo</columnName>
<logicalName>Version No.</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[18]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[21]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1332,7 +1375,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_time</columnName>
<logicalName>Created Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1354,7 +1397,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_time</columnName>
<logicalName>Updated Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1376,7 +1419,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_time</columnName>
<logicalName>Deleted Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
Modified: todolist/trunk/src/main/config/sql/todolist.ddl
===================================================================
--- todolist/trunk/src/main/config/sql/todolist.ddl 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/config/sql/todolist.ddl 2008-11-13 06:13:30 UTC (rev 1342)
@@ -55,6 +55,9 @@
middle_name VARCHAR(50),
given_name_desc VARCHAR(100),
family_name_desc VARCHAR(100),
+ nickname VARCHAR(100),
+ gender VARCHAR(1),
+ birth_date DATE,
email VARCHAR(255),
url VARCHAR(255),
telephone VARCHAR(40),
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsbhv/BsUserInfoBhv.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsbhv/BsUserInfoBhv.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsbhv/BsUserInfoBhv.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -46,7 +46,7 @@
* USER_ID
*
* [column]
- * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
+ * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
*
* [sequence]
*
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/BsUserInfo.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/BsUserInfo.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/BsUserInfo.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -23,7 +23,7 @@
* USER_ID
*
* [column]
- * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
+ * USER_ID, GIVEN_NAME, FAMILY_NAME, MIDDLE_NAME, GIVEN_NAME_DESC, FAMILY_NAME_DESC, NICKNAME, GENDER, BIRTH_DATE, EMAIL, URL, TELEPHONE, ROLE_ID, GROUP_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO
*
* [sequence]
*
@@ -90,6 +90,15 @@
/** FAMILY_NAME_DESC: {VARCHAR(100)} */
protected String _familyNameDesc;
+ /** NICKNAME: {VARCHAR(100)} */
+ protected String _nickname;
+
+ /** GENDER: {VARCHAR(1)} */
+ protected String _gender;
+
+ /** BIRTH_DATE: {DATE} */
+ protected java.util.Date _birthDate;
+
/** EMAIL: {VARCHAR(255)} */
protected String _email;
@@ -473,6 +482,9 @@
sb.append(delimiter).append(getMiddleName());
sb.append(delimiter).append(getGivenNameDesc());
sb.append(delimiter).append(getFamilyNameDesc());
+ sb.append(delimiter).append(getNickname());
+ sb.append(delimiter).append(getGender());
+ sb.append(delimiter).append(getBirthDate());
sb.append(delimiter).append(getEmail());
sb.append(delimiter).append(getUrl());
sb.append(delimiter).append(getTelephone());
@@ -631,6 +643,72 @@
this._familyNameDesc = familyNameDesc;
}
+ /** The column annotation for S2Dao. {VARCHAR(100)} */
+ public static final String nickname_COLUMN = "NICKNAME";
+
+ /**
+ * NICKNAME: {VARCHAR(100)} <br />
+ *
+ * @return The value of the column 'NICKNAME'. (Nullable)
+ */
+ public String getNickname() {
+ return _nickname;
+ }
+
+ /**
+ * NICKNAME: {VARCHAR(100)} <br />
+ *
+ * @param nickname The value of the column 'NICKNAME'. (Nullable)
+ */
+ public void setNickname(String nickname) {
+ _modifiedProperties.addPropertyName("nickname");
+ this._nickname = nickname;
+ }
+
+ /** The column annotation for S2Dao. {VARCHAR(1)} */
+ public static final String gender_COLUMN = "GENDER";
+
+ /**
+ * GENDER: {VARCHAR(1)} <br />
+ *
+ * @return The value of the column 'GENDER'. (Nullable)
+ */
+ public String getGender() {
+ return _gender;
+ }
+
+ /**
+ * GENDER: {VARCHAR(1)} <br />
+ *
+ * @param gender The value of the column 'GENDER'. (Nullable)
+ */
+ public void setGender(String gender) {
+ _modifiedProperties.addPropertyName("gender");
+ this._gender = gender;
+ }
+
+ /** The column annotation for S2Dao. {DATE} */
+ public static final String birthDate_COLUMN = "BIRTH_DATE";
+
+ /**
+ * BIRTH_DATE: {DATE} <br />
+ *
+ * @return The value of the column 'BIRTH_DATE'. (Nullable)
+ */
+ public java.util.Date getBirthDate() {
+ return _birthDate;
+ }
+
+ /**
+ * BIRTH_DATE: {DATE} <br />
+ *
+ * @param birthDate The value of the column 'BIRTH_DATE'. (Nullable)
+ */
+ public void setBirthDate(java.util.Date birthDate) {
+ _modifiedProperties.addPropertyName("birthDate");
+ this._birthDate = birthDate;
+ }
+
/** The column annotation for S2Dao. {VARCHAR(255)} */
public static final String email_COLUMN = "EMAIL";
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/dbmeta/UserInfoDbm.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/bsentity/dbmeta/UserInfoDbm.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -66,6 +66,15 @@
protected ColumnInfo _columnFamilyNameDesc = cci("FAMILY_NAME_DESC",
"familyNameDesc", String.class, false, 100, 0);
+ protected ColumnInfo _columnNickname = cci("NICKNAME", "nickname",
+ String.class, false, 100, 0);
+
+ protected ColumnInfo _columnGender = cci("GENDER", "gender", String.class,
+ false, 1, 0);
+
+ protected ColumnInfo _columnBirthDate = cci("BIRTH_DATE", "birthDate",
+ java.util.Date.class, false, null, null);
+
protected ColumnInfo _columnEmail = cci("EMAIL", "email", String.class,
false, 255, 0);
@@ -126,6 +135,18 @@
return _columnFamilyNameDesc;
}
+ public ColumnInfo columnNickname() {
+ return _columnNickname;
+ }
+
+ public ColumnInfo columnGender() {
+ return _columnGender;
+ }
+
+ public ColumnInfo columnBirthDate() {
+ return _columnBirthDate;
+ }
+
public ColumnInfo columnEmail() {
return _columnEmail;
}
@@ -417,6 +438,9 @@
setupEps(_epsMap, new EpsMiddleName(), columnMiddleName());
setupEps(_epsMap, new EpsGivenNameDesc(), columnGivenNameDesc());
setupEps(_epsMap, new EpsFamilyNameDesc(), columnFamilyNameDesc());
+ setupEps(_epsMap, new EpsNickname(), columnNickname());
+ setupEps(_epsMap, new EpsGender(), columnGender());
+ setupEps(_epsMap, new EpsBirthDate(), columnBirthDate());
setupEps(_epsMap, new EpsEmail(), columnEmail());
setupEps(_epsMap, new EpsUrl(), columnUrl());
setupEps(_epsMap, new EpsTelephone(), columnTelephone());
@@ -476,6 +500,24 @@
}
}
+ public static class EpsNickname implements Eps<UserInfo> {
+ public void setup(UserInfo e, Object v) {
+ e.setNickname((String) v);
+ }
+ }
+
+ public static class EpsGender implements Eps<UserInfo> {
+ public void setup(UserInfo e, Object v) {
+ e.setGender((String) v);
+ }
+ }
+
+ public static class EpsBirthDate implements Eps<UserInfo> {
+ public void setup(UserInfo e, Object v) {
+ e.setBirthDate((java.util.Date) v);
+ }
+ }
+
public static class EpsEmail implements Eps<UserInfo> {
public void setup(UserInfo e, Object v) {
e.setEmail((String) v);
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/bs/BsUserInfoCB.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/bs/BsUserInfoCB.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/bs/BsUserInfoCB.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -273,6 +273,18 @@
doColumn("FAMILY_NAME_DESC");
}
+ public void columnNickname() {
+ doColumn("NICKNAME");
+ }
+
+ public void columnGender() {
+ doColumn("GENDER");
+ }
+
+ public void columnBirthDate() {
+ doColumn("BIRTH_DATE");
+ }
+
public void columnEmail() {
doColumn("EMAIL");
}
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/AbstractBsUserInfoCQ.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/AbstractBsUserInfoCQ.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -1469,6 +1469,391 @@
abstract protected ConditionValue getCValueFamilyNameDesc();
/**
+ * Equal(=). And NullOrEmptyIgnored, OnceRegistered. {VARCHAR(100)}
+ *
+ * @param nickname The value of nickname as equal.
+ */
+ public void setNickname_Equal(String nickname) {
+ regNickname(CK_EQ, fRES(nickname));
+ }
+
+ /**
+ * NotEqual(!=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as notEqual.
+ */
+ public void setNickname_NotEqual(String nickname) {
+ regNickname(CK_NE, fRES(nickname));
+ }
+
+ /**
+ * GreaterThan(>). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as greaterThan.
+ */
+ public void setNickname_GreaterThan(String nickname) {
+ regNickname(CK_GT, fRES(nickname));
+ }
+
+ /**
+ * LessThan(<). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as lessThan.
+ */
+ public void setNickname_LessThan(String nickname) {
+ regNickname(CK_LT, fRES(nickname));
+ }
+
+ /**
+ * GreaterEqual(>=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as greaterEqual.
+ */
+ public void setNickname_GreaterEqual(String nickname) {
+ regNickname(CK_GE, fRES(nickname));
+ }
+
+ /**
+ * LessEqual(<=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as lessEqual.
+ */
+ public void setNickname_LessEqual(String nickname) {
+ regNickname(CK_LE, fRES(nickname));
+ }
+
+ /**
+ * PrefixSearch(like 'xxx%'). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param nickname The value of nickname as prefixSearch.
+ */
+ public void setNickname_PrefixSearch(String nickname) {
+ regNickname(CK_PS, fRES(nickname));
+ }
+
+ /**
+ * LikeSearch(like 'xxx%' escape ...). And NullOrEmptyIgnored,
+ * SeveralRegistered.
+ *
+ * @param nickname The value of nickname as likeSearch.
+ * @param likeSearchOption The option of like-search. (NotNull)
+ */
+ public void setNickname_LikeSearch(
+ String nickname,
+ jp.sf.pal.todolist.db.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+ registerLikeSearchQuery(CK_LS, fRES(nickname), getCValueNickname(),
+ "NICKNAME", "Nickname", "nickname", likeSearchOption);
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param nicknameList The collection of nickname as inScope.
+ */
+ public void setNickname_InScope(Collection<String> nicknameList) {
+ regNickname(CK_INS, cTL(nicknameList));
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param nickname The collection of nickname as inScope.
+ * @param inScopeOption The option of in-scope. (NotNull)
+ */
+ public void setNickname_InScope(
+ String nickname,
+ jp.sf.pal.todolist.db.allcommon.cbean.coption.InScopeOption inScopeOption) {
+ registerInScopeQuery(CK_INS, fRES(nickname), getCValueNickname(),
+ "NICKNAME", "Nickname", "nickname", inScopeOption);
+ }
+
+ /**
+ * NotInScope(not in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param nicknameList The collection of nickname as notInScope.
+ */
+ public void setNickname_NotInScope(Collection<String> nicknameList) {
+ regNickname(CK_NINS, cTL(nicknameList));
+ }
+
+ /**
+ * IsNull(is null). And OnceRegistered.
+ */
+ public void setNickname_IsNull() {
+ regNickname(CK_ISN, DUMMY_OBJECT);
+ }
+
+ /**
+ * IsNotNull(is not null). And OnceRegistered.
+ */
+ public void setNickname_IsNotNull() {
+ regNickname(CK_ISNN, DUMMY_OBJECT);
+ }
+
+ protected void regNickname(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueNickname(), "NICKNAME", "Nickname",
+ "nickname");
+ }
+
+ protected void registerInlineNickname(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueNickname(), "NICKNAME",
+ "Nickname", "nickname");
+ }
+
+ abstract protected ConditionValue getCValueNickname();
+
+ /**
+ * Equal(=). And NullOrEmptyIgnored, OnceRegistered. {VARCHAR(1)}
+ *
+ * @param gender The value of gender as equal.
+ */
+ public void setGender_Equal(String gender) {
+ regGender(CK_EQ, fRES(gender));
+ }
+
+ /**
+ * NotEqual(!=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as notEqual.
+ */
+ public void setGender_NotEqual(String gender) {
+ regGender(CK_NE, fRES(gender));
+ }
+
+ /**
+ * GreaterThan(>). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as greaterThan.
+ */
+ public void setGender_GreaterThan(String gender) {
+ regGender(CK_GT, fRES(gender));
+ }
+
+ /**
+ * LessThan(<). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as lessThan.
+ */
+ public void setGender_LessThan(String gender) {
+ regGender(CK_LT, fRES(gender));
+ }
+
+ /**
+ * GreaterEqual(>=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as greaterEqual.
+ */
+ public void setGender_GreaterEqual(String gender) {
+ regGender(CK_GE, fRES(gender));
+ }
+
+ /**
+ * LessEqual(<=). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as lessEqual.
+ */
+ public void setGender_LessEqual(String gender) {
+ regGender(CK_LE, fRES(gender));
+ }
+
+ /**
+ * PrefixSearch(like 'xxx%'). And NullOrEmptyIgnored, OnceRegistered.
+ *
+ * @param gender The value of gender as prefixSearch.
+ */
+ public void setGender_PrefixSearch(String gender) {
+ regGender(CK_PS, fRES(gender));
+ }
+
+ /**
+ * LikeSearch(like 'xxx%' escape ...). And NullOrEmptyIgnored,
+ * SeveralRegistered.
+ *
+ * @param gender The value of gender as likeSearch.
+ * @param likeSearchOption The option of like-search. (NotNull)
+ */
+ public void setGender_LikeSearch(
+ String gender,
+ jp.sf.pal.todolist.db.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+ registerLikeSearchQuery(CK_LS, fRES(gender), getCValueGender(),
+ "GENDER", "Gender", "gender", likeSearchOption);
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param genderList The collection of gender as inScope.
+ */
+ public void setGender_InScope(Collection<String> genderList) {
+ regGender(CK_INS, cTL(genderList));
+ }
+
+ /**
+ * InScope(in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param gender The collection of gender as inScope.
+ * @param inScopeOption The option of in-scope. (NotNull)
+ */
+ public void setGender_InScope(
+ String gender,
+ jp.sf.pal.todolist.db.allcommon.cbean.coption.InScopeOption inScopeOption) {
+ registerInScopeQuery(CK_INS, fRES(gender), getCValueGender(), "GENDER",
+ "Gender", "gender", inScopeOption);
+ }
+
+ /**
+ * NotInScope(not in ('a', 'b')). And NullOrEmptyIgnored,
+ * NullOrEmptyElementIgnored, SeveralRegistered.
+ *
+ * @param genderList The collection of gender as notInScope.
+ */
+ public void setGender_NotInScope(Collection<String> genderList) {
+ regGender(CK_NINS, cTL(genderList));
+ }
+
+ /**
+ * IsNull(is null). And OnceRegistered.
+ */
+ public void setGender_IsNull() {
+ regGender(CK_ISN, DUMMY_OBJECT);
+ }
+
+ /**
+ * IsNotNull(is not null). And OnceRegistered.
+ */
+ public void setGender_IsNotNull() {
+ regGender(CK_ISNN, DUMMY_OBJECT);
+ }
+
+ protected void regGender(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueGender(), "GENDER", "Gender",
+ "gender");
+ }
+
+ protected void registerInlineGender(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueGender(), "GENDER", "Gender",
+ "gender");
+ }
+
+ abstract protected ConditionValue getCValueGender();
+
+ /**
+ * Equal(=). And NullIgnored, OnceRegistered. {DATE}
+ *
+ * @param birthDate The value of birthDate as equal.
+ */
+ public void setBirthDate_Equal(java.util.Date birthDate) {
+ regBirthDate(CK_EQ, birthDate);
+ }
+
+ /**
+ * NotEqual(!=). And NullIgnored, OnceRegistered.
+ *
+ * @param birthDate The value of birthDate as notEqual.
+ */
+ public void setBirthDate_NotEqual(java.util.Date birthDate) {
+ regBirthDate(CK_NE, birthDate);
+ }
+
+ /**
+ * GreaterThan(>). And NullIgnored, OnceRegistered.
+ *
+ * @param birthDate The value of birthDate as greaterThan.
+ */
+ public void setBirthDate_GreaterThan(java.util.Date birthDate) {
+ regBirthDate(CK_GT, birthDate);
+ }
+
+ /**
+ * LessThan(>). And NullIgnored, OnceRegistered.
+ *
+ * @param birthDate The value of birthDate as lessThan.
+ */
+ public void setBirthDate_LessThan(java.util.Date birthDate) {
+ regBirthDate(CK_LT, birthDate);
+ }
+
+ /**
+ * GreaterEqual(>). And NullIgnored, OnceRegistered.
+ *
+ * @param birthDate The value of birthDate as greaterEqual.
+ */
+ public void setBirthDate_GreaterEqual(java.util.Date birthDate) {
+ regBirthDate(CK_GE, birthDate);
+ }
+
+ /**
+ * LessEqual(>). And NullIgnored, OnceRegistered.
+ *
+ * @param birthDate The value of birthDate as lessEqual.
+ */
+ public void setBirthDate_LessEqual(java.util.Date birthDate) {
+ regBirthDate(CK_LE, birthDate);
+ }
+
+ /**
+ * FromTo($fromDate <= COLUMN_NAME <= $toDate). And NullIgnored,
+ * OnceRegistered. {DATE}
+ *
+ * @param fromDate The from-date of birthDate. (Nullable)
+ * @param toDate The to-date of birthDate. (Nullable)
+ * @param fromToOption The option of from-to. (NotNull)
+ */
+ public void setBirthDate_FromTo(
+ java.util.Date fromDate,
+ java.util.Date toDate,
+ jp.sf.pal.todolist.db.allcommon.cbean.coption.FromToOption fromToOption) {
+ registerFromToQuery(fromDate, toDate, getCValueBirthDate(),
+ "BIRTH_DATE", "BirthDate", "birthDate", fromToOption);
+ }
+
+ /**
+ * FromTo($fromDate <= COLUMN_NAME < $toDate + 1). And NullIgnored,
+ * OnceRegistered. {DATE}
+ *
+ * @param fromDate The from-date of birthDate. (Nullable)
+ * @param toDate The to-date of birthDate. (Nullable)
+ */
+ public void setBirthDate_DateFromTo(java.util.Date fromDate,
+ java.util.Date toDate) {
+ setBirthDate_FromTo(
+ fromDate,
+ toDate,
+ new jp.sf.pal.todolist.db.allcommon.cbean.coption.DateFromToOption());
+ }
+
+ /**
+ * IsNull(is null). And OnceRegistered.
+ */
+ public void setBirthDate_IsNull() {
+ regBirthDate(CK_ISN, DUMMY_OBJECT);
+ }
+
+ /**
+ * IsNotNull(is not null). And OnceRegistered.
+ */
+ public void setBirthDate_IsNotNull() {
+ regBirthDate(CK_ISNN, DUMMY_OBJECT);
+ }
+
+ protected void regBirthDate(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueBirthDate(), "BIRTH_DATE",
+ "BirthDate", "birthDate");
+ }
+
+ protected void registerInlineBirthDate(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueBirthDate(), "BIRTH_DATE",
+ "BirthDate", "birthDate");
+ }
+
+ abstract protected ConditionValue getCValueBirthDate();
+
+ /**
* Equal(=). And NullOrEmptyIgnored, OnceRegistered. {VARCHAR(255)}
*
* @param email The value of email as equal.
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/BsUserInfoCQ.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/bs/BsUserInfoCQ.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -636,6 +636,75 @@
return this;
}
+ protected ConditionValue _nickname;
+
+ public ConditionValue getNickname() {
+ if (_nickname == null) {
+ _nickname = new ConditionValue();
+ }
+ return _nickname;
+ }
+
+ protected ConditionValue getCValueNickname() {
+ return getNickname();
+ }
+
+ public BsUserInfoCQ addOrderBy_Nickname_Asc() {
+ regOBA("NICKNAME");
+ return this;
+ }
+
+ public BsUserInfoCQ addOrderBy_Nickname_Desc() {
+ regOBD("NICKNAME");
+ return this;
+ }
+
+ protected ConditionValue _gender;
+
+ public ConditionValue getGender() {
+ if (_gender == null) {
+ _gender = new ConditionValue();
+ }
+ return _gender;
+ }
+
+ protected ConditionValue getCValueGender() {
+ return getGender();
+ }
+
+ public BsUserInfoCQ addOrderBy_Gender_Asc() {
+ regOBA("GENDER");
+ return this;
+ }
+
+ public BsUserInfoCQ addOrderBy_Gender_Desc() {
+ regOBD("GENDER");
+ return this;
+ }
+
+ protected ConditionValue _birthDate;
+
+ public ConditionValue getBirthDate() {
+ if (_birthDate == null) {
+ _birthDate = new ConditionValue();
+ }
+ return _birthDate;
+ }
+
+ protected ConditionValue getCValueBirthDate() {
+ return getBirthDate();
+ }
+
+ public BsUserInfoCQ addOrderBy_BirthDate_Asc() {
+ regOBA("BIRTH_DATE");
+ return this;
+ }
+
+ public BsUserInfoCQ addOrderBy_BirthDate_Desc() {
+ regOBD("BIRTH_DATE");
+ return this;
+ }
+
protected ConditionValue _email;
public ConditionValue getEmail() {
Modified: todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/ciq/UserInfoCIQ.java
===================================================================
--- todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-13 05:58:03 UTC (rev 1341)
+++ todolist/trunk/src/main/java/jp/sf/pal/todolist/db/cbean/cq/ciq/UserInfoCIQ.java 2008-11-13 06:13:30 UTC (rev 1342)
@@ -256,6 +256,18 @@
return _myCQ.getFamilyNameDesc();
}
+ protected ConditionValue getCValueNickname() {
+ return _myCQ.getNickname();
+ }
+
+ protected ConditionValue getCValueGender() {
+ return _myCQ.getGender();
+ }
+
+ protected ConditionValue getCValueBirthDate() {
+ return _myCQ.getBirthDate();
+ }
+
protected ConditionValue getCValueEmail() {
return _myCQ.getEmail();
}
Modified: todolist/trunk/src/main/webapp/WEB-INF/db/todolist.1.log.db
===================================================================
(Binary files differ)
Modified: todolist/trunk/src/main/webapp/WEB-INF/db/todolist.data.db
===================================================================
(Binary files differ)