[pal-cvs 2824] [568] updated db tables

svnno****@sourc***** svnno****@sourc*****
2007年 9月 20日 (木) 09:27:29 JST


Revision: 568
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=568
Author:   shinsuke
Date:     2007-09-20 09:27:29 +0900 (Thu, 20 Sep 2007)

Log Message:
-----------
updated db tables

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
    pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
    pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-18 09:09:50 UTC (rev 567)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-20 00:27:29 UTC (rev 568)
@@ -7,7 +7,7 @@
 <schema-description></schema-description>
 <domain-list/>
 <table-list>
-<table alias="" name="ADDRESS_BOOKS" remarks="">
+<table alias="" name="ADDRESS_BOOK" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="368" width="277" x="2226" y="364"/>
 <column-list>
@@ -37,17 +37,11 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="GENDER" remarks="">
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="COMPANY" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="2000" precision-min="1" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="COMPANY" remarks="">
-<column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="DEPARTMENT" remarks="">
@@ -68,10 +62,11 @@
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="STREET_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="STREET_ADDRESS" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="SUBURB" remarks="">
@@ -80,28 +75,30 @@
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="POSTCODE" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="CITY" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="CITY" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="STATE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="STATE" remarks="">
+<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="POSTCODE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="TELEPHONE" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="TELEPHONE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="FAX" remarks="">
@@ -154,28 +151,28 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ADDRESS_BOOK_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="ZONE_ID" referenced-key-column-name="ZONE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ADDRESS_BOOK_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="COUNTRY_ID" referenced-key-column-name="COUNTRY_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_4" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ADDRESS_BOOK_4" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOKS_4" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ADDRESS_BOOKS_4" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -194,7 +191,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="CATEGORIES" remarks="">
+<table alias="" name="CATEGORY" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="982" y="3229"/>
 <column-list>
@@ -255,7 +252,7 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_CATEGORIES_1" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CATEGORIES_1" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -270,7 +267,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="CATEGORIES_DESCRIPTION" remarks="">
+<table alias="" name="CATEGORY_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1125" y="2941"/>
 <column-list>
@@ -300,7 +297,7 @@
 <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="256" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
 <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)"/>
@@ -315,14 +312,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021756620" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021756620" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CATEGORY_ID" referenced-key-column-name="CATEGORY_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CATEGORIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CATEGORIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -342,7 +339,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="COUNTRIES" remarks="">
+<table alias="" name="COUNTRY" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="112" width="207" x="2336" y="184"/>
 <column-list>
@@ -396,7 +393,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="CUSTOMERS" remarks="">
+<table alias="" name="CUSTOMER" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="229" width="244" x="2328" y="787"/>
 <column-list>
@@ -451,30 +448,13 @@
 <variant type-name-pattern="DATE"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="96" decimal-digits="0" default-value="" mandatory="true" name="EMAIL_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="EMAIL_ADDRESS" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="TELEPHONE" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="FAX" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CELLPHONE" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
 </column-list>
 <primary-key alias="" name="SQL070831021755080" remarks="">
 <primary-key-description></primary-key-description>
@@ -492,7 +472,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="CUSTOMER_BASKETS" remarks="">
+<table alias="" name="CUSTOMER_BASKET" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="129" width="282" x="2857" y="2150"/>
 <column-list>
@@ -570,14 +550,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -592,7 +572,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="CUSTOMER_BASKET_ATTRIBUTES" remarks="">
+<table alias="" name="CUSTOMER_BASKET_ATTRIBUTE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2942" y="2517"/>
 <column-list>
@@ -661,6 +641,13 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="DATE_ADDED" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
+<variant type-name-pattern="TIMESTAMP"/>
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="SQL070831021755170" remarks="">
 <primary-key-description></primary-key-description>
@@ -668,28 +655,28 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_4" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_4" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCTS_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_5" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTIONS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_5" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -704,7 +691,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="DELIVERY_METHODS" remarks="">
+<table alias="" name="DELIVERY_METHOD" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="335" y="694"/>
 <column-list>
@@ -782,7 +769,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="DELIVERY_METHODS_DESCRIPTION" remarks="">
+<table alias="" name="DELIVERY_METHOD_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1473" y="758"/>
 <column-list>
@@ -821,14 +808,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021756940" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHODS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021756940" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="DELIVERY_METHOD_ID" referenced-key-column-name="DELIVERY_METHOD_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_DELIVERY_METHOD_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_DELIVERY_METHOD_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -848,7 +835,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="GEO_ZONES" remarks="">
+<table alias="" name="GEO_ZONE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1804" y="54"/>
 <column-list>
@@ -865,16 +852,18 @@
 <variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="GEO_ZONE_NAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="255" decimal-digits="0" default-value="" mandatory="true" name="GEO_ZONE_DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="DESCRIPTION" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="26" decimal-digits="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
@@ -909,7 +898,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="LANGUAGES" remarks="">
+<table alias="" name="LANGUAGE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="135" width="228" x="1607" y="1745"/>
 <column-list>
@@ -932,12 +921,11 @@
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="LOCALE" remarks="">
+<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="LOCALE_NAME" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
+<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="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="">
@@ -973,7 +961,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="MANUFACTURERS" remarks="">
+<table alias="" name="MANUFACTURER" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1592" y="3028"/>
 <column-list>
@@ -1036,7 +1024,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="MANUFACTURERS_INFO" remarks="">
+<table alias="" name="MANUFACTURER_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="564" y="3026"/>
 <column-list>
@@ -1095,14 +1083,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021756730" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021756730" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="MANUFACTURER_ID" referenced-key-column-name="MANUFACTURER_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_MANUFACTURERS_INFO_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_MANUFACTURERS_INFO_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -1122,11 +1110,11 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ORDERS" remarks="">
+<table alias="" name="ORDER_FORM" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="27" y="910"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -1152,48 +1140,76 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_NAME" remarks="">
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_GENDER" remarks="">
 <column-description></column-description>
+<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
+<variant type-name-pattern="CHAR"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_FIRSTNAME" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_COMPANY" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_LASTNAME" remarks="">
 <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="64" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_STREET_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_DAY_OF_BIRTH" remarks="">
 <column-description></column-description>
+<data-type jdbc-type="91" literal-prefix="'" literal-suffix="'" name="DATE" selected-variant-pattern="DATE">
+<variant type-name-pattern="DATE"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_EMAIL_ADDRESS" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_SUBURB" remarks="">
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_COMPANY" remarks="">
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_CITY" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_DEPARTMENT" remarks="">
 <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="10" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_POSTCODE" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_STREET_ADDRESS" remarks="">
 <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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_SUBURB" remarks="">
+<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="64" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_CITY" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_STATE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -1201,74 +1217,80 @@
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_COUNTRY" remarks="">
+<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_POSTCODE" remarks="">
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_TELEPHONE" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_COUNTRY_NAME" remarks="">
 <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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_CELLPHONE" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_TELEPHONE" remarks="">
 <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="96" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_EMAIL_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_LOCALE_NAME" remarks="">
 <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="64" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_NAME" remarks="">
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_COMPANY" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_COMPANY" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_DEPARTMENT" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_DEPARTMENT" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_FIRSTNAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_STREET_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LASTNAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_SUBURB" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_STREET_ADDRESS" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_CITY" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_SUBURB" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_POSTCODE" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_CITY" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_STATE" remarks="">
@@ -1277,78 +1299,112 @@
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_COUNTRY" remarks="">
+<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_POSTCODE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_COUNTRY_NAME" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_TELEPHONE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="BILLING_NAME" remarks="">
+<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LOCALE_NAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_COMPANY" remarks="">
+<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="BILLING_COMPANY" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_DEPARTMENT" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="BILLING_DEPARTMENT" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="BILLING_STREET_ADDRESS" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_FIRSTNAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_SUBURB" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LASTNAME" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_CITY" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="BILLING_STREET_ADDRESS" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="10" decimal-digits="0" default-value="" mandatory="true" name="BILLING_POSTCODE" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_SUBURB" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="BILLING_CITY" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_STATE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_COUNTRY" remarks="">
+<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="BILLING_POSTCODE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_COUNTRY_NAME" remarks="">
+<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="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_TELEPHONE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LOCALE_NAME" remarks="">
+<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="PAYMENT_METHOD_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
@@ -1370,47 +1426,19 @@
 <variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="CARD_TYPE_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="ORDER_CARD_INFO_ID" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
+<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 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="16" decimal-digits="0" default-value="" mandatory="false" name="CARD_CODE" remarks="">
-<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="64" decimal-digits="0" default-value="" mandatory="false" name="CARD_OWNER" remarks="">
-<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="32" decimal-digits="0" default-value="" mandatory="false" name="CARD_NUMBER" remarks="">
-<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="4" decimal-digits="0" default-value="" mandatory="false" name="CARD_EXPIRES" remarks="">
-<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="DELIVERY_METHOD_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
@@ -1483,8 +1511,8 @@
 <column alias="" auto-increment="false" column-size="3" decimal-digits="0" default-value="" mandatory="true" name="CURRENCY_CODE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
+<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
 <variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
 <variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
 </data-type>
 </column>
@@ -1530,11 +1558,11 @@
 </column-list>
 <primary-key alias="" name="SQL070831021755840" remarks="">
 <primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_ID"/>
+<primary-key-column name="ORDER_FORM_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021756810" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021756810" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -1548,39 +1576,39 @@
 </foreign-key-figure>
 <foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_3" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHODS" referenced-table="PAYMENT_METHODS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_3" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHOD" referenced-table="PAYMENT_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PAYMENT_METHOD_ID" referenced-key-column-name="PAYMENT_METHOD_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_4" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHODS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_4" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="DELIVERY_METHOD_ID" referenced-key-column-name="DELIVERY_METHOD_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_5" on-delete="" on-update="" referenced-key="PK_CARD_TYPES" referenced-table="CARD_TYPES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_6" on-delete="" on-update="" referenced-key="PK_CURRENCY" referenced-table="CURRENCY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="CARD_TYPE_ID" referenced-key-column-name="CARD_TYPE_ID"/>
+<foreign-key-column column-name="CURRENCY_ID" referenced-key-column-name="CURRENCY_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_6" on-delete="" on-update="" referenced-key="PK_CURRENCIES" referenced-table="CURRENCIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDER_6" on-delete="" on-update="" referenced-key="PK_ORDER_CARD_INFO" referenced-table="ORDER_CARD_INFO" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="CURRENCY_ID" referenced-key-column-name="CURRENCY_ID"/>
+<foreign-key-column column-name="ORDER_CARD_INFO_ID" referenced-key-column-name="ORDER_CARD_INFO_ID"/>
 </foreign-key>
 </foreign-key-list>
 <index-list>
 <index alias="" name="SQL070831021755840" remarks="" unique="true">
 <index-description></index-description>
-<index-column name="ORDER_ID" sort="ASC"/>
+<index-column name="ORDER_FORM_ID" sort="ASC"/>
 </index>
 <index alias="" name="SQL070831021756810" remarks="" unique="false">
 <index-description></index-description>
@@ -1592,7 +1620,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ORDER_PRODUCTS" remarks="">
+<table alias="" name="ORDER_PRODUCT" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="441" y="1910"/>
 <column-list>
@@ -1609,7 +1637,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -1703,14 +1731,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021755891" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021755891" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="ORDER_ID" referenced-key-column-name="ORDER_ID"/>
+<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
 </foreign-key>
-<foreign-key alias="" name="SQL070831021755892" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021755892" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -1725,7 +1753,7 @@
 </index>
 <index alias="" name="SQL070831021755891" remarks="" unique="false">
 <index-description></index-description>
-<index-column name="ORDER_ID" sort="ASC"/>
+<index-column name="ORDER_FORM_ID" sort="ASC"/>
 </index>
 <index alias="" name="SQL070831021755892" remarks="" unique="false">
 <index-description></index-description>
@@ -1733,7 +1761,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ORDER_PRODUCT_ATTRIBUTES" remarks="">
+<table alias="" name="ORDER_PRODUCT_ATTRIBUTE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="687" y="1640"/>
 <column-list>
@@ -1750,7 +1778,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -1811,14 +1839,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="ORDER_ID" referenced-key-column-name="ORDER_ID"/>
+<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -1850,7 +1878,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -1916,14 +1944,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="ORDER_ID" referenced-key-column-name="ORDER_ID"/>
+<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -1971,15 +1999,15 @@
 <column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 <variant type-name-pattern="TIMESTAMP"/>
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 <variant type-name-pattern="TIMESTAMP"/>
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
 </column-list>
@@ -1996,9 +2024,9 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ORDER_STATUS_HISTORIES" remarks="">
+<table alias="" name="ORDER_STATUS_HISTORY" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="663" y="881"/>
+<table-figure-bounds height="-1" width="-1" x="715" y="905"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_HISTORY_ID" remarks="">
 <column-description></column-description>
@@ -2013,7 +2041,7 @@
 <variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -2076,12 +2104,12 @@
 </foreign-key-figure>
 <foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_STATUS_HISTORY_2" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_STATUS_HISTORY_2" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="ORDER_ID" referenced-key-column-name="ORDER_ID"/>
+<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
 </foreign-key>
 </foreign-key-list>
 <index-list>
@@ -2095,11 +2123,11 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ORDER_COMMENTS" remarks="">
+<table alias="" name="ORDER_COMMENT" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="66" y="1898"/>
+<table-figure-bounds height="-1" width="-1" x="24" y="1998"/>
 <column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_ID" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -2129,16 +2157,16 @@
 </column-list>
 <primary-key alias="" name="SQL070831021756170" remarks="">
 <primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_ID"/>
+<primary-key-column name="ORDER_FORM_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_TOTAL_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_TOTAL_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
-<foreign-key-column column-name="ORDER_ID" referenced-key-column-name="ORDER_ID"/>
+<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
 </foreign-key>
 </foreign-key-list>
 <index-list>
@@ -2147,7 +2175,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCTS" remarks="">
+<table alias="" name="PRODUCT" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2246" y="2372"/>
 <column-list>
@@ -2184,6 +2212,13 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="THUMBNAIL" remarks="">
+<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="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -2297,14 +2332,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021755391" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021755391" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="MANUFACTURER_ID" referenced-key-column-name="MANUFACTURER_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_2" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASSES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_2" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2323,7 +2358,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_ATTRIBUTES" remarks="">
+<table alias="" name="PRODUCT_ATTRIBUTE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="3984" y="1800"/>
 <column-list>
@@ -2406,21 +2441,21 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021756760" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021756760" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTIONS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_3" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_3" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2439,7 +2474,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_ATTRIBUTES_DOWNLOAD" remarks="">
+<table alias="" name="PRODUCT_ATTRIBUTE_DOWNLOAD" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="3921" y="1645"/>
 <column-list>
@@ -2496,7 +2531,7 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755500" referenced-table="PRODUCT_ATTRIBUTES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755500" referenced-table="PRODUCT_ATTRIBUTE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2511,7 +2546,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCTS_DESCRIPTION" remarks="">
+<table alias="" name="PRODUCT_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1907" y="3113"/>
 <column-list>
