svnno****@sourc*****
svnno****@sourc*****
2008年 3月 11日 (火) 17:34:24 JST
Revision: 855
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=855
Author: shinsuke
Date: 2008-03-11 17:34:24 +0900 (Tue, 11 Mar 2008)
Log Message:
-----------
updated pompei-db-h2.
Modified Paths:
--------------
pompei/libraries/pompei-db/trunk/.classpath
pompei/libraries/pompei-db/trunk/pom.xml
pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay
pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql
-------------- next part --------------
Modified: pompei/libraries/pompei-db/trunk/.classpath
===================================================================
--- pompei/libraries/pompei-db/trunk/.classpath 2008-03-11 08:33:42 UTC (rev 854)
+++ pompei/libraries/pompei-db/trunk/.classpath 2008-03-11 08:34:24 UTC (rev 855)
@@ -10,7 +10,7 @@
<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.65/h2-1.0.65.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-SNAPSHOT/pompei-db-h2-0.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-SNAPSHOT/pompei-db-h2-0.1.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-rc1/pompei-db-h2-0.1.0-rc1.jar" sourcepath="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-rc1/pompei-db-h2-0.1.0-rc1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar"/>
@@ -29,4 +29,4 @@
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.21/s2-tiger-2.4.21.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: pompei/libraries/pompei-db/trunk/pom.xml
===================================================================
--- pompei/libraries/pompei-db/trunk/pom.xml 2008-03-11 08:33:42 UTC (rev 854)
+++ pompei/libraries/pompei-db/trunk/pom.xml 2008-03-11 08:34:24 UTC (rev 855)
@@ -119,7 +119,7 @@
<dependency>
<groupId>jp.sf.pal</groupId>
<artifactId>pompei-db-h2</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.0-rc1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay 2008-03-11 08:33:42 UTC (rev 854)
+++ pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay 2008-03-11 08:34:24 UTC (rev 855)
@@ -1025,20 +1025,7 @@
<foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
</foreign-key>
</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755840" remarks="" uid="1350e24:11525502e7d:-7f45" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_FORM_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756810" remarks="" uid="1350e24:11525502e7d:-7f44" unique="false">
-<index-description></index-description>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756860" remarks="" uid="1350e24:11525502e7d:-7f43" unique="false">
-<index-description></index-description>
-<index-column name="ORDER_STATUS_ID" sort="ASC"/>
-</index>
-</index-list>
+<index-list/>
</table>
<table alias="" name="ORDER_PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f42">
<table-description></table-description>
@@ -1650,47 +1637,60 @@
<table-description></table-description>
<table-figure-bounds height="-1" width="-1" x="2710" y="2910"/>
<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ee4">
+<column alias="Product Description Id" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_DESCRIPTION_ID" remarks="" uid="e6f8d7:1189cc7d61b:-7fc1">
<column-description></column-description>
<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
<variant type-name-pattern="BIGINT UNSIGNED"/>
<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
<variant type-name-pattern="BIGINT ZEROFILL"/>
</data-type>
</column>
-<column alias="" auto-increment="false" column-size="150" decimal-digits="0" default-value="''" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7ee2">
+<column alias="Product Id" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ee4">
<column-description></column-description>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="Name" auto-increment="false" column-size="150" decimal-digits="0" default-value="''" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7ee2">
+<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 alias="" auto-increment="false" column-size="80" decimal-digits="0" default-value="" mandatory="false" name="TITLE" remarks="" uid="c0fc8e:11548c89038:-7fc1">
+<column alias="Title" auto-increment="false" column-size="80" decimal-digits="0" default-value="" mandatory="false" name="TITLE" remarks="" uid="c0fc8e:11548c89038:-7fc1">
<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 alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7ee1">
+<column alias="Description" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7ee1">
<column-description></column-description>
<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
<variant type-name-pattern="TEXT"/>
</data-type>
</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="URL" remarks="" uid="1350e24:11525502e7d:-7ee0">
+<column alias="Url" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="URL" remarks="" uid="1350e24:11525502e7d:-7ee0">
<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 alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="1" mandatory="true" name="LANGUAGE" remarks="" uid="1350e24:11525502e7d:-7ee3">
+<column alias="Language" auto-increment="false" column-size="20" decimal-digits="0" default-value="1" mandatory="true" name="LANGUAGE" remarks="" uid="1350e24:11525502e7d:-7ee3">
<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)"/>
@@ -1700,7 +1700,7 @@
</column-list>
<primary-key alias="" name="SQL070831021755590" remarks="" uid="1350e24:11525502e7d:-7ee5">
<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_ID"/>
+<primary-key-column name="PRODUCT_DESCRIPTION_ID"/>
</primary-key>
<unique-key-list/>
<foreign-key-list>
@@ -1784,13 +1784,7 @@
<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
</foreign-key>
</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755670" remarks="" uid="1350e24:11525502e7d:-7ed7" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-</index-list>
+<index-list/>
</table>
<table alias="" name="PRODUCT_TO_CATEGORY" remarks="" uid="1350e24:11525502e7d:-7ec8">
<table-description></table-description>
@@ -3337,16 +3331,7 @@
<foreign-key-column column-name="DELIVERY_ZONE_ID" referenced-key-column-name="DELIVERY_ZONE_ID"/>
</foreign-key>
</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755840" remarks="" uid="8c02cc:117abb4cf2d:-7f94" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_FORM_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756860" remarks="" uid="8c02cc:117abb4cf2d:-7f92" unique="false">
-<index-description></index-description>
-<index-column name="DELIVERY_METHOD_CODE" sort="ASC"/>
-</index>
-</index-list>
+<index-list/>
</table>
<table alias="Order Payment" name="ORDER_PAYMENT" remarks="" uid="8c02cc:117abb4cf2d:-7f7f">
<table-description></table-description>
Modified: pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql
===================================================================
--- pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql 2008-03-11 08:33:42 UTC (rev 854)
+++ pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql 2008-03-11 08:34:24 UTC (rev 855)
@@ -335,13 +335,14 @@
);
CREATE TABLE PRODUCT_DESCRIPTION (
- PRODUCT_ID BIGINT NOT NULL
+ PRODUCT_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+ , PRODUCT_ID BIGINT NOT NULL
, NAME VARCHAR(150) NOT NULL DEFAULT ''
, TITLE VARCHAR(80)
, DESCRIPTION TEXT
, URL VARCHAR(255)
, LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1'
- , PRIMARY KEY (PRODUCT_ID)
+ , PRIMARY KEY (PRODUCT_DESCRIPTION_ID)
);
CREATE TABLE PRODUCT_NOTIFICATION (