Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[14429] uvos/uvos-server/trunk/src/main
|
From: <go...@us...> - 2012-09-27 21:10:15
|
Revision: 14429
http://unicore.svn.sourceforge.net/unicore/?rev=14429&view=rev
Author: golbi
Date: 2012-09-27 21:10:09 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
Small hsql sql updates: makes it mostly possible to update to new version or exchange to H2.
Modified Paths:
--------------
uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/DB.java
uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/InitDB.java
uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-hsql.xml
uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-mysql.xml
uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-psql.xml
Modified: uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/DB.java
===================================================================
--- uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/DB.java 2012-09-27 20:30:28 UTC (rev 14428)
+++ uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/DB.java 2012-09-27 21:10:09 UTC (rev 14429)
@@ -221,7 +221,7 @@
try
{
Properties dbConf = sqlMap.getConfiguration().getVariables();
- String driver = dbConf.getProperty("driver");
+ String driver = dbConf.getProperty(P_DRIVER);
if ("org.hsqldb.jdbcDriver".equals(driver))
{
Connection conn = sqlMap.getConnection();
Modified: uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/InitDB.java
===================================================================
--- uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/InitDB.java 2012-09-27 20:30:28 UTC (rev 14428)
+++ uvos/uvos-server/trunk/src/main/java/pl/edu/icm/unicore/uvos/db/InitDB.java 2012-09-27 21:10:09 UTC (rev 14429)
@@ -48,6 +48,10 @@
private void initDB(SqlSessionFactory factory)
{
performUpdate(factory, "initdb", "Initialazing DB");
+ SqlSession session = factory.openSession(false);
+ session.insert("initVersion");
+ session.commit();
+ session.close();
}
private void initData(SqlSessionFactory factory, PersistentIdManager idMan) throws InternalException
@@ -98,12 +102,12 @@
}
clearDB(factory);
- String dialect = dbProp.getProperty(DB.P_DIALECT);
+ String driver = dbProp.getProperty(DB.P_DRIVER);
initDB(factory);
PersistentIdManager idMan = container.getComponent(PersistentIdManager.class);
initData(factory, idMan);
- if ("hsql".equals(dialect))
+ if ("org.hsqldb.jdbcDriver".equals(driver))
performUpdate(factory, "shutdown", "Shutting down HSQL DB");
}
Modified: uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-hsql.xml
===================================================================
--- uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-hsql.xml 2012-09-27 20:30:28 UTC (rev 14428)
+++ uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-hsql.xml 2012-09-27 21:10:09 UTC (rev 14429)
@@ -3,13 +3,14 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="Initdb">
- <update id="initdb">
-
+ <update id="initdb-01">
CREATE TABLE IDENTITY_TYPES(
ID INTEGER IDENTITY NOT NULL,
VAL VARCHAR(1024)
);
+ </update>
+ <update id="initdb-02">
CREATE TABLE ATTRIBUTE_TYPES(
ID INTEGER IDENTITY NOT NULL,
NAME VARCHAR(1024) NOT NULL,
@@ -17,7 +18,9 @@
DESCRIPTION VARCHAR(10240),
CONSTRAINT attrtype_name_unique UNIQUE(NAME)
);
+ </update>
+ <update id="initdb-03">
CREATE TABLE ENTITIES(
ID INTEGER IDENTITY NOT NULL,
PERSISTENT_ID VARCHAR(256) NOT NULL,
@@ -25,7 +28,9 @@
CONSTRAINT entities_unique UNIQUE (NAME),
CONSTRAINT persistent_id_unique UNIQUE (PERSISTENT_ID)
);
+ </update>
+ <update id="initdb-04">
CREATE TABLE IDENTITIES(
ID INTEGER IDENTITY NOT NULL,
VAL VARCHAR(30000) NOT NULL,
@@ -38,7 +43,9 @@
CONSTRAINT identities_fk_entityid FOREIGN KEY (ENTITY_ID) REFERENCES ENTITIES(ID) ON DELETE CASCADE,
CONSTRAINT identities_unique UNIQUE(CMP, TYPEID)
);
+ </update>
+ <update id="initdb-05">
CREATE TABLE GROUPS(
ID INTEGER IDENTITY NOT NULL,
NAME VARCHAR(255),
@@ -46,7 +53,9 @@
CONSTRAINT groups_unique UNIQUE (PARENT_ID, NAME),
CONSTRAINT groups_fk_parentid FOREIGN KEY (PARENT_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-06">
CREATE TABLE GROUP_ATTRIBUTES(
ID INTEGER IDENTITY NOT NULL,
VAL VARCHAR(102400),
@@ -56,7 +65,9 @@
CONSTRAINT groupattr_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE,
CONSTRAINT groupattr_fk_attrtypeid FOREIGN KEY (ATTRTYPE_ID) REFERENCES ATTRIBUTE_TYPES(ID)
);
+ </update>
+ <update id="initdb-07">
CREATE TABLE ENTITY_ATTRIBUTES(
ID INTEGER IDENTITY NOT NULL,
ATTRTYPE_ID INTEGER NOT NULL,
@@ -68,7 +79,9 @@
CONSTRAINT entityattributes_fk_attrtypeid FOREIGN KEY (ATTRTYPE_ID) REFERENCES ATTRIBUTE_TYPES(ID),
CONSTRAINT entityattributes_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-08">
CREATE TABLE GROUP_ENTITIES(
ID INTEGER IDENTITY NOT NULL,
ENTITY_ID INTEGER,
@@ -77,7 +90,9 @@
CONSTRAINT group_entities_fk_entityid FOREIGN KEY (ENTITY_ID) REFERENCES ENTITIES(ID) ON DELETE CASCADE,
CONSTRAINT group_entities_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-09">
CREATE TABLE GROUP_SUBGROUPS(
CHILD_ID INTEGER,
GROUP_ID INTEGER,
@@ -85,7 +100,9 @@
CONSTRAINT groupsubgroups_fk_childid FOREIGN KEY (CHILD_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE,
CONSTRAINT groupsubgroups_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-10">
CREATE TABLE AUTHZ_ATTRIBUTE(
ATTR_TYPE_ID INTEGER NOT NULL,
ATTR_VALUE VARCHAR(102400),
@@ -95,7 +112,9 @@
CONSTRAINT authzattr_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE,
CONSTRAINT authzattr_fk_attrtypeid FOREIGN KEY (ATTR_TYPE_ID) REFERENCES ATTRIBUTE_TYPES(ID)
);
+ </update>
+ <update id="initdb-11">
CREATE TABLE AUTHZ_SPECIAL(
SPECIAL CHAR(1) NOT NULL,
GROUP_ID INTEGER,
@@ -103,7 +122,9 @@
CONSTRAINT authzspecial_unique UNIQUE (GROUP_ID, SPECIAL),
CONSTRAINT authzspecial_fk_groupid FOREIGN KEY (GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-12">
CREATE TABLE APPLICATION_FORMS(
ID INTEGER IDENTITY NOT NULL,
FRIENDLY_NAME VARCHAR(256),
@@ -114,7 +135,9 @@
CONSTRAINT applicationforms_fk_basegroupid FOREIGN KEY (BASE_GROUP_ID) REFERENCES GROUPS(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-13">
CREATE TABLE APPLICATIONS(
ID INTEGER IDENTITY NOT NULL,
FORM_ID INTEGER,
@@ -134,14 +157,18 @@
CONSTRAINT applications_fk_formid FOREIGN KEY (FORM_ID) REFERENCES APPLICATION_FORMS(ID) ON DELETE CASCADE,
CONSTRAINT applications_fk_equivalentid FOREIGN KEY (EQUIVALENT_ID) REFERENCES IDENTITIES(ID) ON DELETE CASCADE
);
+ </update>
+ <update id="initdb-14">
CREATE TABLE NOTIFICATIONS(
ID INTEGER IDENTITY NOT NULL,
GROUP_FILTER VARCHAR(1024),
RECIPIENTS VARCHAR(1024) NOT NULL,
OPERATION VARCHAR(32)
);
+ </update>
+ <update id="initdb-15">
CREATE TABLE AUDIT_EVENTS(
ID INTEGER IDENTITY NOT NULL,
TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
@@ -150,14 +177,17 @@
INVOKER VARCHAR(255) NOT NULL,
DESCRIPTION VARCHAR(1024)
);
+ </update>
+ <update id="initdb-16">
CREATE TABLE UVOS_FLAG_(
VAL CHAR(128)
);
+ </update>
+ <insert id="initVersion">
INSERT INTO UVOS_FLAG_ (VAL) VALUES ('2_0_0');
-
- </update>
+ </insert>
<update id="shutdown">
Modified: uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-mysql.xml
===================================================================
--- uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-mysql.xml 2012-09-27 20:30:28 UTC (rev 14428)
+++ uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-mysql.xml 2012-09-27 21:10:09 UTC (rev 14429)
@@ -219,7 +219,7 @@
</update>
- <update id="initdb-99-dbVersion">
+ <insert id="initVersion">
INSERT INTO UVOS_FLAG_ (VAL) VALUES ('2_0_0');
- </update>
+ </insert>
</mapper>
\ No newline at end of file
Modified: uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-psql.xml
===================================================================
--- uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-psql.xml 2012-09-27 20:30:28 UTC (rev 14428)
+++ uvos/uvos-server/trunk/src/main/resources/pl/edu/icm/unicore/uvos/mybatis/Initdb-psql.xml 2012-09-27 21:10:09 UTC (rev 14429)
@@ -185,8 +185,8 @@
);
</update>
- <update id="initdb-16">
+ <insert id="initVersion">
INSERT INTO UVOS_FLAG_ (VAL) VALUES ('2_0_0');
- </update>
+ </insert>
</mapper>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|