@@ -2577,14 +2612,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021755591" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021755591" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2604,7 +2639,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_NOTIFICATIONS" remarks="">
+<table alias="" name="PRODUCT_NOTIFICATION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2174" y="2017"/>
 <column-list>
@@ -2651,14 +2686,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2674,7 +2709,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_OPTIONS" remarks="">
+<table alias="" name="PRODUCT_OPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="3353" y="2013"/>
 <column-list>
@@ -2705,7 +2740,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_OPTION_VALUES" remarks="">
+<table alias="" name="PRODUCT_OPTION_VALUE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="4038" y="2421"/>
 <column-list>
@@ -2736,7 +2771,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT_OPTION_VALUES_TO_PRODUCT_OPTIONS" remarks="">
+<table alias="" name="PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="78" width="304" x="4601" y="1997"/>
 <column-list>
@@ -2786,14 +2821,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTIONS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2808,7 +2843,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCTS_TO_CATEGORIES" remarks="">
+<table alias="" name="PRODUCT_TO_CATEGORY" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2269" y="3269"/>
 <column-list>
@@ -2853,14 +2888,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="SQL070831021755780" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="SQL070831021755780" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_TO_CATEGORIES_2" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_TO_CATEGORIES_2" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2880,7 +2915,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="REVIEWS" remarks="">
+<table alias="" name="REVIEW" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="159" width="238" x="2479" y="2122"/>
 <column-list>
@@ -2968,14 +3003,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_REVIEWS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_REVIEWS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_REVIEWS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMERS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_REVIEWS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -2990,7 +3025,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="REVIEWS_DESCRIPTION" remarks="">
+<table alias="" name="REVIEW_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2029" y="1607"/>
 <column-list>
@@ -3036,14 +3071,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021756260" referenced-table="REVIEWS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021756260" referenced-table="REVIEW" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="REVIEW_ID" referenced-key-column-name="REVIEW_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3059,11 +3094,11 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="SPECIALS" remarks="">
+<table alias="" name="BARGAIN" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="163" width="308" x="3027" y="3221"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SPECIAL_ID" remarks="">
+<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="BARGAIN_ID" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
@@ -3089,14 +3124,14 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="NEW_PRODUCTS_PRICE" remarks="">
+<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="BARGAIN_PRICE" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
@@ -3116,22 +3151,18 @@
 <variant type-name-pattern="TIMESTAMP"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" name="EXPIRES_DATE" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="START_DATE" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
 <variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" name="DATE_STATUS_CHANGE" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="EXPIRE_DATE" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
 <variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="1" mandatory="true" name="STATUS" remarks="">
@@ -3143,11 +3174,11 @@
 </column-list>
 <primary-key alias="" name="SQL070831021756360" remarks="">
 <primary-key-description></primary-key-description>
-<primary-key-column name="SPECIAL_ID"/>
+<primary-key-column name="BARGAIN_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_SPECIALS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCTS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_SPECIALS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3158,11 +3189,11 @@
 <index-list>
 <index alias="" name="SQL070831021756360" remarks="" unique="true">
 <index-description></index-description>
-<index-column name="SPECIAL_ID" sort="ASC"/>
+<index-column name="BARGAIN_ID" sort="ASC"/>
 </index>
 </index-list>
 </table>
-<table alias="" name="TAX_CLASSES" remarks="">
+<table alias="" name="TAX_CLASS" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="3047" y="825"/>
 <column-list>
@@ -3225,7 +3256,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="TAX_RATES" remarks="">
+<table alias="" name="TAX_RATE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="3079" y="489"/>
 <column-list>
@@ -3319,14 +3350,14 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_TAX_RATES_1" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASSES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_TAX_RATES_1" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="TAX_CLASS_ID" referenced-key-column-name="TAX_CLASS_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_TAX_RATES_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_TAX_RATES_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3341,7 +3372,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ZONES" remarks="">
+<table alias="" name="ZONE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2878" y="229"/>
 <column-list>
@@ -3384,7 +3415,7 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3399,7 +3430,7 @@
 </index>
 </index-list>
 </table>
-<table alias="" name="ZONES_TO_GEO_ZONES" remarks="">
+<table alias="" name="ZONE_TO_GEO_ZONE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="2747" y="32"/>
 <column-list>
@@ -3466,21 +3497,21 @@
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="ZONE_ID" referenced-key-column-name="ZONE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_2" on-delete="" on-update="" referenced-key="SQL070831021756450" referenced-table="GEO_ZONES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_2" on-delete="" on-update="" referenced-key="SQL070831021756450" referenced-table="GEO_ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="GEO_ZONE_ID" referenced-key-column-name="GEO_ZONE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3547,7 +3578,7 @@
 </foreign-key-figure>
 <foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_ORDERS_STATUS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_ORDERS_STATUS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3557,7 +3588,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PRODUCT_OPTIONS_DESCRIPTION" remarks="">
+<table alias="" name="PRODUCT_OPTION_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="104" width="308" x="3318" y="1700"/>
 <column-list>
@@ -3587,7 +3618,7 @@
 <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="256" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
 <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)"/>
@@ -3595,21 +3626,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTIONS_DESCRIPTION" remarks="">
+<primary-key alias="" name="PK_PRODUCT_OPTION_DESCRIPTION" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="PRODUCT_OPTION_ID"/>
 <primary-key-column name="LANGUAGE_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTIONS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3619,7 +3650,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PRODUCT_OPTION_VALUES_DESCRIPTION" remarks="">
+<table alias="" name="PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="109" width="318" x="3471" y="2097"/>
 <column-list>
@@ -3649,7 +3680,7 @@
 <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="256" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
 <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)"/>
@@ -3657,21 +3688,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTION_VALUES_DESCRIPTION" remarks="">
+<primary-key alias="" name="PK_PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="PRODUCT_OPTION_VALUE_ID"/>
 <primary-key-column name="LANGUAGE_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PRODUCT_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3681,7 +3712,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="CURRENCIES" remarks="">
+<table alias="" name="CURRENCY" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="153" width="260" x="503" y="158"/>
 <column-list>
@@ -3730,19 +3761,19 @@
 <column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 <variant type-name-pattern="TIMESTAMP"/>
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
+<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 <variant type-name-pattern="TIMESTAMP"/>
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CURRENCIES" remarks="">
+<primary-key alias="" name="PK_CURRENCY" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="CURRENCY_ID"/>
 </primary-key>
@@ -3750,7 +3781,7 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="CURRENCIES_DESCRIPTION" remarks="">
+<table alias="" name="CURRENCY_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="113" width="266" x="1187" y="207"/>
 <column-list>
@@ -3795,21 +3826,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CURRENCIES_DESCRIPTION" remarks="">
+<primary-key alias="" name="PK_CURRENCY_DESCRIPTION" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="CURRENCY_ID"/>
 <primary-key-column name="LANGUAGE_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CURRENCIES" referenced-table="CURRENCIES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CURRENCY" referenced-table="CURRENCY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CURRENCY_ID" referenced-key-column-name="CURRENCY_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3819,7 +3850,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PAYMENT_METHODS" remarks="">
+<table alias="" name="PAYMENT_METHOD" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="120" width="276" x="523" y="523"/>
 <column-list>
@@ -3871,7 +3902,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PAYMENT_METHODS" remarks="">
+<primary-key alias="" name="PK_PAYMENT_METHOD" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="PAYMENT_METHOD_ID"/>
 </primary-key>
@@ -3879,7 +3910,7 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="PAYMENT_METHODS_DESCRIPTION" remarks="">
+<table alias="" name="PAYMENT_METHOD_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="98" width="330" x="1770" y="602"/>
 <column-list>
@@ -3925,21 +3956,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PAYMENT_METHODS_DESCRIPTION" remarks="">
+<primary-key alias="" name="PK_PAYMENT_METHOD_DESCRIPTION" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="PAYMENT_METHOD_ID"/>
 <primary-key-column name="LANGUAGE_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHODS" referenced-table="PAYMENT_METHODS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHOD" referenced-table="PAYMENT_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="PAYMENT_METHOD_ID" referenced-key-column-name="PAYMENT_METHOD_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -3949,7 +3980,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="CARD_TYPES" remarks="">
+<table alias="" name="CARD_TYPE" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="119" width="292" x="218" y="341"/>
 <column-list>
@@ -3966,7 +3997,7 @@
 <variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="">
 <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)"/>
@@ -4001,7 +4032,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CARD_TYPES" remarks="">
+<primary-key alias="" name="PK_CARD_TYPE" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="CARD_TYPE_ID"/>
 </primary-key>
@@ -4009,7 +4040,7 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="CARD_TYPES_DESCRIPTION" remarks="">
+<table alias="" name="CARD_TYPE_DESCRIPTION" remarks="">
 <table-description></table-description>
 <table-figure-bounds height="115" width="269" x="1504" y="408"/>
 <column-list>
@@ -4055,21 +4086,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CARD_TYPES_DESCRIPTION" remarks="">
+<primary-key alias="" name="PK_CARD_TYPE_DESCRIPTION" remarks="">
 <primary-key-description></primary-key-description>
 <primary-key-column name="CARD_TYPE_ID"/>
 <primary-key-column name="LANGUAGE_ID"/>
 </primary-key>
 <unique-key-list/>
 <foreign-key-list>
-<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CARD_TYPES" referenced-table="CARD_TYPES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CARD_TYPE" referenced-table="CARD_TYPE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
 </foreign-key-figure>
 <foreign-key-column column-name="CARD_TYPE_ID" referenced-key-column-name="CARD_TYPE_ID"/>
 </foreign-key>
-<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGES" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
 <foreign-key-description></foreign-key-description>
 <foreign-key-figure>
 <fk-fig-bendpoint-list/>
@@ -4079,6 +4110,81 @@
 </foreign-key-list>
 <index-list/>
 </table>
+<table alias="" name="ORDER_CARD_INFO" remarks="">
+<table-description></table-description>
+<table-figure-bounds height="132" width="265" x="36" y="574"/>
+<column-list>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_CARD_INFO_ID" remarks="">
+<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 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="0" decimal-digits="0" default-value="" mandatory="false" name="CARD_TYPE_ID" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
+<variant type-name-pattern="INTEGER"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
+<variant type-name-pattern="INTEGER UNSIGNED"/>
+<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INTEGER ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CARD_CODE" remarks="">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="CARD_OWNER" remarks="">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="CARD_NUMBER" remarks="">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="CARD_EXPIRES" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PK_ORDER_CARD_INFO" remarks="">
+<primary-key-description></primary-key-description>
+<primary-key-column name="ORDER_CARD_INFO_ID"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK_ORDER_CARD_INFO_1" on-delete="" on-update="" referenced-key="PK_CARD_TYPE" referenced-table="CARD_TYPE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key-description></foreign-key-description>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="CARD_TYPE_ID" referenced-key-column-name="CARD_TYPE_ID"/>
+</foreign-key>
+</foreign-key-list>
+<index-list/>
+</table>
 </table-list>
 </schema>
 </schema-list>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-18 09:09:50 UTC (rev 567)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-20 00:27:29 UTC (rev 568)
