[exo-jcr-commits] exo-jcr SVN: r5035 - in jcr/trunk: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Oct 11 05:06:53 EDT 2011
Author: dkuleshov
Date: 2011-10-11 05:06:53 -0400 (Tue, 11 Oct 2011)
New Revision: 5035
Modified:
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
Log:
EXOJCR-1552: changed scripts for creating db's in MySQL to explicitly use InnoDB engine, mentioned in the doc book that jcr does not support MyISAM engine
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-10-07 18:26:34 UTC (rev 5034)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-10-11 09:06:53 UTC (rev 5035)
@@ -1,7 +1,7 @@
CREATE TABLE JCR_MCONTAINER(
VERSION VARCHAR(56) NOT NULL,
CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
+) ENGINE=InnoDB;
CREATE TABLE JCR_MITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
@@ -14,7 +14,7 @@
P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME(255), I_INDEX, I_CLASS, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME(255), I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
@@ -27,7 +27,7 @@
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
CREATE INDEX JCR_IDX_MVALUE_STORAGE_DESC ON JCR_MVALUE(PROPERTY_ID, STORAGE_DESC);
CREATE TABLE JCR_MREF(
@@ -35,5 +35,5 @@
PROPERTY_ID VARCHAR(56) NOT NULL,
ORDER_NUM INTEGER NOT NULL,
CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-10-07 18:26:34 UTC (rev 5034)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-10-11 09:06:53 UTC (rev 5035)
@@ -1,7 +1,7 @@
CREATE TABLE JCR_MCONTAINER(
VERSION VARCHAR(96) NOT NULL,
CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
+) ENGINE=InnoDB;
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
@@ -14,7 +14,7 @@
P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
@@ -27,7 +27,7 @@
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
CREATE INDEX JCR_IDX_MVALUE_STORAGE_DESC ON JCR_MVALUE(PROPERTY_ID, STORAGE_DESC);
CREATE TABLE JCR_MREF(
@@ -35,5 +35,5 @@
PROPERTY_ID VARCHAR(96) NOT NULL,
ORDER_NUM INTEGER NOT NULL,
CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
-);
-CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
+) ENGINE=InnoDB;
+CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-10-07 18:26:34 UTC (rev 5034)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-10-11 09:06:53 UTC (rev 5035)
@@ -1,7 +1,7 @@
CREATE TABLE JCR_SCONTAINER(
VERSION VARCHAR(56) NOT NULL,
CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
+) ENGINE=InnoDB;
CREATE TABLE JCR_SITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
@@ -15,7 +15,7 @@
P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME(255), I_INDEX, I_CLASS, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(255), I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
@@ -28,7 +28,7 @@
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
CREATE INDEX JCR_IDX_SVALUE_STORAGE_DESC ON JCR_SVALUE(PROPERTY_ID, STORAGE_DESC);
CREATE TABLE JCR_SREF(
@@ -36,5 +36,5 @@
PROPERTY_ID VARCHAR(56) NOT NULL,
ORDER_NUM INTEGER NOT NULL,
CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-10-07 18:26:34 UTC (rev 5034)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-10-11 09:06:53 UTC (rev 5035)
@@ -1,7 +1,7 @@
CREATE TABLE JCR_SCONTAINER(
VERSION VARCHAR(96) NOT NULL,
CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
+) ENGINE=InnoDB;
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
@@ -15,7 +15,7 @@
P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
@@ -28,7 +28,7 @@
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID)
-);
+) ENGINE=InnoDB;
CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
CREATE INDEX JCR_IDX_SVALUE_STORAGE_DESC ON JCR_SVALUE(PROPERTY_ID, STORAGE_DESC);
CREATE TABLE JCR_SREF(
@@ -36,5 +36,5 @@
PROPERTY_ID VARCHAR(96) NOT NULL,
ORDER_NUM INTEGER NOT NULL,
CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
-);
-CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
+) ENGINE=InnoDB;
+CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-10-07 18:26:34 UTC (rev 5034)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-10-11 09:06:53 UTC (rev 5035)
@@ -75,7 +75,14 @@
page "Selecting a SQL Server Collation" <ulink
url="http://msdn.microsoft.com/en-us/library/ms144250.aspx">here.</ulink>
</para>
- </note>Each database software supports ANSI SQL standards but also has
+ </note>
+ <note>
+ <para>
+ Be aware that JCR does not support MyISAM storage engine for the MySQL
+ relational database management system.
+ </para>
+ </note>
+ Each database software supports ANSI SQL standards but also has
its own specifics. So, each database has its own configuration in eXo JCR
as a database dialect parameter. If you need a more detailed configuration
of the database, it's possible to do that by editing the metadata
More information about the exo-jcr-commits
mailing list