Merge remote-tracking branch 'upstream/master' into speedy

This commit is contained in:
user
2012-11-20 17:00:00 -04:00
4 changed files with 27 additions and 1 deletions

View File

@@ -198,6 +198,25 @@
<rule name="validValues" value="ACTIVE|DELETED" message="Please select a valid document status (ACTIVE|DELETED)."/>
<rule name="required" message="Application Document Status is required."/>
</validator>
<index name="indexAppDocument">
<index-column name="FOLDER_UID"/>
<index-column name="APP_DOC_UID"/>
<vendor type="mysql">
<parameter name="Table" value="APP_DOCUMENT"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexAppDocument"/>
<parameter name="Seq_in_index" value="1"/>
<parameter name="Column_name" value="APP_DOCUMENT"/>
<parameter name="Collation" value="A"/>
<parameter name="Cardinality" value=""/>
<parameter name="Sub_part" value=""/>
<parameter name="Packed" value=""/>
<parameter name="Null" value=""/>
<parameter name="Index_type" value="BTREE"/>
<parameter name="Comment" value=""/>
</vendor>
</index>
</table>
<table name="APP_MESSAGE" idMethod="native">
<vendor type="mysql">

View File

@@ -165,6 +165,9 @@ CREATE TABLE [APP_DOCUMENT]
CONSTRAINT APP_DOCUMENT_PK PRIMARY KEY ([APP_DOC_UID],[DOC_VERSION])
);
CREATE INDEX [indexAppDocument] ON [APP_DOCUMENT] ([FOLDER_UID],[APP_DOC_UID]);
/* ---------------------------------------------------------------------- */
/* APP_MESSAGE */
/* ---------------------------------------------------------------------- */

View File

@@ -90,7 +90,9 @@ CREATE TABLE `APP_DOCUMENT`
`APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL,
`APP_DOC_STATUS_DATE` DATETIME,
`APP_DOC_FIELDNAME` VARCHAR(150),
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`)
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
#-----------------------------------------------------------------------------
#-- APP_MESSAGE

View File

@@ -86,6 +86,8 @@ CREATE TABLE "APP_DOCUMENT"
PRIMARY KEY ("APP_DOC_UID");
CREATE INDEX "indexAppDocument" ON "APP_DOCUMENT" ("FOLDER_UID","APP_DOC_UID");
/* -----------------------------------------------------------------------
APP_MESSAGE
----------------------------------------------------------------------- */