@@ -1,4 +1,4 @@
-CREATE TABLE CUSTOMERS (
+CREATE TABLE CUSTOMER (
        CUSTOMER_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PORTAL_ID VARCHAR(255) NOT NULL
      , GENDER CHAR(1) NOT NULL
@@ -6,14 +6,11 @@
      , LASTNAME VARCHAR(32) NOT NULL
      , NICKNAME VARCHAR(64)
      , DAY_OF_BIRTH DATE NOT NULL DEFAULT '0000-00-00 00:00:00'
-     , EMAIL_ADDRESS VARCHAR(96) NOT NULL
-     , TELEPHONE VARCHAR(32) NOT NULL
-     , FAX VARCHAR(32)
-     , CELLPHONE VARCHAR(32)
+     , EMAIL_ADDRESS VARCHAR(128) NOT NULL
      , PRIMARY KEY (CUSTOMER_ID)
 );
 
-CREATE TABLE DELIVERY_METHODS (
+CREATE TABLE DELIVERY_METHOD (
        DELIVERY_METHOD_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CODE VARCHAR(16) NOT NULL
      , OBJECT_NAME VARCHAR(128) NOT NULL
@@ -24,26 +21,26 @@
      , PRIMARY KEY (DELIVERY_METHOD_ID)
 );
 
-CREATE TABLE GEO_ZONES (
+CREATE TABLE GEO_ZONE (
        GEO_ZONE_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , GEO_ZONE_NAME VARCHAR(32) NOT NULL
-     , GEO_ZONE_DESCRIPTION VARCHAR(255) NOT NULL
+     , NAME VARCHAR(32) NOT NULL
+     , DESCRIPTION VARCHAR(255) NOT NULL
      , LAST_MODIFIED TIMESTAMP
      , DATE_ADDED TIMESTAMP NOT NULL
      , PRIMARY KEY (GEO_ZONE_ID)
 );
 
-CREATE TABLE LANGUAGES (
+CREATE TABLE LANGUAGE (
        LANGUAGE_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , NAME VARCHAR(32) NOT NULL
-     , LOCALE CHAR(16) NOT NULL
+     , LOCALE_NAME VARCHAR(16) NOT NULL
      , IMAGE VARCHAR(64)
      , DIRECTORY_NAME VARCHAR(32)
      , SORT_ORDER INTEGER
      , PRIMARY KEY (LANGUAGE_ID)
 );
 
-CREATE TABLE MANUFACTURERS (
+CREATE TABLE MANUFACTURER (
        MANUFACTURER_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , NAME VARCHAR(32) NOT NULL
      , IMAGE VARCHAR(64)
@@ -60,17 +57,17 @@
      , PRIMARY KEY (ORDER_STATUS_ID)
 );
 
-CREATE TABLE PRODUCT_OPTIONS (
+CREATE TABLE PRODUCT_OPTION (
        PRODUCT_OPTION_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRIMARY KEY (PRODUCT_OPTION_ID)
 );
 
-CREATE TABLE PRODUCT_OPTION_VALUES (
+CREATE TABLE PRODUCT_OPTION_VALUE (
        PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRIMARY KEY (PRODUCT_OPTION_VALUE_ID)
 );
 
-CREATE TABLE TAX_CLASSES (
+CREATE TABLE TAX_CLASS (
        TAX_CLASS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , NAME VARCHAR(32) NOT NULL
      , DESCRIPTION VARCHAR(255) NOT NULL
@@ -79,7 +76,7 @@
      , PRIMARY KEY (TAX_CLASS_ID)
 );
 
-CREATE TABLE CURRENCIES (
+CREATE TABLE CURRENCY (
        CURRENCY_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CODE CHAR(3) NOT NULL
      , SYMBOL_LEFT VARCHAR(12)
@@ -90,7 +87,7 @@
      , PRIMARY KEY (CURRENCY_ID)
 );
 
-CREATE TABLE PAYMENT_METHODS (
+CREATE TABLE PAYMENT_METHOD (
        PAYMENT_METHOD_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CODE VARCHAR(16) NOT NULL
      , SORT_ORDER INTEGER NOT NULL
@@ -99,16 +96,16 @@
      , PRIMARY KEY (PAYMENT_METHOD_ID)
 );
 
-CREATE TABLE CARD_TYPES (
+CREATE TABLE CARD_TYPE (
        CARD_TYPE_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , CODE VARCHAR(16) NOT NULL
+     , CODE VARCHAR(32) NOT NULL
      , SORT_ORDER INTEGER NOT NULL
      , DATE_ADDED TIMESTAMP NOT NULL
      , LAST_MODIFIED TIMESTAMP NOT NULL
      , PRIMARY KEY (CARD_TYPE_ID)
 );
 
-CREATE TABLE COUNTRIES (
+CREATE TABLE COUNTRY (
        COUNTRY_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , NAME VARCHAR(64) NOT NULL
      , ISO_CODE_2 CHAR(2) NOT NULL
@@ -116,47 +113,51 @@
      , PRIMARY KEY (COUNTRY_ID)
 );
 
-CREATE TABLE ORDERS (
-       ORDER_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
+CREATE TABLE ORDER_FORM (
+       ORDER_FORM_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CUSTOMER_ID BIGINT NOT NULL
-     , CUSTOMER_NAME VARCHAR(64) NOT NULL
-     , CUSTOMER_COMPANY VARCHAR(32)
-     , CUSTOMER_STREET_ADDRESS VARCHAR(64) NOT NULL
+     , CUSTOMER_GENDER CHAR(1) NOT NULL
+     , CUSTOMER_FIRSTNAME VARCHAR(32) NOT NULL
+     , CUSTOMER_LASTNAME VARCHAR(32)
+     , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL
+     , CUSTOMER_EMAIL_ADDRESS VARCHAR(128) NOT NULL
+     , CUSTOMER_COMPANY VARCHAR(128)
+     , CUSTOMER_DEPARTMENT VARCHAR(64)
+     , CUSTOMER_STREET_ADDRESS VARCHAR(255) NOT NULL
      , CUSTOMER_SUBURB VARCHAR(32)
-     , CUSTOMER_CITY VARCHAR(32) NOT NULL
+     , CUSTOMER_CITY VARCHAR(64) NOT NULL
+     , CUSTOMER_STATE VARCHAR(32)
      , CUSTOMER_POSTCODE VARCHAR(10) NOT NULL
-     , CUSTOMER_STATE VARCHAR(32)
-     , CUSTOMER_COUNTRY VARCHAR(32) NOT NULL
-     , CUSTOMER_TELEPHONE VARCHAR(32) NOT NULL
-     , CUSTOMER_CELLPHONE VARCHAR(32)
-     , CUSTOMER_EMAIL_ADDRESS VARCHAR(96) NOT NULL
-     , DELIVERY_NAME VARCHAR(64) NOT NULL
-     , DELIVERY_COMPANY VARCHAR(32)
-     , DELIVERY_DEPARTMENT VARCHAR(32)
-     , DELIVERY_STREET_ADDRESS VARCHAR(64) NOT NULL
+     , CUSTOMER_COUNTRY_NAME VARCHAR(32) NOT NULL
+     , CUSTOMER_TELEPHONE VARCHAR(32)
+     , CUSTOMER_LOCALE_NAME VARCHAR(16) NOT NULL
+     , DELIVERY_COMPANY VARCHAR(128)
+     , DELIVERY_DEPARTMENT VARCHAR(64)
+     , DELIVERY_FIRSTNAME VARCHAR(32) NOT NULL
+     , DELIVERY_LASTNAME VARCHAR(32) NOT NULL
+     , DELIVERY_STREET_ADDRESS VARCHAR(255) NOT NULL
      , DELIVERY_SUBURB VARCHAR(32)
-     , DELIVERY_CITY VARCHAR(32) NOT NULL
+     , DELIVERY_CITY VARCHAR(64) NOT NULL
+     , DELIVERY_STATE VARCHAR(32)
      , DELIVERY_POSTCODE VARCHAR(10) NOT NULL
-     , DELIVERY_STATE VARCHAR(32)
-     , DELIVERY_COUNTRY VARCHAR(32) NOT NULL
+     , DELIVERY_COUNTRY_NAME VARCHAR(32) NOT NULL
      , DELIVERY_TELEPHONE VARCHAR(32)
-     , BILLING_NAME VARCHAR(64) NOT NULL
-     , BILLING_COMPANY VARCHAR(32)
-     , BILLING_DEPARTMENT VARCHAR(32)
-     , BILLING_STREET_ADDRESS VARCHAR(64) NOT NULL
+     , DELIVERY_LOCALE_NAME VARCHAR(16) NOT NULL
+     , BILLING_COMPANY VARCHAR(128)
+     , BILLING_DEPARTMENT VARCHAR(64)
+     , BILLING_FIRSTNAME VARCHAR(32) NOT NULL
+     , BILLING_LASTNAME VARCHAR(32) NOT NULL
+     , BILLING_STREET_ADDRESS VARCHAR(255) NOT NULL
      , BILLING_SUBURB VARCHAR(32)
-     , BILLING_CITY VARCHAR(32) NOT NULL
+     , BILLING_CITY VARCHAR(64) NOT NULL
+     , BILLING_STATE VARCHAR(32)
      , BILLING_POSTCODE VARCHAR(10) NOT NULL
-     , BILLING_STATE VARCHAR(32)
-     , BILLING_COUNTRY VARCHAR(32) NOT NULL
+     , BILLING_COUNTRY_NAME VARCHAR(32) NOT NULL
      , BILLING_TELEPHONE VARCHAR(32)
+     , BILLING_LOCALE_NAME VARCHAR(16) NOT NULL
      , PAYMENT_METHOD_ID INTEGER
      , PAYMENT_METHOD_CODE CHAR(16) NOT NULL
-     , CARD_TYPE_ID INTEGER
-     , CARD_CODE VARCHAR(16)
-     , CARD_OWNER VARCHAR(64)
-     , CARD_NUMBER VARCHAR(32)
-     , CARD_EXPIRES VARCHAR(4)
+     , ORDER_CARD_INFO_ID BIGINT
      , DELIVERY_METHOD_ID INTEGER
      , DELIVERY_METHOD_CODE VARCHAR(16) NOT NULL
      , LAST_MODIFIED TIMESTAMP
@@ -168,13 +169,14 @@
      , DELIVERY_PRICE DECIMAL(14, 6) NOT NULL
      , FINAL_PRICE DECIMAL(14, 6) NOT NULL
      , TAX DECIMAL(14, 6) NOT NULL
-     , PRIMARY KEY (ORDER_ID)
+     , PRIMARY KEY (ORDER_FORM_ID)
 );
 
-CREATE TABLE PRODUCTS (
+CREATE TABLE PRODUCT (
        PRODUCT_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , QUANTITY INTEGER NOT NULL
      , MODEL VARCHAR(32)
+     , THUMBNAIL VARCHAR(64)
      , IMAGE VARCHAR(64)
      , PRICE DECIMAL(15, 4) NOT NULL
      , DATE_ADDED TIMESTAMP NOT NULL
@@ -188,7 +190,7 @@
      , PRIMARY KEY (PRODUCT_ID)
 );
 
-CREATE TABLE CATEGORIES (
+CREATE TABLE CATEGORY (
        CATEGORY_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , IMAGE VARCHAR(64)
      , PARENT_ID INTEGER DEFAULT 0
@@ -198,7 +200,7 @@
      , PRIMARY KEY (CATEGORY_ID)
 );
 
-CREATE TABLE REVIEWS (
+CREATE TABLE REVIEW (
        REVIEW_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRODUCT_ID BIGINT NOT NULL
      , CUSTOMER_ID BIGINT
@@ -209,7 +211,7 @@
      , PRIMARY KEY (REVIEW_ID)
 );
 
-CREATE TABLE ZONES (
+CREATE TABLE ZONE (
        ZONE_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , COUNTRY_ID INTEGER NOT NULL
      , ZONE_CODE VARCHAR(32) NOT NULL
@@ -217,7 +219,17 @@
      , PRIMARY KEY (ZONE_ID)
 );
 
-CREATE TABLE PRODUCT_ATTRIBUTES (
+CREATE TABLE ORDER_CARD_INFO (
+       ORDER_CARD_INFO_ID BIGINT NOT NULL
+     , CARD_TYPE_ID INTEGER
+     , CARD_CODE VARCHAR(32)
+     , CARD_OWNER VARCHAR(255)
+     , CARD_NUMBER VARCHAR(255)
+     , CARD_EXPIRES VARCHAR(255)
+     , PRIMARY KEY (ORDER_CARD_INFO_ID)
+);
+
+CREATE TABLE PRODUCT_ATTRIBUTE (
        PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRODUCT_ID BIGINT NOT NULL
      , PRODUCT_OPTION_ID BIGINT NOT NULL
@@ -227,15 +239,15 @@
      , PRIMARY KEY (PRODUCT_ATTRIBUTE_ID)
 );
 
-CREATE TABLE CATEGORIES_DESCRIPTION (
+CREATE TABLE CATEGORY_DESCRIPTION (
        CATEGORY_ID INTEGER NOT NULL DEFAULT 0
      , LANGUAGE_ID INTEGER NOT NULL DEFAULT 1
      , NAME VARCHAR(32) NOT NULL
-     , DESCRIPTION VARCHAR(256)
+     , DESCRIPTION VARCHAR(255)
      , PRIMARY KEY (CATEGORY_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE CUSTOMER_BASKETS (
+CREATE TABLE CUSTOMER_BASKET (
        CUSTOMER_BASKET_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CUSTOMER_ID BIGINT NOT NULL
      , PRODUCT_ID BIGINT NOT NULL
@@ -245,16 +257,17 @@
      , PRIMARY KEY (CUSTOMER_BASKET_ID)
 );
 
-CREATE TABLE CUSTOMER_BASKET_ATTRIBUTES (
+CREATE TABLE CUSTOMER_BASKET_ATTRIBUTE (
        CUSTOMERS_BASKET_ATTRIBUTE_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CUSTOMER_ID BIGINT NOT NULL
      , PRODUCT_ID BIGINT NOT NULL
      , PRODUCTS_OPTION_ID BIGINT NOT NULL
      , PRODUCTS_OPTION_VALUE_ID BIGINT NOT NULL
+     , DATE_ADDED TIMESTAMP
      , PRIMARY KEY (CUSTOMERS_BASKET_ATTRIBUTE_ID)
 );
 
-CREATE TABLE DELIVERY_METHODS_DESCRIPTION (
+CREATE TABLE DELIVERY_METHOD_DESCRIPTION (
        DELIVERY_METHOD_ID INTEGER NOT NULL DEFAULT 0
      , LANGUAGE_ID INTEGER NOT NULL DEFAULT 1
      , NAME VARCHAR(64) NOT NULL
@@ -262,7 +275,7 @@
      , PRIMARY KEY (DELIVERY_METHOD_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE MANUFACTURERS_INFO (
+CREATE TABLE MANUFACTURER_DESCRIPTION (
        MANUFACTURER_ID INTEGER NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , URL VARCHAR(255) NOT NULL
@@ -271,9 +284,9 @@
      , PRIMARY KEY (LANGUAGE_ID, MANUFACTURER_ID)
 );
 
-CREATE TABLE ORDER_PRODUCTS (
+CREATE TABLE ORDER_PRODUCT (
        ORDER_PRODUCT_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , ORDER_ID BIGINT NOT NULL
+     , ORDER_FORM_ID BIGINT NOT NULL
      , PRODUCT_ID BIGINT NOT NULL
      , MODEL VARCHAR(32)
      , NAME VARCHAR(64) NOT NULL
@@ -284,9 +297,9 @@
      , PRIMARY KEY (ORDER_PRODUCT_ID)
 );
 
-CREATE TABLE ORDER_PRODUCT_ATTRIBUTES (
+CREATE TABLE ORDER_PRODUCT_ATTRIBUTE (
        ORDER_PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , ORDER_ID BIGINT NOT NULL
+     , ORDER_FORM_ID BIGINT NOT NULL
      , PRODUCT_ID BIGINT NOT NULL
      , PRODUCTS_OPTIONS VARCHAR(32) NOT NULL
      , PRODUCT_OPTION_VALUE VARCHAR(32) NOT NULL
@@ -297,7 +310,7 @@
 
 CREATE TABLE ORDER_PRODUCT_DOWNLOAD (
        ORDER_PRODUCT_DOWNLOAD_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , ORDER_ID BIGINT NOT NULL DEFAULT 0
+     , ORDER_FORM_ID BIGINT NOT NULL DEFAULT 0
      , PRODUCT_ID BIGINT NOT NULL DEFAULT 0
      , FILENAME VARCHAR(255) NOT NULL DEFAULT ''
      , MAXDAYS INTEGER NOT NULL DEFAULT 0
@@ -305,9 +318,9 @@
      , PRIMARY KEY (ORDER_PRODUCT_DOWNLOAD_ID)
 );
 
-CREATE TABLE ORDER_STATUS_HISTORIES (
+CREATE TABLE ORDER_STATUS_HISTORY (
        ORDER_STATUS_HISTORY_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , ORDER_ID BIGINT NOT NULL
+     , ORDER_FORM_ID BIGINT NOT NULL
      , ORDER_STATUS_ID INTEGER NOT NULL
      , DATE_ADDED TIMESTAMP NOT NULL
      , CUSTOMER_NOTIFIED INTEGER DEFAULT 0
@@ -315,14 +328,14 @@
      , PRIMARY KEY (ORDER_STATUS_HISTORY_ID)
 );
 
-CREATE TABLE ORDER_COMMENTS (
-       ORDER_ID BIGINT NOT NULL
+CREATE TABLE ORDER_COMMENT (
+       ORDER_FORM_ID BIGINT NOT NULL
      , TITLE VARCHAR(255) NOT NULL
      , TEXT LONG VARCHAR NOT NULL
-     , PRIMARY KEY (ORDER_ID)
+     , PRIMARY KEY (ORDER_FORM_ID)
 );
 
-CREATE TABLE PRODUCT_ATTRIBUTES_DOWNLOAD (
+CREATE TABLE PRODUCT_ATTRIBUTE_DOWNLOAD (
        PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL
      , FILENAME VARCHAR(255) NOT NULL DEFAULT ''
      , MAXDAYS INTEGER DEFAULT 0
@@ -330,7 +343,7 @@
      , PRIMARY KEY (PRODUCT_ATTRIBUTE_ID)
 );
 
-CREATE TABLE PRODUCTS_DESCRIPTION (
+CREATE TABLE PRODUCT_DESCRIPTION (
        PRODUCT_ID BIGINT NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL DEFAULT 1
      , NAME VARCHAR(64) NOT NULL DEFAULT ''
@@ -340,47 +353,47 @@
      , PRIMARY KEY (LANGUAGE_ID, PRODUCT_ID)
 );
 
-CREATE TABLE PRODUCT_NOTIFICATIONS (
+CREATE TABLE PRODUCT_NOTIFICATION (
        PRODUCT_ID BIGINT NOT NULL
      , CUSTOMER_ID BIGINT NOT NULL
      , DATE_ADDED TIMESTAMP NOT NULL
      , PRIMARY KEY (CUSTOMER_ID, PRODUCT_ID)
 );
 
-CREATE TABLE PRODUCT_OPTION_VALUES_TO_PRODUCT_OPTIONS (
+CREATE TABLE PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION (
        ASSOCIATION_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRODUCT_OPTION_ID BIGINT NOT NULL
      , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL
      , PRIMARY KEY (ASSOCIATION_ID)
 );
 
-CREATE TABLE PRODUCTS_TO_CATEGORIES (
+CREATE TABLE PRODUCT_TO_CATEGORY (
        PRODUCT_ID BIGINT NOT NULL
      , CATEGORY_ID INTEGER NOT NULL
      , COMMENT VARCHAR(64)
      , PRIMARY KEY (CATEGORY_ID, PRODUCT_ID)
 );
 
-CREATE TABLE REVIEWS_DESCRIPTION (
+CREATE TABLE REVIEW_DESCRIPTION (
        REVIEW_ID BIGINT NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , REVIEW_TEXT LONG VARCHAR NOT NULL
      , PRIMARY KEY (LANGUAGE_ID, REVIEW_ID)
 );
 
-CREATE TABLE SPECIALS (
-       SPECIAL_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
+CREATE TABLE BARGAIN (
+       BARGAIN_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRODUCT_ID BIGINT NOT NULL
-     , NEW_PRODUCTS_PRICE DECIMAL(15, 4) NOT NULL
+     , BARGAIN_PRICE DECIMAL(15, 4) NOT NULL
      , DATE_ADDED TIMESTAMP
      , LAST_MODIFIED TIMESTAMP
-     , EXPIRES_DATE TIMESTAMP
-     , DATE_STATUS_CHANGE TIMESTAMP
+     , START_DATE TIMESTAMP
+     , EXPIRE_DATE TIMESTAMP
      , STATUS INTEGER NOT NULL DEFAULT 1
-     , PRIMARY KEY (SPECIAL_ID)
+     , PRIMARY KEY (BARGAIN_ID)
 );
 
-CREATE TABLE TAX_RATES (
+CREATE TABLE TAX_RATE (
        TAX_RATES_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , ZONE_ID INTEGER NOT NULL
      , TAX_CLASS_ID INTEGER NOT NULL
@@ -392,7 +405,7 @@
      , PRIMARY KEY (TAX_RATES_ID)
 );
 
-CREATE TABLE ZONES_TO_GEO_ZONES (
+CREATE TABLE ZONE_TO_GEO_ZONE (
        ASSOCIATION_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , COUNTRY_ID INTEGER NOT NULL
      , ZONE_ID INTEGER
@@ -410,23 +423,23 @@
      , PRIMARY KEY (ORDER_STATUS_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE PRODUCT_OPTIONS_DESCRIPTION (
+CREATE TABLE PRODUCT_OPTION_DESCRIPTION (
        PRODUCT_OPTION_ID BIGINT NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , NAME VARCHAR(32) NOT NULL
-     , DESCRIPTION VARCHAR(256)
+     , DESCRIPTION VARCHAR(255)
      , PRIMARY KEY (PRODUCT_OPTION_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE PRODUCT_OPTION_VALUES_DESCRIPTION (
+CREATE TABLE PRODUCT_OPTION_VALUE_DESCRIPTION (
        PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , NAME VARCHAR(64) NOT NULL
-     , DESCRIPTION VARCHAR(256)
+     , DESCRIPTION VARCHAR(255)
      , PRIMARY KEY (PRODUCT_OPTION_VALUE_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE CURRENCIES_DESCRIPTION (
+CREATE TABLE CURRENCY_DESCRIPTION (
        CURRENCY_ID INTEGER NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , NAME VARCHAR(32) NOT NULL
@@ -434,7 +447,7 @@
      , PRIMARY KEY (CURRENCY_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE PAYMENT_METHODS_DESCRIPTION (
+CREATE TABLE PAYMENT_METHOD_DESCRIPTION (
        PAYMENT_METHOD_ID INTEGER NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , NAME VARCHAR(64) NOT NULL
@@ -442,7 +455,7 @@
      , PRIMARY KEY (PAYMENT_METHOD_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE CARD_TYPES_DESCRIPTION (
+CREATE TABLE CARD_TYPE_DESCRIPTION (
        CARD_TYPE_ID INTEGER NOT NULL
      , LANGUAGE_ID INTEGER NOT NULL
      , NAME VARCHAR(64) NOT NULL
@@ -450,20 +463,19 @@
      , PRIMARY KEY (CARD_TYPE_ID, LANGUAGE_ID)
 );
 
-CREATE TABLE ADDRESS_BOOKS (
+CREATE TABLE ADDRESS_BOOK (
        ADDRESS_BOOK_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , CUSTOMER_ID BIGINT NOT NULL
-     , GENDER CHAR(1) NOT NULL
-     , COMPANY VARCHAR(64)
+     , COMPANY VARCHAR(128)
      , DEPARTMENT VARCHAR(64)
      , FIRSTNAME VARCHAR(32) NOT NULL
      , LASTNAME VARCHAR(32) NOT NULL
-     , STREET_ADDRESS VARCHAR(64) NOT NULL
+     , STREET_ADDRESS VARCHAR(255) NOT NULL
      , SUBURB VARCHAR(32)
+     , CITY VARCHAR(64) NOT NULL
+     , STATE VARCHAR(32)
      , POSTCODE VARCHAR(10) NOT NULL
-     , CITY VARCHAR(32) NOT NULL
-     , STATE VARCHAR(32)
-     , TELEPHONE VARCHAR(32) NOT NULL
+     , TELEPHONE VARCHAR(32)
      , FAX VARCHAR(32)
      , CELLPHONE VARCHAR(32)
      , DEFAULT_ADDRESS INTEGER NOT NULL
@@ -473,270 +485,275 @@
      , PRIMARY KEY (ADDRESS_BOOK_ID)
 );
 
-ALTER TABLE ORDERS
+ALTER TABLE ORDER_FORM
   ADD CONSTRAINT SQL070831021756810
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE ORDERS
+ALTER TABLE ORDER_FORM
   ADD CONSTRAINT SQL070831021756860
       FOREIGN KEY (ORDER_STATUS_ID)
       REFERENCES ORDER_STATUS (ORDER_STATUS_ID);
 
-ALTER TABLE ORDERS
+ALTER TABLE ORDER_FORM
   ADD CONSTRAINT FK_ORDERS_3
       FOREIGN KEY (PAYMENT_METHOD_ID)
-      REFERENCES PAYMENT_METHODS (PAYMENT_METHOD_ID);
+      REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID);
 
-ALTER TABLE ORDERS
+ALTER TABLE ORDER_FORM
   ADD CONSTRAINT FK_ORDERS_4
       FOREIGN KEY (DELIVERY_METHOD_ID)
-      REFERENCES DELIVERY_METHODS (DELIVERY_METHOD_ID);
+      REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID);
 
-ALTER TABLE ORDERS
-  ADD CONSTRAINT FK_ORDERS_5
-      FOREIGN KEY (CARD_TYPE_ID)
-      REFERENCES CARD_TYPES (CARD_TYPE_ID);
-
-ALTER TABLE ORDERS
+ALTER TABLE ORDER_FORM
   ADD CONSTRAINT FK_ORDERS_6
       FOREIGN KEY (CURRENCY_ID)
-      REFERENCES CURRENCIES (CURRENCY_ID);
+      REFERENCES CURRENCY (CURRENCY_ID);
 
-ALTER TABLE PRODUCTS
+ALTER TABLE ORDER_FORM
+  ADD CONSTRAINT FK_ORDER_6
+      FOREIGN KEY (ORDER_CARD_INFO_ID)
+      REFERENCES ORDER_CARD_INFO (ORDER_CARD_INFO_ID);
+
+ALTER TABLE PRODUCT
   ADD CONSTRAINT SQL070831021755391
       FOREIGN KEY (MANUFACTURER_ID)
-      REFERENCES MANUFACTURERS (MANUFACTURER_ID);
+      REFERENCES MANUFACTURER (MANUFACTURER_ID);
 
-ALTER TABLE PRODUCTS
+ALTER TABLE PRODUCT
   ADD CONSTRAINT FK_PRODUCTS_2
       FOREIGN KEY (TAX_CLASS_ID)
-      REFERENCES TAX_CLASSES (TAX_CLASS_ID);
+      REFERENCES TAX_CLASS (TAX_CLASS_ID);
 
-ALTER TABLE CATEGORIES
+ALTER TABLE CATEGORY
   ADD CONSTRAINT FK_CATEGORIES_1
       FOREIGN KEY (PARENT_ID)
-      REFERENCES CATEGORIES (CATEGORY_ID);
+      REFERENCES CATEGORY (CATEGORY_ID);
 
-ALTER TABLE REVIEWS
+ALTER TABLE REVIEW
   ADD CONSTRAINT FK_REVIEWS_1
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE REVIEWS
+ALTER TABLE REVIEW
   ADD CONSTRAINT FK_REVIEWS_2
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE ZONES
+ALTER TABLE ZONE
   ADD CONSTRAINT FK_ZONES_1
       FOREIGN KEY (COUNTRY_ID)
-      REFERENCES COUNTRIES (COUNTRY_ID);
+      REFERENCES COUNTRY (COUNTRY_ID);
 
-ALTER TABLE PRODUCT_ATTRIBUTES
+ALTER TABLE ORDER_CARD_INFO
+  ADD CONSTRAINT FK_ORDER_CARD_INFO_1
+      FOREIGN KEY (CARD_TYPE_ID)
+      REFERENCES CARD_TYPE (CARD_TYPE_ID);
+
+ALTER TABLE PRODUCT_ATTRIBUTE
   ADD CONSTRAINT SQL070831021756760
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE PRODUCT_ATTRIBUTES
+ALTER TABLE PRODUCT_ATTRIBUTE
   ADD CONSTRAINT FK_PRODUCTS_ATTRIBUTES_2
       FOREIGN KEY (PRODUCT_OPTION_ID)
-      REFERENCES PRODUCT_OPTIONS (PRODUCT_OPTION_ID);
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID);
 
-ALTER TABLE PRODUCT_ATTRIBUTES
+ALTER TABLE PRODUCT_ATTRIBUTE
   ADD CONSTRAINT FK_PRODUCTS_ATTRIBUTES_3
       FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
-      REFERENCES PRODUCT_OPTION_VALUES (PRODUCT_OPTION_VALUE_ID);
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID);
 
-ALTER TABLE CATEGORIES_DESCRIPTION
+ALTER TABLE CATEGORY_DESCRIPTION
   ADD CONSTRAINT SQL070831021756620
       FOREIGN KEY (CATEGORY_ID)
-      REFERENCES CATEGORIES (CATEGORY_ID);
+      REFERENCES CATEGORY (CATEGORY_ID);
 
-ALTER TABLE CATEGORIES_DESCRIPTION
+ALTER TABLE CATEGORY_DESCRIPTION
   ADD CONSTRAINT FK_CATEGORIES_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE CUSTOMER_BASKETS
+ALTER TABLE CUSTOMER_BASKET
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_1
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE CUSTOMER_BASKETS
+ALTER TABLE CUSTOMER_BASKET
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_2
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE CUSTOMER_BASKET_ATTRIBUTES
+ALTER TABLE CUSTOMER_BASKET_ATTRIBUTE
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_ATTRIBUTES_1
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE CUSTOMER_BASKET_ATTRIBUTES
+ALTER TABLE CUSTOMER_BASKET_ATTRIBUTE
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_ATTRIBUTES_2
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE CUSTOMER_BASKET_ATTRIBUTES
+ALTER TABLE CUSTOMER_BASKET_ATTRIBUTE
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_ATTRIBUTES_4
       FOREIGN KEY (PRODUCTS_OPTION_VALUE_ID)
-      REFERENCES PRODUCT_OPTION_VALUES (PRODUCT_OPTION_VALUE_ID);
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID);
 
-ALTER TABLE CUSTOMER_BASKET_ATTRIBUTES
+ALTER TABLE CUSTOMER_BASKET_ATTRIBUTE
   ADD CONSTRAINT FK_CUSTOMERS_BASKET_ATTRIBUTES_5
       FOREIGN KEY (PRODUCTS_OPTION_ID)
-      REFERENCES PRODUCT_OPTIONS (PRODUCT_OPTION_ID);
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID);
 
-ALTER TABLE DELIVERY_METHODS_DESCRIPTION
+ALTER TABLE DELIVERY_METHOD_DESCRIPTION
   ADD CONSTRAINT SQL070831021756940
       FOREIGN KEY (DELIVERY_METHOD_ID)
-      REFERENCES DELIVERY_METHODS (DELIVERY_METHOD_ID);
+      REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID);
 
-ALTER TABLE DELIVERY_METHODS_DESCRIPTION
+ALTER TABLE DELIVERY_METHOD_DESCRIPTION
   ADD CONSTRAINT FK_DELIVERY_METHOD_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE MANUFACTURERS_INFO
+ALTER TABLE MANUFACTURER_DESCRIPTION
   ADD CONSTRAINT SQL070831021756730
       FOREIGN KEY (MANUFACTURER_ID)
-      REFERENCES MANUFACTURERS (MANUFACTURER_ID);
+      REFERENCES MANUFACTURER (MANUFACTURER_ID);
 
-ALTER TABLE MANUFACTURERS_INFO
+ALTER TABLE MANUFACTURER_DESCRIPTION
   ADD CONSTRAINT FK_MANUFACTURERS_INFO_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE ORDER_PRODUCTS
+ALTER TABLE ORDER_PRODUCT
   ADD CONSTRAINT SQL070831021755891
-      FOREIGN KEY (ORDER_ID)
-      REFERENCES ORDERS (ORDER_ID);
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID);
 
-ALTER TABLE ORDER_PRODUCTS
+ALTER TABLE ORDER_PRODUCT
   ADD CONSTRAINT SQL070831021755892
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE ORDER_PRODUCT_ATTRIBUTES
+ALTER TABLE ORDER_PRODUCT_ATTRIBUTE
   ADD CONSTRAINT FK_ORDERS_PRODUCTS_ATTRIBUTES_1
-      FOREIGN KEY (ORDER_ID)
-      REFERENCES ORDERS (ORDER_ID);
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID);
 
-ALTER TABLE ORDER_PRODUCT_ATTRIBUTES
+ALTER TABLE ORDER_PRODUCT_ATTRIBUTE
   ADD CONSTRAINT FK_ORDERS_PRODUCTS_ATTRIBUTES_2
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
 ALTER TABLE ORDER_PRODUCT_DOWNLOAD
   ADD CONSTRAINT FK_ORDERS_PRODUCTS_DOWNLOAD_1
-      FOREIGN KEY (ORDER_ID)
-      REFERENCES ORDERS (ORDER_ID);
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID);
 
 ALTER TABLE ORDER_PRODUCT_DOWNLOAD
   ADD CONSTRAINT FK_ORDERS_PRODUCTS_DOWNLOAD_2
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE ORDER_STATUS_HISTORIES
+ALTER TABLE ORDER_STATUS_HISTORY
   ADD CONSTRAINT SQL070831021756900
       FOREIGN KEY (ORDER_STATUS_ID)
       REFERENCES ORDER_STATUS (ORDER_STATUS_ID);
 
-ALTER TABLE ORDER_STATUS_HISTORIES
+ALTER TABLE ORDER_STATUS_HISTORY
   ADD CONSTRAINT FK_ORDERS_STATUS_HISTORY_2
-      FOREIGN KEY (ORDER_ID)
-      REFERENCES ORDERS (ORDER_ID);
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID);
 
-ALTER TABLE ORDER_COMMENTS
+ALTER TABLE ORDER_COMMENT
   ADD CONSTRAINT FK_ORDERS_TOTAL_1
-      FOREIGN KEY (ORDER_ID)
-      REFERENCES ORDERS (ORDER_ID);
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID);
 
-ALTER TABLE PRODUCT_ATTRIBUTES_DOWNLOAD
+ALTER TABLE PRODUCT_ATTRIBUTE_DOWNLOAD
   ADD CONSTRAINT FK_PRODUCTS_ATTRIBUTES_DOWNLOAD_1
       FOREIGN KEY (PRODUCT_ATTRIBUTE_ID)
-      REFERENCES PRODUCT_ATTRIBUTES (PRODUCT_ATTRIBUTE_ID);
+      REFERENCES PRODUCT_ATTRIBUTE (PRODUCT_ATTRIBUTE_ID);
 
-ALTER TABLE PRODUCTS_DESCRIPTION
+ALTER TABLE PRODUCT_DESCRIPTION
   ADD CONSTRAINT SQL070831021755591
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE PRODUCTS_DESCRIPTION
+ALTER TABLE PRODUCT_DESCRIPTION
   ADD CONSTRAINT FK_PRODUCTS_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE PRODUCT_NOTIFICATIONS
+ALTER TABLE PRODUCT_NOTIFICATION
   ADD CONSTRAINT FK_PRODUCTS_NOTIFICATIONS_1
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE PRODUCT_NOTIFICATIONS
+ALTER TABLE PRODUCT_NOTIFICATION
   ADD CONSTRAINT FK_PRODUCTS_NOTIFICATIONS_2
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE PRODUCT_OPTION_VALUES_TO_PRODUCT_OPTIONS
+ALTER TABLE PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_1
       FOREIGN KEY (PRODUCT_OPTION_ID)
-      REFERENCES PRODUCT_OPTIONS (PRODUCT_OPTION_ID);
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID);
 
-ALTER TABLE PRODUCT_OPTION_VALUES_TO_PRODUCT_OPTIONS
+ALTER TABLE PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_2
       FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
-      REFERENCES PRODUCT_OPTION_VALUES (PRODUCT_OPTION_VALUE_ID);
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID);
 
-ALTER TABLE PRODUCTS_TO_CATEGORIES
+ALTER TABLE PRODUCT_TO_CATEGORY
   ADD CONSTRAINT SQL070831021755780
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE PRODUCTS_TO_CATEGORIES
+ALTER TABLE PRODUCT_TO_CATEGORY
   ADD CONSTRAINT FK_PRODUCTS_TO_CATEGORIES_2
       FOREIGN KEY (CATEGORY_ID)
-      REFERENCES CATEGORIES (CATEGORY_ID);
+      REFERENCES CATEGORY (CATEGORY_ID);
 
-ALTER TABLE REVIEWS_DESCRIPTION
+ALTER TABLE REVIEW_DESCRIPTION
   ADD CONSTRAINT FK_REVIEWS_DESCRIPTION_1
       FOREIGN KEY (REVIEW_ID)
-      REFERENCES REVIEWS (REVIEW_ID);
+      REFERENCES REVIEW (REVIEW_ID);
 
-ALTER TABLE REVIEWS_DESCRIPTION
+ALTER TABLE REVIEW_DESCRIPTION
   ADD CONSTRAINT FK_REVIEWS_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE SPECIALS
+ALTER TABLE BARGAIN
   ADD CONSTRAINT FK_SPECIALS_1
       FOREIGN KEY (PRODUCT_ID)
-      REFERENCES PRODUCTS (PRODUCT_ID);
+      REFERENCES PRODUCT (PRODUCT_ID);
 
-ALTER TABLE TAX_RATES
+ALTER TABLE TAX_RATE
   ADD CONSTRAINT FK_TAX_RATES_1
       FOREIGN KEY (TAX_CLASS_ID)
-      REFERENCES TAX_CLASSES (TAX_CLASS_ID);
+      REFERENCES TAX_CLASS (TAX_CLASS_ID);
 
-ALTER TABLE TAX_RATES
+ALTER TABLE TAX_RATE
   ADD CONSTRAINT FK_TAX_RATES_2
       FOREIGN KEY (ZONE_ID)
-      REFERENCES ZONES (ZONE_ID);
+      REFERENCES ZONE (ZONE_ID);
 
-ALTER TABLE ZONES_TO_GEO_ZONES
+ALTER TABLE ZONE_TO_GEO_ZONE
   ADD CONSTRAINT FK_ZONES_TO_GEO_ZONES_1
       FOREIGN KEY (ZONE_ID)
-      REFERENCES ZONES (ZONE_ID);
+      REFERENCES ZONE (ZONE_ID);
 
-ALTER TABLE ZONES_TO_GEO_ZONES
+ALTER TABLE ZONE_TO_GEO_ZONE
   ADD CONSTRAINT FK_ZONES_TO_GEO_ZONES_2
       FOREIGN KEY (GEO_ZONE_ID)
-      REFERENCES GEO_ZONES (GEO_ZONE_ID);
+      REFERENCES GEO_ZONE (GEO_ZONE_ID);
 
-ALTER TABLE ZONES_TO_GEO_ZONES
+ALTER TABLE ZONE_TO_GEO_ZONE
   ADD CONSTRAINT FK_ZONES_TO_GEO_ZONES_3
       FOREIGN KEY (COUNTRY_ID)
-      REFERENCES COUNTRIES (COUNTRY_ID);
+      REFERENCES COUNTRY (COUNTRY_ID);
 
 ALTER TABLE ORDER_STATUS_DESCRIPTION
   ADD CONSTRAINT FK_ORDERS_STATUS_DESCRIPTION_1
@@ -746,75 +763,75 @@
 ALTER TABLE ORDER_STATUS_DESCRIPTION
   ADD CONSTRAINT FK_ORDERS_STATUS_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE PRODUCT_OPTIONS_DESCRIPTION
+ALTER TABLE PRODUCT_OPTION_DESCRIPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_DESCRIPTION_1
       FOREIGN KEY (PRODUCT_OPTION_ID)
-      REFERENCES PRODUCT_OPTIONS (PRODUCT_OPTION_ID);
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID);
 
-ALTER TABLE PRODUCT_OPTIONS_DESCRIPTION
+ALTER TABLE PRODUCT_OPTION_DESCRIPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE PRODUCT_OPTION_VALUES_DESCRIPTION
+ALTER TABLE PRODUCT_OPTION_VALUE_DESCRIPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_1
       FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
-      REFERENCES PRODUCT_OPTION_VALUES (PRODUCT_OPTION_VALUE_ID);
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID);
 
-ALTER TABLE PRODUCT_OPTION_VALUES_DESCRIPTION
+ALTER TABLE PRODUCT_OPTION_VALUE_DESCRIPTION
   ADD CONSTRAINT FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE CURRENCIES_DESCRIPTION
+ALTER TABLE CURRENCY_DESCRIPTION
   ADD CONSTRAINT FK_CURRENCIES_DESCRIPTION_1
       FOREIGN KEY (CURRENCY_ID)
-      REFERENCES CURRENCIES (CURRENCY_ID);
+      REFERENCES CURRENCY (CURRENCY_ID);
 
-ALTER TABLE CURRENCIES_DESCRIPTION
+ALTER TABLE CURRENCY_DESCRIPTION
   ADD CONSTRAINT FK_CURRENCIES_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE PAYMENT_METHODS_DESCRIPTION
+ALTER TABLE PAYMENT_METHOD_DESCRIPTION
   ADD CONSTRAINT FK_PAYMENT_METHODS_DESCRIPTION_1
       FOREIGN KEY (PAYMENT_METHOD_ID)
-      REFERENCES PAYMENT_METHODS (PAYMENT_METHOD_ID);
+      REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID);
 
-ALTER TABLE PAYMENT_METHODS_DESCRIPTION
+ALTER TABLE PAYMENT_METHOD_DESCRIPTION
   ADD CONSTRAINT FK_PAYMENT_METHODS_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE CARD_TYPES_DESCRIPTION
+ALTER TABLE CARD_TYPE_DESCRIPTION
   ADD CONSTRAINT FK_CARD_TYPES_DESCRIPTION_1
       FOREIGN KEY (CARD_TYPE_ID)
-      REFERENCES CARD_TYPES (CARD_TYPE_ID);
+      REFERENCES CARD_TYPE (CARD_TYPE_ID);
 
-ALTER TABLE CARD_TYPES_DESCRIPTION
+ALTER TABLE CARD_TYPE_DESCRIPTION
   ADD CONSTRAINT FK_CARD_TYPES_DESCRIPTION_2
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 
-ALTER TABLE ADDRESS_BOOKS
+ALTER TABLE ADDRESS_BOOK
   ADD CONSTRAINT FK_ADDRESS_BOOK_2
       FOREIGN KEY (ZONE_ID)
-      REFERENCES ZONES (ZONE_ID);
+      REFERENCES ZONE (ZONE_ID);
 
-ALTER TABLE ADDRESS_BOOKS
+ALTER TABLE ADDRESS_BOOK
   ADD CONSTRAINT FK_ADDRESS_BOOK_3
       FOREIGN KEY (COUNTRY_ID)
-      REFERENCES COUNTRIES (COUNTRY_ID);
+      REFERENCES COUNTRY (COUNTRY_ID);
 
-ALTER TABLE ADDRESS_BOOKS
+ALTER TABLE ADDRESS_BOOK
   ADD CONSTRAINT FK_ADDRESS_BOOK_4
       FOREIGN KEY (CUSTOMER_ID)
-      REFERENCES CUSTOMERS (CUSTOMER_ID);
+      REFERENCES CUSTOMER (CUSTOMER_ID);
 
-ALTER TABLE ADDRESS_BOOKS
+ALTER TABLE ADDRESS_BOOK
   ADD CONSTRAINT FK_ADDRESS_BOOKS_4
       FOREIGN KEY (LANGUAGE_ID)
-      REFERENCES LANGUAGES (LANGUAGE_ID);
+      REFERENCES LANGUAGE (LANGUAGE_ID);
 

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql	2007-09-18 09:09:50 UTC (rev 567)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql	2007-09-20 00:27:29 UTC (rev 568)
@@ -1,251 +1,251 @@
-INSERT INTO languages VALUES (1,'日本語','ja','icon.gif','japanese',1);
-INSERT INTO languages VALUES (2,'English','en','icon.gif','english',2);
+INSERT INTO language VALUES (1,'日本語','ja','icon.gif','japanese',1);
+INSERT INTO language VALUES (2,'English','en','icon.gif','english',2);
 
-INSERT INTO countries VALUES (1,'Afghanistan','AF','AFG');
-INSERT INTO countries VALUES (2,'Albania','AL','ALB');
-INSERT INTO countries VALUES (3,'Algeria','DZ','DZA');
-INSERT INTO countries VALUES (4,'American Samoa','AS','ASM');
-INSERT INTO countries VALUES (5,'Andorra','AD','AND');
-INSERT INTO countries VALUES (6,'Angola','AO','AGO');
-INSERT INTO countries VALUES (7,'Anguilla','AI','AIA');
-INSERT INTO countries VALUES (8,'Antarctica','AQ','ATA');
-INSERT INTO countries VALUES (9,'Antigua and Barbuda','AG','ATG');
-INSERT INTO countries VALUES (10,'Argentina','AR','ARG');
-INSERT INTO countries VALUES (11,'Armenia','AM','ARM');
-INSERT INTO countries VALUES (12,'Aruba','AW','ABW');
-INSERT INTO countries VALUES (13,'Australia','AU','AUS');
-INSERT INTO countries VALUES (14,'Austria','AT','AUT');
-INSERT INTO countries VALUES (15,'Azerbaijan','AZ','AZE');
-INSERT INTO countries VALUES (16,'Bahamas','BS','BHS');
-INSERT INTO countries VALUES (17,'Bahrain','BH','BHR');
-INSERT INTO countries VALUES (18,'Bangladesh','BD','BGD');
-INSERT INTO countries VALUES (19,'Barbados','BB','BRB');
-INSERT INTO countries VALUES (20,'Belarus','BY','BLR');
-INSERT INTO countries VALUES (21,'Belgium','BE','BEL');
-INSERT INTO countries VALUES (22,'Belize','BZ','BLZ');
-INSERT INTO countries VALUES (23,'Benin','BJ','BEN');
-INSERT INTO countries VALUES (24,'Bermuda','BM','BMU');
-INSERT INTO countries VALUES (25,'Bhutan','BT','BTN');
-INSERT INTO countries VALUES (26,'Bolivia','BO','BOL');
-INSERT INTO countries VALUES (27,'Bosnia and Herzegowina','BA','BIH');
-INSERT INTO countries VALUES (28,'Botswana','BW','BWA');
-INSERT INTO countries VALUES (29,'Bouvet Island','BV','BVT');
-INSERT INTO countries VALUES (30,'Brazil','BR','BRA');
-INSERT INTO countries VALUES (31,'British Indian Ocean Territory','IO','IOT');
-INSERT INTO countries VALUES (32,'Brunei Darussalam','BN','BRN');
-INSERT INTO countries VALUES (33,'Bulgaria','BG','BGR');
-INSERT INTO countries VALUES (34,'Burkina Faso','BF','BFA');
-INSERT INTO countries VALUES (35,'Burundi','BI','BDI');
-INSERT INTO countries VALUES (36,'Cambodia','KH','KHM');
-INSERT INTO countries VALUES (37,'Cameroon','CM','CMR');
-INSERT INTO countries VALUES (38,'Canada','CA','CAN');
-INSERT INTO countries VALUES (39,'Cape Verde','CV','CPV');
-INSERT INTO countries VALUES (40,'Cayman Islands','KY','CYM');
-INSERT INTO countries VALUES (41,'Central African Republic','CF','CAF');
-INSERT INTO countries VALUES (42,'Chad','TD','TCD');
-INSERT INTO countries VALUES (43,'Chile','CL','CHL');
-INSERT INTO countries VALUES (44,'China','CN','CHN');
-INSERT INTO countries VALUES (45,'Christmas Island','CX','CXR');
-INSERT INTO countries VALUES (46,'Cocos (Keeling) Islands','CC','CCK');
-INSERT INTO countries VALUES (47,'Colombia','CO','COL');
-INSERT INTO countries VALUES (48,'Comoros','KM','COM');
-INSERT INTO countries VALUES (49,'Congo','CG','COG');
-INSERT INTO countries VALUES (50,'Cook Islands','CK','COK');
-INSERT INTO countries VALUES (51,'Costa Rica','CR','CRI');
-INSERT INTO countries VALUES (52,'Cote D''Ivoire','CI','CIV');
-INSERT INTO countries VALUES (53,'Croatia','HR','HRV');
-INSERT INTO countries VALUES (54,'Cuba','CU','CUB');
-INSERT INTO countries VALUES (55,'Cyprus','CY','CYP');
-INSERT INTO countries VALUES (56,'Czech Republic','CZ','CZE');
-INSERT INTO countries VALUES (57,'Denmark','DK','DNK');
-INSERT INTO countries VALUES (58,'Djibouti','DJ','DJI');
-INSERT INTO countries VALUES (59,'Dominica','DM','DMA');
-INSERT INTO countries VALUES (60,'Dominican Republic','DO','DOM');
-INSERT INTO countries VALUES (61,'East Timor','TP','TMP');
-INSERT INTO countries VALUES (62,'Ecuador','EC','ECU');
-INSERT INTO countries VALUES (63,'Egypt','EG','EGY');
-INSERT INTO countries VALUES (64,'El Salvador','SV','SLV');
-INSERT INTO countries VALUES (65,'Equatorial Guinea','GQ','GNQ');
-INSERT INTO countries VALUES (66,'Eritrea','ER','ERI');
-INSERT INTO countries VALUES (67,'Estonia','EE','EST');
-INSERT INTO countries VALUES (68,'Ethiopia','ET','ETH');
-INSERT INTO countries VALUES (69,'Falkland Islands (Malvinas)','FK','FLK');
-INSERT INTO countries VALUES (70,'Faroe Islands','FO','FRO');
-INSERT INTO countries VALUES (71,'Fiji','FJ','FJI');
-INSERT INTO countries VALUES (72,'Finland','FI','FIN');
-INSERT INTO countries VALUES (73,'France','FR','FRA');
-INSERT INTO countries VALUES (74,'France, Metropolitan','FX','FXX');
-INSERT INTO countries VALUES (75,'French Guiana','GF','GUF');
-INSERT INTO countries VALUES (76,'French Polynesia','PF','PYF');
-INSERT INTO countries VALUES (77,'French Southern Territories','TF','ATF');
-INSERT INTO countries VALUES (78,'Gabon','GA','GAB');
-INSERT INTO countries VALUES (79,'Gambia','GM','GMB');
-INSERT INTO countries VALUES (80,'Georgia','GE','GEO');
-INSERT INTO countries VALUES (81,'Germany','DE','DEU');
-INSERT INTO countries VALUES (82,'Ghana','GH','GHA');
-INSERT INTO countries VALUES (83,'Gibraltar','GI','GIB');
-INSERT INTO countries VALUES (84,'Greece','GR','GRC');
-INSERT INTO countries VALUES (85,'Greenland','GL','GRL');
-INSERT INTO countries VALUES (86,'Grenada','GD','GRD');
-INSERT INTO countries VALUES (87,'Guadeloupe','GP','GLP');
-INSERT INTO countries VALUES (88,'Guam','GU','GUM');
-INSERT INTO countries VALUES (89,'Guatemala','GT','GTM');
-INSERT INTO countries VALUES (90,'Guinea','GN','GIN');
-INSERT INTO countries VALUES (91,'Guinea-bissau','GW','GNB');
-INSERT INTO countries VALUES (92,'Guyana','GY','GUY');
-INSERT INTO countries VALUES (93,'Haiti','HT','HTI');
-INSERT INTO countries VALUES (94,'Heard and Mc Donald Islands','HM','HMD');
-INSERT INTO countries VALUES (95,'Honduras','HN','HND');
-INSERT INTO countries VALUES (96,'Hong Kong','HK','HKG');
-INSERT INTO countries VALUES (97,'Hungary','HU','HUN');
-INSERT INTO countries VALUES (98,'Iceland','IS','ISL');
-INSERT INTO countries VALUES (99,'India','IN','IND');
-INSERT INTO countries VALUES (100,'Indonesia','ID','IDN');
-INSERT INTO countries VALUES (101,'Iran (Islamic Republic of)','IR','IRN');
-INSERT INTO countries VALUES (102,'Iraq','IQ','IRQ');
-INSERT INTO countries VALUES (103,'Ireland','IE','IRL');
-INSERT INTO countries VALUES (104,'Israel','IL','ISR');
-INSERT INTO countries VALUES (105,'Italy','IT','ITA');
-INSERT INTO countries VALUES (106,'Jamaica','JM','JAM');
-INSERT INTO countries VALUES (107,'Japan','JP','JPN');
-INSERT INTO countries VALUES (108,'Jordan','JO','JOR');
-INSERT INTO countries VALUES (109,'Kazakhstan','KZ','KAZ');
-INSERT INTO countries VALUES (110,'Kenya','KE','KEN');
-INSERT INTO countries VALUES (111,'Kiribati','KI','KIR');
-INSERT INTO countries VALUES (112,'Korea, Democratic People''s Republic of','KP','PRK');
-INSERT INTO countries VALUES (113,'Korea, Republic of','KR','KOR');
-INSERT INTO countries VALUES (114,'Kuwait','KW','KWT');
-INSERT INTO countries VALUES (115,'Kyrgyzstan','KG','KGZ');
-INSERT INTO countries VALUES (116,'Lao People''s Democratic Republic','LA','LAO');
-INSERT INTO countries VALUES (117,'Latvia','LV','LVA');
-INSERT INTO countries VALUES (118,'Lebanon','LB','LBN');
-INSERT INTO countries VALUES (119,'Lesotho','LS','LSO');
-INSERT INTO countries VALUES (120,'Liberia','LR','LBR');
-INSERT INTO countries VALUES (121,'Libyan Arab Jamahiriya','LY','LBY');
-INSERT INTO countries VALUES (122,'Liechtenstein','LI','LIE');
-INSERT INTO countries VALUES (123,'Lithuania','LT','LTU');
-INSERT INTO countries VALUES (124,'Luxembourg','LU','LUX');
-INSERT INTO countries VALUES (125,'Macau','MO','MAC');
-INSERT INTO countries VALUES (126,'Macedonia, The Former Yugoslav Republic of','MK','MKD');
-INSERT INTO countries VALUES (127,'Madagascar','MG','MDG');
-INSERT INTO countries VALUES (128,'Malawi','MW','MWI');
-INSERT INTO countries VALUES (129,'Malaysia','MY','MYS');
-INSERT INTO countries VALUES (130,'Maldives','MV','MDV');
-INSERT INTO countries VALUES (131,'Mali','ML','MLI');
-INSERT INTO countries VALUES (132,'Malta','MT','MLT');
-INSERT INTO countries VALUES (133,'Marshall Islands','MH','MHL');
-INSERT INTO countries VALUES (134,'Martinique','MQ','MTQ');
-INSERT INTO countries VALUES (135,'Mauritania','MR','MRT');
-INSERT INTO countries VALUES (136,'Mauritius','MU','MUS');
-INSERT INTO countries VALUES (137,'Mayotte','YT','MYT');
-INSERT INTO countries VALUES (138,'Mexico','MX','MEX');
-INSERT INTO countries VALUES (139,'Micronesia, Federated States of','FM','FSM');
-INSERT INTO countries VALUES (140,'Moldova, Republic of','MD','MDA');
-INSERT INTO countries VALUES (141,'Monaco','MC','MCO');
-INSERT INTO countries VALUES (142,'Mongolia','MN','MNG');
-INSERT INTO countries VALUES (143,'Montserrat','MS','MSR');
-INSERT INTO countries VALUES (144,'Morocco','MA','MAR');
-INSERT INTO countries VALUES (145,'Mozambique','MZ','MOZ');
-INSERT INTO countries VALUES (146,'Myanmar','MM','MMR');
-INSERT INTO countries VALUES (147,'Namibia','NA','NAM');
-INSERT INTO countries VALUES (148,'Nauru','NR','NRU');
-INSERT INTO countries VALUES (149,'Nepal','NP','NPL');
-INSERT INTO countries VALUES (150,'Netherlands','NL','NLD');
-INSERT INTO countries VALUES (151,'Netherlands Antilles','AN','ANT');
-INSERT INTO countries VALUES (152,'New Caledonia','NC','NCL');
-INSERT INTO countries VALUES (153,'New Zealand','NZ','NZL');
-INSERT INTO countries VALUES (154,'Nicaragua','NI','NIC');
-INSERT INTO countries VALUES (155,'Niger','NE','NER');
-INSERT INTO countries VALUES (156,'Nigeria','NG','NGA');
-INSERT INTO countries VALUES (157,'Niue','NU','NIU');
-INSERT INTO countries VALUES (158,'Norfolk Island','NF','NFK');
-INSERT INTO countries VALUES (159,'Northern Mariana Islands','MP','MNP');
-INSERT INTO countries VALUES (160,'Norway','NO','NOR');
-INSERT INTO countries VALUES (161,'Oman','OM','OMN');
-INSERT INTO countries VALUES (162,'Pakistan','PK','PAK');
-INSERT INTO countries VALUES (163,'Palau','PW','PLW');
-INSERT INTO countries VALUES (164,'Panama','PA','PAN');
-INSERT INTO countries VALUES (165,'Papua New Guinea','PG','PNG');
-INSERT INTO countries VALUES (166,'Paraguay','PY','PRY');
-INSERT INTO countries VALUES (167,'Peru','PE','PER');
-INSERT INTO countries VALUES (168,'Philippines','PH','PHL');
-INSERT INTO countries VALUES (169,'Pitcairn','PN','PCN');
-INSERT INTO countries VALUES (170,'Poland','PL','POL');
-INSERT INTO countries VALUES (171,'Portugal','PT','PRT');
-INSERT INTO countries VALUES (172,'Puerto Rico','PR','PRI');
-INSERT INTO countries VALUES (173,'Qatar','QA','QAT');
-INSERT INTO countries VALUES (174,'Reunion','RE','REU');
-INSERT INTO countries VALUES (175,'Romania','RO','ROM');
-INSERT INTO countries VALUES (176,'Russian Federation','RU','RUS');
-INSERT INTO countries VALUES (177,'Rwanda','RW','RWA');
-INSERT INTO countries VALUES (178,'Saint Kitts and Nevis','KN','KNA');
-INSERT INTO countries VALUES (179,'Saint Lucia','LC','LCA');
-INSERT INTO countries VALUES (180,'Saint Vincent and the Grenadines','VC','VCT');
-INSERT INTO countries VALUES (181,'Samoa','WS','WSM');
-INSERT INTO countries VALUES (182,'San Marino','SM','SMR');
-INSERT INTO countries VALUES (183,'Sao Tome and Principe','ST','STP');
-INSERT INTO countries VALUES (184,'Saudi Arabia','SA','SAU');
-INSERT INTO countries VALUES (185,'Senegal','SN','SEN');
-INSERT INTO countries VALUES (186,'Seychelles','SC','SYC');
-INSERT INTO countries VALUES (187,'Sierra Leone','SL','SLE');
-INSERT INTO countries VALUES (188,'Singapore','SG','SGP');
-INSERT INTO countries VALUES (189,'Slovakia (Slovak Republic)','SK','SVK');
-INSERT INTO countries VALUES (190,'Slovenia','SI','SVN');
-INSERT INTO countries VALUES (191,'Solomon Islands','SB','SLB');
-INSERT INTO countries VALUES (192,'Somalia','SO','SOM');
-INSERT INTO countries VALUES (193,'South Africa','ZA','ZAF');
-INSERT INTO countries VALUES (194,'South Georgia and the South Sandwich Islands','GS','SGS');
-INSERT INTO countries VALUES (195,'Spain','ES','ESP');
-INSERT INTO countries VALUES (196,'Sri Lanka','LK','LKA');
-INSERT INTO countries VALUES (197,'St. Helena','SH','SHN');
-INSERT INTO countries VALUES (198,'St. Pierre and Miquelon','PM','SPM');
-INSERT INTO countries VALUES (199,'Sudan','SD','SDN');
-INSERT INTO countries VALUES (200,'Suriname','SR','SUR');
-INSERT INTO countries VALUES (201,'Svalbard and Jan Mayen Islands','SJ','SJM');
-INSERT INTO countries VALUES (202,'Swaziland','SZ','SWZ');
-INSERT INTO countries VALUES (203,'Sweden','SE','SWE');
-INSERT INTO countries VALUES (204,'Switzerland','CH','CHE');
-INSERT INTO countries VALUES (205,'Syrian Arab Republic','SY','SYR');
-INSERT INTO countries VALUES (206,'Taiwan','TW','TWN');
-INSERT INTO countries VALUES (207,'Tajikistan','TJ','TJK');
-INSERT INTO countries VALUES (208,'Tanzania, United Republic of','TZ','TZA');
-INSERT INTO countries VALUES (209,'Thailand','TH','THA');
-INSERT INTO countries VALUES (210,'Togo','TG','TGO');
-INSERT INTO countries VALUES (211,'Tokelau','TK','TKL');
-INSERT INTO countries VALUES (212,'Tonga','TO','TON');
-INSERT INTO countries VALUES (213,'Trinidad and Tobago','TT','TTO');
-INSERT INTO countries VALUES (214,'Tunisia','TN','TUN');
-INSERT INTO countries VALUES (215,'Turkey','TR','TUR');
-INSERT INTO countries VALUES (216,'Turkmenistan','TM','TKM');
-INSERT INTO countries VALUES (217,'Turks and Caicos Islands','TC','TCA');
-INSERT INTO countries VALUES (218,'Tuvalu','TV','TUV');
-INSERT INTO countries VALUES (219,'Uganda','UG','UGA');
-INSERT INTO countries VALUES (220,'Ukraine','UA','UKR');
-INSERT INTO countries VALUES (221,'United Arab Emirates','AE','ARE');
-INSERT INTO countries VALUES (222,'United Kingdom','GB','GBR');
-INSERT INTO countries VALUES (223,'United States','US','USA');
-INSERT INTO countries VALUES (224,'United States Minor Outlying Islands','UM','UMI');
-INSERT INTO countries VALUES (225,'Uruguay','UY','URY');
-INSERT INTO countries VALUES (226,'Uzbekistan','UZ','UZB');
-INSERT INTO countries VALUES (227,'Vanuatu','VU','VUT');
-INSERT INTO countries VALUES (228,'Vatican City State (Holy See)','VA','VAT');
-INSERT INTO countries VALUES (229,'Venezuela','VE','VEN');
-INSERT INTO countries VALUES (230,'Viet Nam','VN','VNM');
-INSERT INTO countries VALUES (231,'Virgin Islands (British)','VG','VGB');
-INSERT INTO countries VALUES (232,'Virgin Islands (U.S.)','VI','VIR');
-INSERT INTO countries VALUES (233,'Wallis and Futuna Islands','WF','WLF');
-INSERT INTO countries VALUES (234,'Western Sahara','EH','ESH');
-INSERT INTO countries VALUES (235,'Yemen','YE','YEM');
-INSERT INTO countries VALUES (236,'Yugoslavia','YU','YUG');
-INSERT INTO countries VALUES (237,'Zaire','ZR','ZAR');
-INSERT INTO countries VALUES (238,'Zambia','ZM','ZMB');
-INSERT INTO countries VALUES (239,'Zimbabwe','ZW','ZWE');
+INSERT INTO country VALUES (1,'Afghanistan','AF','AFG');
+INSERT INTO country VALUES (2,'Albania','AL','ALB');
+INSERT INTO country VALUES (3,'Algeria','DZ','DZA');
+INSERT INTO country VALUES (4,'American Samoa','AS','ASM');
+INSERT INTO country VALUES (5,'Andorra','AD','AND');
+INSERT INTO country VALUES (6,'Angola','AO','AGO');
+INSERT INTO country VALUES (7,'Anguilla','AI','AIA');
+INSERT INTO country VALUES (8,'Antarctica','AQ','ATA');
+INSERT INTO country VALUES (9,'Antigua and Barbuda','AG','ATG');
+INSERT INTO country VALUES (10,'Argentina','AR','ARG');
+INSERT INTO country VALUES (11,'Armenia','AM','ARM');
+INSERT INTO country VALUES (12,'Aruba','AW','ABW');
+INSERT INTO country VALUES (13,'Australia','AU','AUS');
+INSERT INTO country VALUES (14,'Austria','AT','AUT');
+INSERT INTO country VALUES (15,'Azerbaijan','AZ','AZE');
+INSERT INTO country VALUES (16,'Bahamas','BS','BHS');
+INSERT INTO country VALUES (17,'Bahrain','BH','BHR');
+INSERT INTO country VALUES (18,'Bangladesh','BD','BGD');
+INSERT INTO country VALUES (19,'Barbados','BB','BRB');
+INSERT INTO country VALUES (20,'Belarus','BY','BLR');
+INSERT INTO country VALUES (21,'Belgium','BE','BEL');
+INSERT INTO country VALUES (22,'Belize','BZ','BLZ');
+INSERT INTO country VALUES (23,'Benin','BJ','BEN');
+INSERT INTO country VALUES (24,'Bermuda','BM','BMU');
+INSERT INTO country VALUES (25,'Bhutan','BT','BTN');
+INSERT INTO country VALUES (26,'Bolivia','BO','BOL');
+INSERT INTO country VALUES (27,'Bosnia and Herzegowina','BA','BIH');
+INSERT INTO country VALUES (28,'Botswana','BW','BWA');
+INSERT INTO country VALUES (29,'Bouvet Island','BV','BVT');
+INSERT INTO country VALUES (30,'Brazil','BR','BRA');
+INSERT INTO country VALUES (31,'British Indian Ocean Territory','IO','IOT');
+INSERT INTO country VALUES (32,'Brunei Darussalam','BN','BRN');
+INSERT INTO country VALUES (33,'Bulgaria','BG','BGR');
+INSERT INTO country VALUES (34,'Burkina Faso','BF','BFA');
+INSERT INTO country VALUES (35,'Burundi','BI','BDI');
+INSERT INTO country VALUES (36,'Cambodia','KH','KHM');
+INSERT INTO country VALUES (37,'Cameroon','CM','CMR');
+INSERT INTO country VALUES (38,'Canada','CA','CAN');
+INSERT INTO country VALUES (39,'Cape Verde','CV','CPV');
+INSERT INTO country VALUES (40,'Cayman Islands','KY','CYM');
+INSERT INTO country VALUES (41,'Central African Republic','CF','CAF');
+INSERT INTO country VALUES (42,'Chad','TD','TCD');
+INSERT INTO country VALUES (43,'Chile','CL','CHL');
+INSERT INTO country VALUES (44,'China','CN','CHN');
+INSERT INTO country VALUES (45,'Christmas Island','CX','CXR');
+INSERT INTO country VALUES (46,'Cocos (Keeling) Islands','CC','CCK');
+INSERT INTO country VALUES (47,'Colombia','CO','COL');
+INSERT INTO country VALUES (48,'Comoros','KM','COM');
+INSERT INTO country VALUES (49,'Congo','CG','COG');
+INSERT INTO country VALUES (50,'Cook Islands','CK','COK');
+INSERT INTO country VALUES (51,'Costa Rica','CR','CRI');
+INSERT INTO country VALUES (52,'Cote D''Ivoire','CI','CIV');
+INSERT INTO country VALUES (53,'Croatia','HR','HRV');
+INSERT INTO country VALUES (54,'Cuba','CU','CUB');
+INSERT INTO country VALUES (55,'Cyprus','CY','CYP');
+INSERT INTO country VALUES (56,'Czech Republic','CZ','CZE');
+INSERT INTO country VALUES (57,'Denmark','DK','DNK');
+INSERT INTO country VALUES (58,'Djibouti','DJ','DJI');
+INSERT INTO country VALUES (59,'Dominica','DM','DMA');
+INSERT INTO country VALUES (60,'Dominican Republic','DO','DOM');
+INSERT INTO country VALUES (61,'East Timor','TP','TMP');
+INSERT INTO country VALUES (62,'Ecuador','EC','ECU');
+INSERT INTO country VALUES (63,'Egypt','EG','EGY');
+INSERT INTO country VALUES (64,'El Salvador','SV','SLV');
+INSERT INTO country VALUES (65,'Equatorial Guinea','GQ','GNQ');
+INSERT INTO country VALUES (66,'Eritrea','ER','ERI');
+INSERT INTO country VALUES (67,'Estonia','EE','EST');
+INSERT INTO country VALUES (68,'Ethiopia','ET','ETH');
+INSERT INTO country VALUES (69,'Falkland Islands (Malvinas)','FK','FLK');
+INSERT INTO country VALUES (70,'Faroe Islands','FO','FRO');
+INSERT INTO country VALUES (71,'Fiji','FJ','FJI');
+INSERT INTO country VALUES (72,'Finland','FI','FIN');
+INSERT INTO country VALUES (73,'France','FR','FRA');
+INSERT INTO country VALUES (74,'France, Metropolitan','FX','FXX');
+INSERT INTO country VALUES (75,'French Guiana','GF','GUF');
+INSERT INTO country VALUES (76,'French Polynesia','PF','PYF');
+INSERT INTO country VALUES (77,'French Southern Territories','TF','ATF');
+INSERT INTO country VALUES (78,'Gabon','GA','GAB');
+INSERT INTO country VALUES (79,'Gambia','GM','GMB');
+INSERT INTO country VALUES (80,'Georgia','GE','GEO');
+INSERT INTO country VALUES (81,'Germany','DE','DEU');
+INSERT INTO country VALUES (82,'Ghana','GH','GHA');
+INSERT INTO country VALUES (83,'Gibraltar','GI','GIB');
+INSERT INTO country VALUES (84,'Greece','GR','GRC');
+INSERT INTO country VALUES (85,'Greenland','GL','GRL');
+INSERT INTO country VALUES (86,'Grenada','GD','GRD');
+INSERT INTO country VALUES (87,'Guadeloupe','GP','GLP');
+INSERT INTO country VALUES (88,'Guam','GU','GUM');
+INSERT INTO country VALUES (89,'Guatemala','GT','GTM');
+INSERT INTO country VALUES (90,'Guinea','GN','GIN');
+INSERT INTO country VALUES (91,'Guinea-bissau','GW','GNB');
+INSERT INTO country VALUES (92,'Guyana','GY','GUY');
+INSERT INTO country VALUES (93,'Haiti','HT','HTI');
+INSERT INTO country VALUES (94,'Heard and Mc Donald Islands','HM','HMD');
+INSERT INTO country VALUES (95,'Honduras','HN','HND');
+INSERT INTO country VALUES (96,'Hong Kong','HK','HKG');
+INSERT INTO country VALUES (97,'Hungary','HU','HUN');
+INSERT INTO country VALUES (98,'Iceland','IS','ISL');
+INSERT INTO country VALUES (99,'India','IN','IND');
+INSERT INTO country VALUES (100,'Indonesia','ID','IDN');
+INSERT INTO country VALUES (101,'Iran (Islamic Republic of)','IR','IRN');
+INSERT INTO country VALUES (102,'Iraq','IQ','IRQ');
+INSERT INTO country VALUES (103,'Ireland','IE','IRL');
+INSERT INTO country VALUES (104,'Israel','IL','ISR');
+INSERT INTO country VALUES (105,'Italy','IT','ITA');
+INSERT INTO country VALUES (106,'Jamaica','JM','JAM');
+INSERT INTO country VALUES (107,'Japan','JP','JPN');
+INSERT INTO country VALUES (108,'Jordan','JO','JOR');
+INSERT INTO country VALUES (109,'Kazakhstan','KZ','KAZ');
+INSERT INTO country VALUES (110,'Kenya','KE','KEN');
+INSERT INTO country VALUES (111,'Kiribati','KI','KIR');
+INSERT INTO country VALUES (112,'Korea, Democratic People''s Republic of','KP','PRK');
+INSERT INTO country VALUES (113,'Korea, Republic of','KR','KOR');
+INSERT INTO country VALUES (114,'Kuwait','KW','KWT');
+INSERT INTO country VALUES (115,'Kyrgyzstan','KG','KGZ');
+INSERT INTO country VALUES (116,'Lao People''s Democratic Republic','LA','LAO');
+INSERT INTO country VALUES (117,'Latvia','LV','LVA');
+INSERT INTO country VALUES (118,'Lebanon','LB','LBN');
+INSERT INTO country VALUES (119,'Lesotho','LS','LSO');
+INSERT INTO country VALUES (120,'Liberia','LR','LBR');
+INSERT INTO country VALUES (121,'Libyan Arab Jamahiriya','LY','LBY');
+INSERT INTO country VALUES (122,'Liechtenstein','LI','LIE');
+INSERT INTO country VALUES (123,'Lithuania','LT','LTU');
+INSERT INTO country VALUES (124,'Luxembourg','LU','LUX');
+INSERT INTO country VALUES (125,'Macau','MO','MAC');
+INSERT INTO country VALUES (126,'Macedonia, The Former Yugoslav Republic of','MK','MKD');
+INSERT INTO country VALUES (127,'Madagascar','MG','MDG');
+INSERT INTO country VALUES (128,'Malawi','MW','MWI');
+INSERT INTO country VALUES (129,'Malaysia','MY','MYS');
+INSERT INTO country VALUES (130,'Maldives','MV','MDV');
+INSERT INTO country VALUES (131,'Mali','ML','MLI');
+INSERT INTO country VALUES (132,'Malta','MT','MLT');
+INSERT INTO country VALUES (133,'Marshall Islands','MH','MHL');
+INSERT INTO country VALUES (134,'Martinique','MQ','MTQ');
+INSERT INTO country VALUES (135,'Mauritania','MR','MRT');
+INSERT INTO country VALUES (136,'Mauritius','MU','MUS');
+INSERT INTO country VALUES (137,'Mayotte','YT','MYT');
+INSERT INTO country VALUES (138,'Mexico','MX','MEX');
+INSERT INTO country VALUES (139,'Micronesia, Federated States of','FM','FSM');
+INSERT INTO country VALUES (140,'Moldova, Republic of','MD','MDA');
+INSERT INTO country VALUES (141,'Monaco','MC','MCO');
+INSERT INTO country VALUES (142,'Mongolia','MN','MNG');
+INSERT INTO country VALUES (143,'Montserrat','MS','MSR');
+INSERT INTO country VALUES (144,'Morocco','MA','MAR');
+INSERT INTO country VALUES (145,'Mozambique','MZ','MOZ');
+INSERT INTO country VALUES (146,'Myanmar','MM','MMR');
+INSERT INTO country VALUES (147,'Namibia','NA','NAM');
+INSERT INTO country VALUES (148,'Nauru','NR','NRU');
+INSERT INTO country VALUES (149,'Nepal','NP','NPL');
+INSERT INTO country VALUES (150,'Netherlands','NL','NLD');
+INSERT INTO country VALUES (151,'Netherlands Antilles','AN','ANT');
+INSERT INTO country VALUES (152,'New Caledonia','NC','NCL');
+INSERT INTO country VALUES (153,'New Zealand','NZ','NZL');
+INSERT INTO country VALUES (154,'Nicaragua','NI','NIC');
+INSERT INTO country VALUES (155,'Niger','NE','NER');
+INSERT INTO country VALUES (156,'Nigeria','NG','NGA');
+INSERT INTO country VALUES (157,'Niue','NU','NIU');
+INSERT INTO country VALUES (158,'Norfolk Island','NF','NFK');
+INSERT INTO country VALUES (159,'Northern Mariana Islands','MP','MNP');
+INSERT INTO country VALUES (160,'Norway','NO','NOR');
+INSERT INTO country VALUES (161,'Oman','OM','OMN');
+INSERT INTO country VALUES (162,'Pakistan','PK','PAK');
+INSERT INTO country VALUES (163,'Palau','PW','PLW');
+INSERT INTO country VALUES (164,'Panama','PA','PAN');
+INSERT INTO country VALUES (165,'Papua New Guinea','PG','PNG');
+INSERT INTO country VALUES (166,'Paraguay','PY','PRY');
+INSERT INTO country VALUES (167,'Peru','PE','PER');
+INSERT INTO country VALUES (168,'Philippines','PH','PHL');
+INSERT INTO country VALUES (169,'Pitcairn','PN','PCN');
+INSERT INTO country VALUES (170,'Poland','PL','POL');
+INSERT INTO country VALUES (171,'Portugal','PT','PRT');
+INSERT INTO country VALUES (172,'Puerto Rico','PR','PRI');
+INSERT INTO country VALUES (173,'Qatar','QA','QAT');
+INSERT INTO country VALUES (174,'Reunion','RE','REU');
+INSERT INTO country VALUES (175,'Romania','RO','ROM');
+INSERT INTO country VALUES (176,'Russian Federation','RU','RUS');
+INSERT INTO country VALUES (177,'Rwanda','RW','RWA');
+INSERT INTO country VALUES (178,'Saint Kitts and Nevis','KN','KNA');
+INSERT INTO country VALUES (179,'Saint Lucia','LC','LCA');
+INSERT INTO country VALUES (180,'Saint Vincent and the Grenadines','VC','VCT');
+INSERT INTO country VALUES (181,'Samoa','WS','WSM');
+INSERT INTO country VALUES (182,'San Marino','SM','SMR');
+INSERT INTO country VALUES (183,'Sao Tome and Principe','ST','STP');
+INSERT INTO country VALUES (184,'Saudi Arabia','SA','SAU');
+INSERT INTO country VALUES (185,'Senegal','SN','SEN');
+INSERT INTO country VALUES (186,'Seychelles','SC','SYC');
+INSERT INTO country VALUES (187,'Sierra Leone','SL','SLE');
+INSERT INTO country VALUES (188,'Singapore','SG','SGP');
+INSERT INTO country VALUES (189,'Slovakia (Slovak Republic)','SK','SVK');
+INSERT INTO country VALUES (190,'Slovenia','SI','SVN');
+INSERT INTO country VALUES (191,'Solomon Islands','SB','SLB');
+INSERT INTO country VALUES (192,'Somalia','SO','SOM');
+INSERT INTO country VALUES (193,'South Africa','ZA','ZAF');
+INSERT INTO country VALUES (194,'South Georgia and the South Sandwich Islands','GS','SGS');
+INSERT INTO country VALUES (195,'Spain','ES','ESP');
+INSERT INTO country VALUES (196,'Sri Lanka','LK','LKA');
+INSERT INTO country VALUES (197,'St. Helena','SH','SHN');
+INSERT INTO country VALUES (198,'St. Pierre and Miquelon','PM','SPM');
+INSERT INTO country VALUES (199,'Sudan','SD','SDN');
+INSERT INTO country VALUES (200,'Suriname','SR','SUR');
+INSERT INTO country VALUES (201,'Svalbard and Jan Mayen Islands','SJ','SJM');
+INSERT INTO country VALUES (202,'Swaziland','SZ','SWZ');
+INSERT INTO country VALUES (203,'Sweden','SE','SWE');
+INSERT INTO country VALUES (204,'Switzerland','CH','CHE');
+INSERT INTO country VALUES (205,'Syrian Arab Republic','SY','SYR');
+INSERT INTO country VALUES (206,'Taiwan','TW','TWN');
+INSERT INTO country VALUES (207,'Tajikistan','TJ','TJK');
+INSERT INTO country VALUES (208,'Tanzania, United Republic of','TZ','TZA');
+INSERT INTO country VALUES (209,'Thailand','TH','THA');
+INSERT INTO country VALUES (210,'Togo','TG','TGO');
+INSERT INTO country VALUES (211,'Tokelau','TK','TKL');
+INSERT INTO country VALUES (212,'Tonga','TO','TON');
+INSERT INTO country VALUES (213,'Trinidad and Tobago','TT','TTO');
+INSERT INTO country VALUES (214,'Tunisia','TN','TUN');
+INSERT INTO country VALUES (215,'Turkey','TR','TUR');
+INSERT INTO country VALUES (216,'Turkmenistan','TM','TKM');
+INSERT INTO country VALUES (217,'Turks and Caicos Islands','TC','TCA');
+INSERT INTO country VALUES (218,'Tuvalu','TV','TUV');
+INSERT INTO country VALUES (219,'Uganda','UG','UGA');
+INSERT INTO country VALUES (220,'Ukraine','UA','UKR');
+INSERT INTO country VALUES (221,'United Arab Emirates','AE','ARE');
+INSERT INTO country VALUES (222,'United Kingdom','GB','GBR');
+INSERT INTO country VALUES (223,'United States','US','USA');
+INSERT INTO country VALUES (224,'United States Minor Outlying Islands','UM','UMI');
+INSERT INTO country VALUES (225,'Uruguay','UY','URY');
+INSERT INTO country VALUES (226,'Uzbekistan','UZ','UZB');
+INSERT INTO country VALUES (227,'Vanuatu','VU','VUT');
+INSERT INTO country VALUES (228,'Vatican City State (Holy See)','VA','VAT');
+INSERT INTO country VALUES (229,'Venezuela','VE','VEN');
+INSERT INTO country VALUES (230,'Viet Nam','VN','VNM');
+INSERT INTO country VALUES (231,'Virgin Islands (British)','VG','VGB');
+INSERT INTO country VALUES (232,'Virgin Islands (U.S.)','VI','VIR');
+INSERT INTO country VALUES (233,'Wallis and Futuna Islands','WF','WLF');
+INSERT INTO country VALUES (234,'Western Sahara','EH','ESH');
+INSERT INTO country VALUES (235,'Yemen','YE','YEM');
+INSERT INTO country VALUES (236,'Yugoslavia','YU','YUG');
+INSERT INTO country VALUES (237,'Zaire','ZR','ZAR');
+INSERT INTO country VALUES (238,'Zambia','ZM','ZMB');
+INSERT INTO country VALUES (239,'Zimbabwe','ZW','ZWE');
 
-INSERT INTO currencies VALUES (1,'YEN','','円','###,###','2007-01-01 00:00:00','2007-01-01 00:00:00');
-INSERT INTO currencies VALUES (2,'USD','$','','###,###.##','2007-01-01 00:00:00','2007-01-01 00:00:00');
+INSERT INTO currency VALUES (1,'YEN','','円','###,###','2007-01-01 00:00:00','2007-01-01 00:00:00');
+INSERT INTO currency VALUES (2,'USD','$','','###,###.##','2007-01-01 00:00:00','2007-01-01 00:00:00');
 
-INSERT INTO currencies_description VALUES (1,1,'Japanese Yen','');
-INSERT INTO currencies_description VALUES (2,2,'US Dollar','');
+INSERT INTO currency_description VALUES (1,1,'Japanese Yen','');
+INSERT INTO currency_description VALUES (2,2,'US Dollar','');
 
 INSERT INTO order_status VALUES ( 1 ,1,'2007-01-01 00:00:00','2007-01-01 00:00:00');
 INSERT INTO order_status VALUES ( 2 ,2,'2007-01-01 00:00:00','2007-01-01 00:00:00');
@@ -259,79 +259,79 @@
 INSERT INTO order_status_description VALUES ( 3, 1, '配達済み','');
 
 -- USA
-INSERT INTO zones VALUES (1,223,'AL','Alabama');
-INSERT INTO zones VALUES (2,223,'AK','Alaska');
-INSERT INTO zones VALUES (3,223,'AS','American Samoa');
-INSERT INTO zones VALUES (4,223,'AZ','Arizona');
-INSERT INTO zones VALUES (5,223,'AR','Arkansas');
-INSERT INTO zones VALUES (6,223,'AF','Armed Forces Africa');
-INSERT INTO zones VALUES (7,223,'AA','Armed Forces Americas');
-INSERT INTO zones VALUES (8,223,'AC','Armed Forces Canada');
-INSERT INTO zones VALUES (9,223,'AE','Armed Forces Europe');
-INSERT INTO zones VALUES (10,223,'AM','Armed Forces Middle East');
-INSERT INTO zones VALUES (11,223,'AP','Armed Forces Pacific');
-INSERT INTO zones VALUES (12,223,'CA','California');
-INSERT INTO zones VALUES (13,223,'CO','Colorado');
-INSERT INTO zones VALUES (14,223,'CT','Connecticut');
-INSERT INTO zones VALUES (15,223,'DE','Delaware');
-INSERT INTO zones VALUES (16,223,'DC','District of Columbia');
-INSERT INTO zones VALUES (17,223,'FM','Federated States Of Micronesia');
-INSERT INTO zones VALUES (18,223,'FL','Florida');
-INSERT INTO zones VALUES (19,223,'GA','Georgia');
-INSERT INTO zones VALUES (20,223,'GU','Guam');
-INSERT INTO zones VALUES (21,223,'HI','Hawaii');
-INSERT INTO zones VALUES (22,223,'ID','Idaho');
-INSERT INTO zones VALUES (23,223,'IL','Illinois');
-INSERT INTO zones VALUES (24,223,'IN','Indiana');
-INSERT INTO zones VALUES (25,223,'IA','Iowa');
-INSERT INTO zones VALUES (26,223,'KS','Kansas');
-INSERT INTO zones VALUES (27,223,'KY','Kentucky');
-INSERT INTO zones VALUES (28,223,'LA','Louisiana');
-INSERT INTO zones VALUES (29,223,'ME','Maine');
-INSERT INTO zones VALUES (30,223,'MH','Marshall Islands');
-INSERT INTO zones VALUES (31,223,'MD','Maryland');
-INSERT INTO zones VALUES (32,223,'MA','Massachusetts');
-INSERT INTO zones VALUES (33,223,'MI','Michigan');
-INSERT INTO zones VALUES (34,223,'MN','Minnesota');
-INSERT INTO zones VALUES (35,223,'MS','Mississippi');
-INSERT INTO zones VALUES (36,223,'MO','Missouri');
-INSERT INTO zones VALUES (37,223,'MT','Montana');
-INSERT INTO zones VALUES (38,223,'NE','Nebraska');
-INSERT INTO zones VALUES (39,223,'NV','Nevada');
-INSERT INTO zones VALUES (40,223,'NH','New Hampshire');
-INSERT INTO zones VALUES (41,223,'NJ','New Jersey');
-INSERT INTO zones VALUES (42,223,'NM','New Mexico');
-INSERT INTO zones VALUES (43,223,'NY','New York');
-INSERT INTO zones VALUES (44,223,'NC','North Carolina');
-INSERT INTO zones VALUES (45,223,'ND','North Dakota');
-INSERT INTO zones VALUES (46,223,'MP','Northern Mariana Islands');
-INSERT INTO zones VALUES (47,223,'OH','Ohio');
-INSERT INTO zones VALUES (48,223,'OK','Oklahoma');
-INSERT INTO zones VALUES (49,223,'OR','Oregon');
-INSERT INTO zones VALUES (50,223,'PW','Palau');
-INSERT INTO zones VALUES (51,223,'PA','Pennsylvania');
-INSERT INTO zones VALUES (52,223,'PR','Puerto Rico');
-INSERT INTO zones VALUES (53,223,'RI','Rhode Island');
-INSERT INTO zones VALUES (54,223,'SC','South Carolina');
-INSERT INTO zones VALUES (55,223,'SD','South Dakota');
-INSERT INTO zones VALUES (56,223,'TN','Tennessee');
-INSERT INTO zones VALUES (57,223,'TX','Texas');
-INSERT INTO zones VALUES (58,223,'UT','Utah');
-INSERT INTO zones VALUES (59,223,'VT','Vermont');
-INSERT INTO zones VALUES (60,223,'VI','Virgin Islands');
-INSERT INTO zones VALUES (61,223,'VA','Virginia');
-INSERT INTO zones VALUES (62,223,'WA','Washington');
-INSERT INTO zones VALUES (63,223,'WV','West Virginia');
-INSERT INTO zones VALUES (64,223,'WI','Wisconsin');
-INSERT INTO zones VALUES (65,223,'WY','Wyoming');
+INSERT INTO zone VALUES (1,223,'AL','Alabama');
+INSERT INTO zone VALUES (2,223,'AK','Alaska');
+INSERT INTO zone VALUES (3,223,'AS','American Samoa');
+INSERT INTO zone VALUES (4,223,'AZ','Arizona');
+INSERT INTO zone VALUES (5,223,'AR','Arkansas');
+INSERT INTO zone VALUES (6,223,'AF','Armed Forces Africa');
+INSERT INTO zone VALUES (7,223,'AA','Armed Forces Americas');
+INSERT INTO zone VALUES (8,223,'AC','Armed Forces Canada');
+INSERT INTO zone VALUES (9,223,'AE','Armed Forces Europe');
+INSERT INTO zone VALUES (10,223,'AM','Armed Forces Middle East');
+INSERT INTO zone VALUES (11,223,'AP','Armed Forces Pacific');
+INSERT INTO zone VALUES (12,223,'CA','California');
+INSERT INTO zone VALUES (13,223,'CO','Colorado');
+INSERT INTO zone VALUES (14,223,'CT','Connecticut');
+INSERT INTO zone VALUES (15,223,'DE','Delaware');
+INSERT INTO zone VALUES (16,223,'DC','District of Columbia');
+INSERT INTO zone VALUES (17,223,'FM','Federated States Of Micronesia');
+INSERT INTO zone VALUES (18,223,'FL','Florida');
+INSERT INTO zone VALUES (19,223,'GA','Georgia');
+INSERT INTO zone VALUES (20,223,'GU','Guam');
+INSERT INTO zone VALUES (21,223,'HI','Hawaii');
+INSERT INTO zone VALUES (22,223,'ID','Idaho');
+INSERT INTO zone VALUES (23,223,'IL','Illinois');
+INSERT INTO zone VALUES (24,223,'IN','Indiana');
+INSERT INTO zone VALUES (25,223,'IA','Iowa');
+INSERT INTO zone VALUES (26,223,'KS','Kansas');
+INSERT INTO zone VALUES (27,223,'KY','Kentucky');
+INSERT INTO zone VALUES (28,223,'LA','Louisiana');
+INSERT INTO zone VALUES (29,223,'ME','Maine');
+INSERT INTO zone VALUES (30,223,'MH','Marshall Islands');
+INSERT INTO zone VALUES (31,223,'MD','Maryland');
+INSERT INTO zone VALUES (32,223,'MA','Massachusetts');
+INSERT INTO zone VALUES (33,223,'MI','Michigan');
+INSERT INTO zone VALUES (34,223,'MN','Minnesota');
+INSERT INTO zone VALUES (35,223,'MS','Mississippi');
+INSERT INTO zone VALUES (36,223,'MO','Missouri');
+INSERT INTO zone VALUES (37,223,'MT','Montana');
+INSERT INTO zone VALUES (38,223,'NE','Nebraska');
+INSERT INTO zone VALUES (39,223,'NV','Nevada');
+INSERT INTO zone VALUES (40,223,'NH','New Hampshire');
+INSERT INTO zone VALUES (41,223,'NJ','New Jersey');
+INSERT INTO zone VALUES (42,223,'NM','New Mexico');
+INSERT INTO zone VALUES (43,223,'NY','New York');
+INSERT INTO zone VALUES (44,223,'NC','North Carolina');
+INSERT INTO zone VALUES (45,223,'ND','North Dakota');
+INSERT INTO zone VALUES (46,223,'MP','Northern Mariana Islands');
+INSERT INTO zone VALUES (47,223,'OH','Ohio');
+INSERT INTO zone VALUES (48,223,'OK','Oklahoma');
+INSERT INTO zone VALUES (49,223,'OR','Oregon');
+INSERT INTO zone VALUES (50,223,'PW','Palau');
+INSERT INTO zone VALUES (51,223,'PA','Pennsylvania');
+INSERT INTO zone VALUES (52,223,'PR','Puerto Rico');
+INSERT INTO zone VALUES (53,223,'RI','Rhode Island');
+INSERT INTO zone VALUES (54,223,'SC','South Carolina');
+INSERT INTO zone VALUES (55,223,'SD','South Dakota');
+INSERT INTO zone VALUES (56,223,'TN','Tennessee');
+INSERT INTO zone VALUES (57,223,'TX','Texas');
+INSERT INTO zone VALUES (58,223,'UT','Utah');
+INSERT INTO zone VALUES (59,223,'VT','Vermont');
+INSERT INTO zone VALUES (60,223,'VI','Virgin Islands');
+INSERT INTO zone VALUES (61,223,'VA','Virginia');
+INSERT INTO zone VALUES (62,223,'WA','Washington');
+INSERT INTO zone VALUES (63,223,'WV','West Virginia');
+INSERT INTO zone VALUES (64,223,'WI','Wisconsin');
+INSERT INTO zone VALUES (65,223,'WY','Wyoming');
 
-INSERT INTO zones VALUES (130,107,'JP','Japan');
+INSERT INTO zone VALUES (130,107,'JP','Japan');
 
-INSERT INTO tax_classes VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
-INSERT INTO tax_classes VALUES (2, 'Taxable Goods', 'The following types of products are included non-food, services, etc', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO tax_class VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO tax_class VALUES (2, 'Taxable Goods', 'The following types of products are included non-food, services, etc', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
 
-INSERT INTO tax_rates VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
-INSERT INTO tax_rates VALUES (2, 130, 2, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO tax_rate VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO tax_rate VALUES (2, 130, 2, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
 
-INSERT INTO categories VALUES (0, '', null, 1, '2007-01-01 00:00:00', null);
+INSERT INTO category VALUES (0, '', null, 1, '2007-01-01 00:00:00', null);
 


pal-cvs メーリングリストの案内