svnno****@sourc*****
svnno****@sourc*****
2008年 12月 15日 (月) 22:48:37 JST
Revision: 1615
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1615
Author: shinsuke
Date: 2008-12-15 22:48:37 +0900 (Mon, 15 Dec 2008)
Log Message:
-----------
added files for mysql.
Modified Paths:
--------------
timecard/trunk/src/main/config/erd/mysql/timecard.erd
timecard/trunk/src/main/config/sql/mysql/timecard.ddl
-------------- next part --------------
Modified: timecard/trunk/src/main/config/erd/mysql/timecard.erd
===================================================================
--- timecard/trunk/src/main/config/erd/mysql/timecard.erd 2008-12-15 13:48:00 UTC (rev 1614)
+++ timecard/trunk/src/main/config/erd/mysql/timecard.erd 2008-12-15 13:48:37 UTC (rev 1615)
@@ -68,8 +68,8 @@
<defaultValue>1</defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
- <columnName>working_days</columnName>
- <logicalName>Working Days</logicalName>
+ <columnName>std_working_days</columnName>
+ <logicalName>Standard Working Days</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType">
<name>DOUBLE</name>
<logicalName>Real</logicalName>
@@ -84,39 +84,6 @@
<defaultValue>0</defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
- <columnName>std_working_days</columnName>
- <logicalName>Standard Working Days</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
- <size>10</size>
- <notNull>true</notNull>
- <primaryKey>false</primaryKey>
- <description></description>
- <autoIncrement>false</autoIncrement>
- <defaultValue>0</defaultValue>
- </net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel>
- <columnName>holidays</columnName>
- <logicalName>Holidays</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
- <size>10</size>
- <notNull>true</notNull>
- <primaryKey>false</primaryKey>
- <description></description>
- <autoIncrement>false</autoIncrement>
- <defaultValue>0</defaultValue>
- </net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel>
- <columnName>paid_holidays</columnName>
- <logicalName>Paid Holidays</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
- <size>10</size>
- <notNull>true</notNull>
- <primaryKey>false</primaryKey>
- <description></description>
- <autoIncrement>false</autoIncrement>
- <defaultValue>0</defaultValue>
- </net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel>
<columnName>working_time</columnName>
<logicalName>Working Time</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType">
@@ -135,7 +102,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>std_working_time</columnName>
<logicalName>Standard Working Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[9]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>20</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -162,7 +129,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>mnt_over_time</columnName>
<logicalName>Midnight Overtime Hours</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[11]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[8]/columnType"/>
<size>20</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -216,7 +183,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[14]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[11]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -227,7 +194,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_by</columnName>
<logicalName>Updated By</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
<size>255</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -238,7 +205,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[14]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[11]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -249,7 +216,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_by</columnName>
<logicalName>Deleted By</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[15]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
<size>255</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -271,8 +238,8 @@
</columns>
<indices/>
<constraint>
- <x>48</x>
- <y>465</y>
+ <x>319</x>
+ <y>484</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -297,7 +264,7 @@
<autoIncrement>true</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[13]"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[10]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -337,17 +304,6 @@
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
- <columnName>paid_holidays</columnName>
- <logicalName>Paid Holidays</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
- <size>200</size>
- <notNull>true</notNull>
- <primaryKey>false</primaryKey>
- <description></description>
- <autoIncrement>false</autoIncrement>
- <defaultValue>0</defaultValue>
- </net.java.amateras.db.visual.model.ColumnModel>
- <net.java.amateras.db.visual.model.ColumnModel>
<columnName>is_available</columnName>
<logicalName>Is available</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
@@ -393,7 +349,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[6]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -404,7 +360,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_by</columnName>
<logicalName>Updated by</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>255</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -415,7 +371,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[6]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -426,7 +382,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>deleted_by</columnName>
<logicalName>Deleted by</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>255</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -448,8 +404,8 @@
</columns>
<indices/>
<constraint>
- <x>500</x>
- <y>537</y>
+ <x>331</x>
+ <y>909</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -547,6 +503,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"/>
@@ -585,6 +584,22 @@
<defaultValue></defaultValue>
</net.java.amateras.db.visual.model.ColumnModel>
<net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>locale</columnName>
+ <logicalName>Locale</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>VARCHAR</name>
+ <logicalName>String</logicalName>
+ <supportSize>true</supportSize>
+ <type>12</type>
+ </columnType>
+ <size>5</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>role_id</columnName>
<logicalName>Default Role ID</logicalName>
<columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel/columnType"/>
@@ -636,7 +651,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[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -658,7 +673,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[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -696,8 +711,8 @@
</columns>
<indices/>
<constraint>
- <x>507</x>
- <y>106</y>
+ <x>315</x>
+ <y>1220</y>
<width>-1</width>
<height>-1</height>
</constraint>
@@ -717,7 +732,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[15]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -787,7 +802,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[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -809,7 +824,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[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -831,7 +846,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[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -853,7 +868,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[22]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -864,14 +879,125 @@
</columns>
<indices/>
<constraint>
- <x>854</x>
- <y>79</y>
+ <x>66</x>
+ <y>1740</y>
<width>-1</width>
<height>-1</height>
</constraint>
<sourceConnections/>
<targetConnections>
<net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_mapping_to_group</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>group_id</columnName>
+ <logicalName>Group ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>VARCHAR</name>
+ <logicalName>String</logicalName>
+ <supportSize>true</supportSize>
+ <type>12</type>
+ </columnType>
+ <size>255</size>
+ <notNull>true</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel">
+ <error></error>
+ <linkedPath></linkedPath>
+ <tableName>group_mapping</tableName>
+ <logicalName>Group Mapping</logicalName>
+ <description></description>
+ <columns>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>id</columnName>
+ <logicalName>ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>INTEGER</name>
+ <logicalName>Integer</logicalName>
+ <supportSize>false</supportSize>
+ <type>4</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</notNull>
+ <primaryKey>true</primaryKey>
+ <description></description>
+ <autoIncrement>true</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>user_id</columnName>
+ <logicalName>User ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
+ <size>255</size>
+ <notNull>true</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 reference="../../../references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+ </columns>
+ <indices/>
+ <constraint>
+ <x>70</x>
+ <y>909</y>
+ <width>-1</width>
+ <height>-1</height>
+ </constraint>
+ <sourceConnections>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_mapping_to_user</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../../../../../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <target class="net.java.amateras.db.visual.model.TableModel" reference="../../../../../../../../.."/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ </sourceConnections>
+ <targetConnections/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </source>
+ <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
</targetConnections>
<listeners serialization="custom">
<java.beans.PropertyChangeSupport>
@@ -908,7 +1034,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[14]"/>
</entry>
</references>
<source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
@@ -978,7 +1104,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[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1000,7 +1126,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[16]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1022,7 +1148,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[16]/columnType"/>
<size>10</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -1044,7 +1170,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[22]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1055,14 +1181,120 @@
</columns>
<indices/>
<constraint>
- <x>851</x>
- <y>449</y>
+ <x>594</x>
+ <y>1740</y>
<width>-1</width>
<height>-1</height>
</constraint>
<sourceConnections/>
<targetConnections>
<net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_mapping_to_role</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>role_id</columnName>
+ <logicalName>Role ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/references/entry/net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
+ <size>255</size>
+ <notNull>true</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel">
+ <error></error>
+ <linkedPath></linkedPath>
+ <tableName>role_mapping</tableName>
+ <logicalName>Role Mapping</logicalName>
+ <description></description>
+ <columns>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>id</columnName>
+ <logicalName>ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>INT</name>
+ <logicalName>Integer</logicalName>
+ <supportSize>false</supportSize>
+ <type>4</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</notNull>
+ <primaryKey>true</primaryKey>
+ <description></description>
+ <autoIncrement>true</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>user_id</columnName>
+ <logicalName>User ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/references/entry/net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
+ <size>255</size>
+ <notNull>true</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 reference="../../../references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+ </columns>
+ <indices/>
+ <constraint>
+ <x>602</x>
+ <y>909</y>
+ <width>-1</width>
+ <height>-1</height>
+ </constraint>
+ <sourceConnections>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_mapping_to_user</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../../../../../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <target class="net.java.amateras.db.visual.model.TableModel" reference="../../../../../../../../.."/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ </sourceConnections>
+ <targetConnections/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </source>
+ <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
</targetConnections>
<listeners serialization="custom">
<java.beans.PropertyChangeSupport>
@@ -1107,6 +1339,8 @@
</java.beans.PropertyChangeSupport>
</listeners>
</net.java.amateras.db.visual.model.ForeignKeyModel>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel"/>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel"/>
</targetConnections>
<listeners serialization="custom">
<java.beans.PropertyChangeSupport>
@@ -1313,7 +1547,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>working_time</columnName>
<logicalName>Working Time</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[9]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>20</size>
<notNull>false</notNull>
<primaryKey>false</primaryKey>
@@ -1336,7 +1570,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="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1347,7 +1581,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>created_by</columnName>
<logicalName>Created_by</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>255</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1358,7 +1592,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="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
<size>10</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1369,7 +1603,7 @@
<net.java.amateras.db.visual.model.ColumnModel>
<columnName>updated_by</columnName>
<logicalName>Updated by</logicalName>
- <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
<size>255</size>
<notNull>true</notNull>
<primaryKey>false</primaryKey>
@@ -1396,12 +1630,314 @@
</columns>
<indices/>
<constraint>
+ <x>331</x>
+ <y>40</y>
+ <width>-1</width>
+ <height>-1</height>
+ </constraint>
+ <sourceConnections>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ </sourceConnections>
+ <targetConnections/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </source>
+ <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_monthly_working_report_to_monthly_report</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../columns/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>monthly_report_id</columnName>
+ <logicalName>Monthly Report ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>BIGINT</name>
+ <logicalName>Integer</logicalName>
+ <supportSize>true</supportSize>
+ <type>-5</type>
+ </columnType>
+ <size>20</size>
+ <notNull>true</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel">
+ <error></error>
+ <linkedPath></linkedPath>
+ <tableName>monthly_working_report</tableName>
+ <logicalName>Monthly Working Report</logicalName>
+ <description></description>
+ <columns>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>id</columnName>
+ <logicalName>ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../references/entry/net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
+ <size>20</size>
+ <notNull>true</notNull>
+ <primaryKey>true</primaryKey>
+ <description></description>
+ <autoIncrement>true</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>value</columnName>
+ <logicalName>Value</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>DOUBLE</name>
+ <logicalName>Real</logicalName>
+ <supportSize>false</supportSize>
+ <type>8</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</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 reference="../../../references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>working_type_id</columnName>
+ <logicalName>Working Type ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>INTEGER</name>
+ <logicalName>Integer</logicalName>
+ <supportSize>false</supportSize>
+ <type>4</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue></defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ </columns>
+ <indices/>
+ <constraint>
<x>40</x>
<y>40</y>
<width>-1</width>
<height>-1</height>
</constraint>
<sourceConnections>
+ <net.java.amateras.db.visual.model.ForeignKeyModel>
+ <foreignKeyName>FK_from_monthly_working_report_to_working_type</foreignKeyName>
+ <references>
+ <entry>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>id</columnName>
+ <logicalName>ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+ <size>20</size>
+ <notNull>true</notNull>
+ <primaryKey>true</primaryKey>
+ <description></description>
+ <autoIncrement>true</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[4]"/>
+ </entry>
+ </references>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+ <target class="net.java.amateras.db.visual.model.TableModel">
+ <error></error>
+ <linkedPath></linkedPath>
+ <tableName>working_type</tableName>
+ <logicalName>Working Type</logicalName>
+ <description></description>
+ <columns>
+ <net.java.amateras.db.visual.model.ColumnModel reference="../../../references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+ <net.java.amateras.db.visual.model.ColumnModel>
+ <columnName>name</columnName>
+ <logicalName>Name</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>true</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>value</columnName>
+ <logicalName>Value</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+ <size>10</size>
+ <notNull>true</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>type</columnName>
+ <logicalName>Type</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>VARCHAR</name>
+ <logicalName>String</logicalName>
+ <supportSize>true</supportSize>
+ <type>12</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</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>parent_id</columnName>
+ <logicalName>Parent ID</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+ <size>10</size>
+ <notNull>false</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue>1</defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ <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[11]/columnType"/>
+ <size>10</size>
+ <notNull>true</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>created_by</columnName>
+ <logicalName>Created By</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <size>255</size>
+ <notNull>true</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>updated_time</columnName>
+ <logicalName>Updated Time</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[11]/columnType"/>
+ <size>10</size>
+ <notNull>true</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>updated_by</columnName>
+ <logicalName>Updated By</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <size>255</size>
+ <notNull>true</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>deleted_time</columnName>
+ <logicalName>Deleted Time</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[11]/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>deleted_by</columnName>
+ <logicalName>Deleted By</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../../columns/net.java.amateras.db.visual.model.ColumnModel[12]/columnType"/>
+ <size>255</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>versionNo</columnName>
+ <logicalName>Version No.</logicalName>
+ <columnType class="net.java.amateras.db.dialect.ColumnType">
+ <name>INTEGER</name>
+ <logicalName>Integer</logicalName>
+ <supportSize>false</supportSize>
+ <type>4</type>
+ </columnType>
+ <size>10</size>
+ <notNull>true</notNull>
+ <primaryKey>false</primaryKey>
+ <description></description>
+ <autoIncrement>false</autoIncrement>
+ <defaultValue>0</defaultValue>
+ </net.java.amateras.db.visual.model.ColumnModel>
+ </columns>
+ <indices/>
+ <constraint>
+ <x>51</x>
+ <y>484</y>
+ <width>-1</width>
+ <height>-1</height>
+ </constraint>
+ <sourceConnections/>
+ <targetConnections>
+ <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+ </targetConnections>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </target>
+ <listeners serialization="custom">
+ <java.beans.PropertyChangeSupport>
+ <default>
+ <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+ <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+ </default>
+ <null/>
+ </java.beans.PropertyChangeSupport>
+ </listeners>
+ </net.java.amateras.db.visual.model.ForeignKeyModel>
<net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
</sourceConnections>
<targetConnections/>
@@ -1442,6 +1978,10 @@
<net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target"/>
<net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target"/>
<net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target"/>
+ <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source"/>
+ <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source"/>
+ <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target"/>
+ <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source"/>
</children>
<dommains/>
<dialectName>MySQL</dialectName>
Modified: timecard/trunk/src/main/config/sql/mysql/timecard.ddl
===================================================================
--- timecard/trunk/src/main/config/sql/mysql/timecard.ddl 2008-12-15 13:48:00 UTC (rev 1614)
+++ timecard/trunk/src/main/config/sql/mysql/timecard.ddl 2008-12-15 13:48:37 UTC (rev 1615)
@@ -1,3 +1,7 @@
+DROP TABLE monthly_working_report;
+DROP TABLE working_type;
+DROP TABLE role_mapping;
+DROP TABLE group_mapping;
DROP TABLE daily_report;
DROP TABLE monthly_report;
DROP TABLE employee;
@@ -53,9 +57,13 @@
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),
+ locale VARCHAR(5),
role_id VARCHAR(255),
group_id VARCHAR(255),
created_time TIMESTAMP NOT NULL,
@@ -76,7 +84,6 @@
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
username VARCHAR(255) NOT NULL,
manager VARCHAR(255) NOT NULL,
- paid_holidays DOUBLE NOT NULL DEFAULT 0,
is_available VARCHAR(1) NOT NULL DEFAULT 'T',
created_time TIMESTAMP NOT NULL,
created_by VARCHAR(255) NOT NULL,
@@ -97,10 +104,7 @@
year INTEGER NOT NULL,
month INTEGER NOT NULL,
status INTEGER NOT NULL DEFAULT 1,
- working_days DOUBLE NOT NULL DEFAULT 0,
std_working_days DOUBLE NOT NULL DEFAULT 0,
- holidays DOUBLE NOT NULL DEFAULT 0,
- paid_holidays DOUBLE NOT NULL DEFAULT 0,
working_time BIGINT(20) NOT NULL DEFAULT 0,
std_working_time BIGINT(20) NOT NULL DEFAULT 0,
over_time BIGINT(20) NOT NULL DEFAULT 0,
@@ -141,3 +145,55 @@
FOREIGN KEY (monthly_report_id) REFERENCES monthly_report (id)
);
+/**********************************
+Table Name: Group Mapping
+**********************************/
+CREATE TABLE group_mapping(
+ id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ user_id VARCHAR(255) NOT NULL,
+ group_id VARCHAR(255) NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES user_info (user_id),
+ FOREIGN KEY (group_id) REFERENCES group_info (group_id)
+);
+
+/**********************************
+Table Name: Role Mapping
+**********************************/
+CREATE TABLE role_mapping(
+ id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ user_id VARCHAR(255) NOT NULL,
+ role_id VARCHAR(255) NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES user_info (user_id),
+ FOREIGN KEY (role_id) REFERENCES role_info (role_id)
+);
+
+/**********************************
+Table Name: Working Type
+**********************************/
+CREATE TABLE working_type(
+ id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ name VARCHAR(100) NOT NULL,
+ value INTEGER NOT NULL,
+ type VARCHAR(10) NOT NULL,
+ parent_id INTEGER DEFAULT 1,
+ created_time TIMESTAMP NOT NULL,
+ created_by VARCHAR(255) NOT NULL,
+ updated_time TIMESTAMP NOT NULL,
+ updated_by VARCHAR(255) NOT NULL,
+ deleted_time TIMESTAMP,
+ deleted_by VARCHAR(255),
+ versionNo INTEGER NOT NULL DEFAULT 0
+);
+
+/**********************************
+Table Name: Monthly Working Report
+**********************************/
+CREATE TABLE monthly_working_report(
+ id BIGINT(20) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ value DOUBLE NOT NULL,
+ monthly_report_id BIGINT(20) NOT NULL,
+ working_type_id INTEGER NOT NULL,
+ FOREIGN KEY (working_type_id) REFERENCES working_type (id),
+ FOREIGN KEY (monthly_report_id) REFERENCES monthly_report (id)
+);
+