You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by cm...@apache.org on 2002/08/22 16:58:02 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms StandardRDBMSAdapter.java JDBCStore.java HSQLDBSchema.sql SQLServerSchema.sql
cmlenz 2002/08/22 07:58:02
Modified: src/stores/org/apache/slide/store/impl/rdbms
StandardRDBMSAdapter.java JDBCStore.java
HSQLDBSchema.sql SQLServerSchema.sql
Log:
Database schema changes!
Mostly name changes, e.g. all tables are prefixed with SLIDE_,
VERSION is named REVISION etc.
Revision Changes Path
1.2 +150 -135 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java
Index: StandardRDBMSAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardRDBMSAdapter.java 22 Aug 2002 13:57:30 -0000 1.1
+++ StandardRDBMSAdapter.java 22 Aug 2002 14:58:01 -0000 1.2
@@ -181,7 +181,7 @@
// retrieve class name
String className;
sql.setLength(0);
- sql.append("SELECT CLASS_NAME FROM OBJECT WHERE URI_ID = ")
+ sql.append("SELECT CLASS_NAME FROM SLIDE_OBJECT WHERE URI_ID = ")
.append(uriId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
@@ -193,7 +193,7 @@
// retrieve the children
Vector children = new Vector();
sql.setLength(0);
- sql.append("SELECT A.URI_STRING FROM URI A, CHILDREN B ")
+ sql.append("SELECT A.URI_STRING FROM SLIDE_URI A, SLIDE_CHILD B ")
.append("WHERE A.URI_ID = B.CHILD_URI_ID ")
.append("AND B.URI_ID = ").append(uriId);
rs = stmt.executeQuery(sql.toString());
@@ -204,9 +204,9 @@
// retrieve the inbound links
Vector links = new Vector();
sql.setLength(0);
- sql.append("SELECT A.URI_STRING FROM URI A, LINKS B ")
+ sql.append("SELECT A.URI_STRING FROM SLIDE_URI A, SLIDE_LINK B ")
.append("WHERE A.URI_ID = B.URI_ID ")
- .append("AND B.LINK_TO_ID = ").append(uriId);
+ .append("AND B.TARGET_URI_ID = ").append(uriId);
rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
links.addElement(rs.getString("URI_STRING"));
@@ -217,8 +217,9 @@
if (className.equals("org.apache.slide.structure.LinkNode")) {
String linkTarget = null;
sql.setLength(0);
- sql.append("SELECT A.URI_STRING FROM URI A, LINKS B ")
- .append("WHERE A.URI_ID = B.LINK_TO_ID ")
+ sql.append("SELECT A.URI_STRING ")
+ .append("FROM SLIDE_URI A, SLIDE_LINK B ")
+ .append("WHERE A.URI_ID = B.TARGET_URI_ID ")
.append("AND B.URI_ID = ").append(uriId);
rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
@@ -272,7 +273,7 @@
long uriId = getUriId(conn, uri.toString());
sql.setLength(0);
- sql.append("SELECT CLASS_NAME FROM OBJECT WHERE URI_ID = ");
+ sql.append("SELECT CLASS_NAME FROM SLIDE_OBJECT WHERE URI_ID = ");
sql.append(uriId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
@@ -288,7 +289,7 @@
if (children != null) {
while (children.hasMoreElements()) {
sql.setLength(0);
- sql.append("INSERT INTO CHILDREN (URI_ID,CHILD_URI_ID) ")
+ sql.append("INSERT INTO SLIDE_CHILD (URI_ID,CHILD_URI_ID) ")
.append("VALUES (").append(parent).append(", ")
.append(getUriId(conn, (String)children.nextElement()))
.append(")");
@@ -305,7 +306,8 @@
getUriId(conn, ((LinkNode)object).getLinkedUri());
if (!isLinkExist(conn, parent, linkTargetId)) {
sql.setLength(0);
- sql.append("INSERT INTO LINKS (URI_ID, LINK_TO_ID) ")
+ sql.append("INSERT INTO SLIDE_LINK ")
+ .append("(URI_ID, TARGET_URI_ID) ")
.append("VALUES (").append(parent).append(", ")
.append(linkTargetId).append(")");
stmt.executeUpdate(sql.toString());
@@ -341,7 +343,7 @@
long uriId = getUriId(conn, uri.toString());
sql.setLength(0);
- sql.append("SELECT CLASS_NAME FROM OBJECT WHERE URI_ID = ")
+ sql.append("SELECT CLASS_NAME FROM SLIDE_OBJECT WHERE URI_ID = ")
.append(uriId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
@@ -350,7 +352,7 @@
// store the class name
sql.setLength(0);
- sql.append("INSERT INTO OBJECT (URI_ID,CLASS_NAME) ")
+ sql.append("INSERT INTO SLIDE_OBJECT (URI_ID,CLASS_NAME) ")
.append("VALUES (").append(uriId).append(", '")
.append(object.getClass().getName()).append("')");
stmt.executeUpdate(sql.toString());
@@ -361,7 +363,7 @@
if (children != null) {
while (children.hasMoreElements()) {
sql.setLength(0);
- sql.append("INSERT INTO CHILDREN (URI_ID,CHILD_URI_ID) ")
+ sql.append("INSERT INTO SLIDE_CHILD (URI_ID,CHILD_URI_ID) ")
.append("VALUES (").append(uriId).append(", ")
.append(getUriId(conn, (String)children.nextElement()))
.append(" )");
@@ -371,10 +373,12 @@
// if the object is a link, also store the link information
if (object instanceof LinkNode) {
- long linkTargetId = getUriId(conn, ((LinkNode)object).getLinkedUri());
+ long linkTargetId =
+ getUriId(conn, ((LinkNode)object).getLinkedUri());
if (!isLinkExist(conn, uriId, linkTargetId)) {
sql.setLength(0);
- sql.append("INSERT INTO LINKS (URI_ID, LINK_TO_ID) ")
+ sql.append("INSERT INTO SLIDE_LINK ")
+ .append("(URI_ID, TARGET_URI_ID) ")
.append("VALUES (").append(uriId).append(", ")
.append(linkTargetId).append(")");
stmt.executeUpdate(sql.toString());
@@ -413,21 +417,22 @@
// remove related child associations
sql.setLength(0);
- sql.append("DELETE FROM CHILDREN WHERE URI_ID = ")
+ sql.append("DELETE FROM SLIDE_CHILD WHERE URI_ID = ")
.append(uriId).append(" OR CHILD_URI_ID = ").append(uriId);
stmt.executeUpdate(sql.toString());
// delete link target and/or inbound links
sql.setLength(0);
- sql.append("DELETE FROM LINKS WHERE URI_ID = ").append(uriId);
+ sql.append("DELETE FROM SLIDE_LINK WHERE URI_ID = ").append(uriId);
stmt.executeUpdate(sql.toString());
// delete the object itself
sql.setLength(0);
- sql.append("DELETE FROM OBJECT WHERE URI_ID = ").append(uriId);
+ sql.append("DELETE FROM SLIDE_OBJECT WHERE URI_ID = ")
+ .append(uriId);
stmt.executeUpdate(sql.toString());
- // delete the URI
+ // delete the SLIDE_URI
removeUri(conn, object.getUri());
} catch (SQLException e) {
@@ -464,7 +469,7 @@
long actionId = getUriId(conn, permission.getActionUri());
sql.setLength(0);
- sql.append("SELECT 1 FROM PERMISSIONS ")
+ sql.append("SELECT 1 FROM SLIDE_PERMISSION ")
.append("WHERE OBJECT_ID = ").append(objectId)
.append(" AND SUBJECT_ID = ").append(subjectId)
.append(" AND ACTION_ID = " ).append(actionId);
@@ -472,9 +477,9 @@
if (!rs.next()) {
NodeRevisionNumber nrn = permission.getRevisionNumber();
sql.setLength(0);
- sql.append("INSERT INTO PERMISSIONS ")
- .append("(OBJECT_ID, SUBJECT_ID, ACTION_ID, VERSION_NO, ")
- .append("IS_INHERITABLE, IS_NEGATIVE) VALUES (")
+ sql.append("INSERT INTO SLIDE_PERMISSION ")
+ .append("(OBJECT_ID, SUBJECT_ID, ACTION_ID, ")
+ .append("REVISION_NUMBER, INHERITABLE, NEGATIVE) VALUES (")
.append(objectId).append(", ").append(subjectId)
.append(", ").append(actionId)
.append(", ").append((nrn == null) ? "NULL" : nrn.toString())
@@ -511,14 +516,14 @@
NodeRevisionNumber nrn = permission.getRevisionNumber();
sql.setLength(0);
- sql.append("DELETE FROM PERMISSIONS ")
+ sql.append("DELETE FROM SLIDE_PERMISSION ")
.append("WHERE OBJECT_ID = ")
.append(getUriId(conn, permission.getObjectUri()))
.append(" AND SUBJECT_ID = ")
.append(getUriId(conn, permission.getSubjectUri()))
.append(" AND ACTION_ID = ")
.append(getUriId(conn, permission.getActionUri()))
- .append(" AND VERSION_NO ")
+ .append(" AND REVISION_NUMBER ")
.append((nrn != null) ? "= '" + nrn + "'" : "IS NULL");
stmt.executeUpdate(sql.toString());
} catch (SQLException e) {
@@ -547,7 +552,7 @@
stmt = conn.createStatement();
sql.setLength(0);
- sql.append("DELETE FROM PERMISSIONS WHERE OBJECT_ID = ")
+ sql.append("DELETE FROM SLIDE_PERMISSION WHERE OBJECT_ID = ")
.append(getUriId(conn, uri.toString()));
stmt.executeUpdate(sql.toString());
@@ -578,17 +583,17 @@
stmt = conn.createStatement();
sql.setLength(0);
- sql.append("SELECT * FROM PERMISSIONS ")
+ sql.append("SELECT * FROM SLIDE_PERMISSION ")
.append("WHERE OBJECT_ID = ")
.append(getUriId(conn, uri.toString()));
ResultSet rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
String subject = getUri(conn, rs.getLong("SUBJECT_ID"));
String action = getUri(conn, rs.getLong("ACTION_ID"));
- String revision = rs.getString("VERSION_NO");
+ String revision = rs.getString("REVISION_NUMBER");
- boolean inheritable = rs.getBoolean("IS_INHERITABLE");
- boolean negative = rs.getBoolean("IS_NEGATIVE");
+ boolean inheritable = rs.getBoolean("INHERITABLE");
+ boolean negative = rs.getBoolean("NEGATIVE");
NodePermission permission =
new NodePermission(uri.toString(), revision, subject,
action, inheritable, negative);
@@ -629,9 +634,9 @@
}
sql.setLength(0);
- sql.append("INSERT INTO LOCKS (LOCK_ID, OBJECT_ID, SUBJECT_ID, ")
- .append("TYPE_ID, EXPIRATION_DATE, IS_INHERITABLE, ")
- .append("IS_EXCLUSIVE) VALUES (").append(lockId).append(", ")
+ sql.append("INSERT INTO SLIDE_LOCK (LOCK_ID, OBJECT_ID, ")
+ .append("SUBJECT_ID, ACTION_ID, EXPIRATION_DATE, INHERITABLE, ")
+ .append("EXCLUSIVE) VALUES (").append(lockId).append(", ")
.append(getUriId(conn, lock.getObjectUri())).append(", ")
.append(getUriId(conn, lock.getSubjectUri())).append(", ")
.append(getUriId(conn, lock.getTypeUri())).append(", ")
@@ -684,7 +689,7 @@
long lockId = getUriId(conn, lock.getLockId());
sql.setLength(0);
- sql.append("DELETE FROM LOCKS WHERE LOCK_ID = ")
+ sql.append("DELETE FROM SLIDE_LOCK WHERE LOCK_ID = ")
.append(lockId);
stmt.executeUpdate(sql.toString());
@@ -727,7 +732,7 @@
stmt = conn.createStatement();
sql.setLength(0);
- sql.append("SELECT * FROM LOCKS WHERE OBJECT_ID = ")
+ sql.append("SELECT * FROM SLIDE_LOCK WHERE OBJECT_ID = ")
.append(getUriId(conn, uri.toString()));
ResultSet rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
@@ -742,10 +747,10 @@
new NodeLock(getUri(conn, rs.getLong("LOCK_ID")),
getUri(conn, rs.getLong("OBJECT_ID")),
getUri(conn, rs.getLong("SUBJECT_ID")),
- getUri(conn, rs.getLong("TYPE_ID")),
+ getUri(conn, rs.getLong("ACTION_ID")),
expirationDate,
- rs.getBoolean("IS_INHERITABLE"),
- rs.getBoolean("IS_EXCLUSIVE"));
+ rs.getBoolean("INHERITABLE"),
+ rs.getBoolean("EXCLUSIVE"));
result.addElement(lock);
}
@@ -784,11 +789,11 @@
// find out whether the node is versioned
boolean isVersioned = false;
sql.setLength(0);
- sql.append("SELECT IS_VERSIONED FROM VERSION ")
+ sql.append("SELECT VERSIONED FROM SLIDE_REVISION_HISTORY ")
.append("WHERE URI_ID = ").append(uriId);
rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
- isVersioned = rs.getBoolean("IS_VERSIONED");
+ isVersioned = rs.getBoolean("VERSIONED");
} else {
throw new RevisionDescriptorNotFoundException(uri.toString());
}
@@ -797,21 +802,22 @@
Hashtable latestRevisionNumbers = new Hashtable();
Hashtable workingRevisions = new Hashtable();
sql.setLength(0);
- sql.append("SELECT A.VERSION_ID, A.REVISION_NO, B.BRANCH_STRING ")
- .append("FROM VERSION_HISTORY A, BRANCH B ")
+ sql.append("SELECT A.REVISION_ID, A.REVISION_NUMBER, ")
+ .append("B.BRANCH_NAME FROM SLIDE_REVISION A, SLIDE_BRANCH B ")
.append("WHERE A.URI_ID = ").append(uriId)
.append(" AND A.BRANCH_ID = B.BRANCH_ID");
rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
- String branch = rs.getString("BRANCH_STRING");
- long versionId = rs.getLong("VERSION_ID");
+ String branch = rs.getString("BRANCH_NAME");
+ long versionId = rs.getLong("REVISION_ID");
NodeRevisionNumber nrn =
- new NodeRevisionNumber(rs.getString("REVISION_NO"));
+ new NodeRevisionNumber(rs.getString("REVISION_NUMBER"));
// We parse the revision list of the object
sql.setLength(0);
- sql.append("SELECT PREDECESSOR_ID FROM VERSION_PREDS ")
- .append("WHERE VERSION_ID = ").append(versionId);
+ sql.append("SELECT PREDECESSOR_ID ")
+ .append("FROM SLIDE_REVISION_PREDECESSOR ")
+ .append("WHERE REVISION_ID = ").append(versionId);
ResultSet rs2 = stmt2.executeQuery(sql.toString());
Vector predecessors = new Vector();
while (rs2.next()) {
@@ -868,11 +874,13 @@
// Creating record in revisions tables
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION WHERE URI_ID = ").append(uriId);
+ sql.append("SELECT 1 FROM SLIDE_REVISION_HISTORY WHERE URI_ID = ")
+ .append(uriId);
rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
sql.setLength(0);
- sql.append("INSERT INTO VERSION (URI_ID, IS_VERSIONED) ")
+ sql.append("INSERT INTO SLIDE_REVISION_HISTORY ")
+ .append("(URI_ID, VERSIONED) ")
.append("VALUES (").append(uriId).append(", ")
.append(revisionDescriptors.isVersioned()).append(")");
stmt.execute(sql.toString());
@@ -884,16 +892,16 @@
NodeRevisionNumber nrn =
revisionDescriptors.getLatestRevision();
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION_HISTORY ")
+ sql.append("SELECT 1 FROM SLIDE_REVISION ")
.append("WHERE URI_ID = ").append(uriId)
.append(" AND BRANCH_ID = ").append(branchId)
- .append(" AND REVISION_NO ")
+ .append(" AND REVISION_NUMBER ")
.append((nrn != null) ? ("= '" + nrn + "'") : " IS NULL");
rs = stmt.executeQuery(sql.toString());
if (!rs.next() && (nrn != null)) {
sql.setLength(0);
- sql.append("INSERT INTO VERSION_HISTORY ")
- .append("(URI_ID, BRANCH_ID, REVISION_NO) ")
+ sql.append("INSERT INTO SLIDE_REVISION ")
+ .append("(URI_ID, BRANCH_ID, REVISION_NUMBER) ")
.append("VALUES (").append(uriId).append(", ")
.append(branchId).append(", '").append(nrn).append("')");
stmt.execute(sql.toString());
@@ -944,14 +952,15 @@
long uriId = getUriId(conn, uri.toString());
sql.setLength(0);
- sql.append("SELECT VERSION_ID FROM VERSION_HISTORY ")
+ sql.append("SELECT REVISION_ID FROM SLIDE_REVISION ")
.append("WHERE URI_ID = ").append(uriId);
rs = stmt.executeQuery(sql.toString());
stmt2 = conn.createStatement();
if (rs.next()) {
sql.setLength(0);
- sql.append("DELETE FROM VERSION_PREDS WHERE VERSION_ID = ")
- .append(rs.getLong("VERSION_ID"));
+ sql.append("DELETE FROM SLIDE_REVISION_PREDECESSOR ")
+ .append("WHERE REVISION_ID = ")
+ .append(rs.getLong("REVISION_ID"));
stmt2.execute(sql.toString());
}
} catch (SQLException e) {
@@ -996,15 +1005,15 @@
String branchName = null;
long versionId = 0;
sql.setLength(0);
- sql.append("SELECT A.VERSION_ID, B.BRANCH_STRING ")
- .append("FROM VERSION_HISTORY A, BRANCH B ")
+ sql.append("SELECT A.REVISION_ID, B.BRANCH_NAME ")
+ .append("FROM SLIDE_REVISION A, SLIDE_BRANCH B ")
.append("WHERE A.URI_ID = ").append(uriId)
- .append(" AND A.REVISION_NO = '").append(nrn.toString());
+ .append(" AND A.REVISION_NUMBER = '").append(nrn.toString());
sql.append("' AND B.BRANCH_ID = A.BRANCH_ID");
rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
- branchName = rs.getString("BRANCH_STRING");
- versionId = rs.getLong("VERSION_ID");
+ branchName = rs.getString("BRANCH_NAME");
+ versionId = rs.getLong("REVISION_ID");
} else {
throw new RevisionDescriptorNotFoundException(uri.toString());
}
@@ -1012,8 +1021,8 @@
// retrieve labels
Vector labels = new Vector();
sql.setLength(0);
- sql.append("SELECT LABEL_ID FROM VERSION_LABELS ")
- .append("WHERE VERSION_ID = ").append(versionId);
+ sql.append("SELECT LABEL_ID FROM SLIDE_REVISION_LABEL ")
+ .append("WHERE REVISION_ID = ").append(versionId);
rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
labels.addElement(getLabelName(conn, rs.getLong("LABEL_ID")));
@@ -1022,8 +1031,8 @@
// Retrieve properties
Hashtable properties = new Hashtable();
sql.setLength(0);
- sql.append("SELECT * FROM PROPERTIES WHERE VERSION_ID = ")
- .append(versionId);
+ sql.append("SELECT * FROM SLIDE_REVISION_PROPERTY ")
+ .append("WHERE REVISION_ID = ").append(versionId);
rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
String propertyName = rs.getString("PROPERTY_NAME");
@@ -1031,9 +1040,8 @@
NodeProperty property =
new NodeProperty(propertyName,
rs.getString("PROPERTY_VALUE"),
- propertyNamespace,
- rs.getString("PROPERTY_TYPE"),
- rs.getBoolean("IS_PROTECTED"));
+ propertyNamespace, null,
+ rs.getBoolean("PROTECTED"));
properties.put(propertyNamespace + propertyName, property);
}
@@ -1083,28 +1091,29 @@
// NodeRevisionDescriptors if they do not exist...
// is that intended?
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION WHERE URI_ID = ")
+ sql.append("SELECT 1 FROM SLIDE_REVISION_HISTORY WHERE URI_ID = ")
.append(uriId);
rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
sql.setLength(0);
- sql.append("INSERT INTO VERSION (URI_ID, IS_VERSIONED) ")
+ sql.append("INSERT INTO SLIDE_REVISION_HISTORY ")
+ .append("(URI_ID, VERSIONED) ")
.append("VALUES (").append(uriId).append(", ").append(0)
.append(")");
stmt.execute(sql.toString());
}
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION_HISTORY WHERE URI_ID = ")
+ sql.append("SELECT 1 FROM SLIDE_REVISION WHERE URI_ID = ")
.append(uriId).append(" AND BRANCH_ID = ")
- .append(branchId).append(" AND REVISION_NO = '" )
+ .append(branchId).append(" AND REVISION_NUMBER = '" )
.append(revisionDescriptor.getRevisionNumber().toString())
.append("'");
rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
sql.setLength(0);
- sql.append("INSERT INTO VERSION_HISTORY (URI_ID, BRANCH_ID, ")
- .append("REVISION_NO) VALUES (")
+ sql.append("INSERT INTO SLIDE_REVISION (URI_ID, BRANCH_ID, ")
+ .append("REVISION_NUMBER) VALUES (")
.append(uriId).append(", ").append(branchId).append(", '")
.append(revisionDescriptor.getRevisionNumber().toString())
.append("')");
@@ -1125,7 +1134,8 @@
labelId = getLabelId(conn, label);
}
sql.setLength(0);
- sql.append("INSERT INTO VERSION_LABELS (VERSION_ID,LABEL_ID) ")
+ sql.append("INSERT INTO SLIDE_REVISION_LABEL ")
+ .append("(REVISION_ID,LABEL_ID) ")
.append("VALUES (").append(versionId).append(", ")
.append(labelId).append(")");
stmt.execute(sql.toString());
@@ -1134,10 +1144,10 @@
// create associated properties
Enumeration properties = revisionDescriptor.enumerateProperties();
sql.setLength(0);
- sql.append("INSERT INTO PROPERTIES (VERSION_ID, ")
+ sql.append("INSERT INTO SLIDE_REVISION_PROPERTY (REVISION_ID, ")
.append("PROPERTY_NAMESPACE, PROPERTY_NAME, PROPERTY_VALUE, ")
- .append("PROPERTY_TYPE, IS_PROTECTED) ")
- .append("VALUES (?, ?, ?, ?, ?, ?)");
+ .append("PROTECTED) ")
+ .append("VALUES (?, ?, ?, ?, ?)");
pstmt = conn.prepareStatement(sql.toString());
while (properties.hasMoreElements()) {
NodeProperty property = (NodeProperty)properties.nextElement();
@@ -1145,8 +1155,7 @@
pstmt.setString(2, property.getNamespace());
pstmt.setString(3, property.getName());
pstmt.setString(4, property.getValue().toString());
- pstmt.setString(5, property.getType());
- pstmt.setBoolean(6, property.isProtected());
+ pstmt.setBoolean(5, property.isProtected());
pstmt.execute();
}
@@ -1206,13 +1215,14 @@
// remove revision labels
sql.setLength(0);
- sql.append("DELETE FROM VERSION_LABELS WHERE VERSION_ID = ");
+ sql.append("DELETE FROM SLIDE_REVISION_LABEL WHERE REVISION_ID = ");
sql.append(versionId);
stmt.execute(sql.toString());
// remove associated properties
sql.setLength(0);
- sql.append("DELETE FROM PROPERTIES WHERE VERSION_ID = ");
+ sql.append("DELETE FROM SLIDE_REVISION_PROPERTY ")
+ .append("WHERE REVISION_ID = ");
sql.append(versionId);
stmt.execute(sql.toString());
@@ -1249,8 +1259,8 @@
nrn);
sql.setLength(0);
- sql.append("SELECT CONTENT FROM VERSION_CONTENT ")
- .append("WHERE VERSION_ID = ").append(versionId);
+ sql.append("SELECT CONTENT FROM SLIDE_REVISION_CONTENT ")
+ .append("WHERE REVISION_ID = ").append(versionId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
throw new RevisionNotFoundException
@@ -1318,8 +1328,8 @@
nrn);
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION_CONTENT ")
- .append("WHERE VERSION_ID = ").append(versionId);
+ sql.append("SELECT 1 FROM SLIDE_REVISION_CONTENT ")
+ .append("WHERE REVISION_ID = ").append(versionId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
throw new RevisionAlreadyExistException
@@ -1360,15 +1370,15 @@
NodeRevisionNumber nrn = revisionDescriptor.getRevisionNumber();
Statement stmt = null;
try {
-
+ StringBuffer sql = new StringBuffer();
long versionId = getRevisionId(conn, getUriId(conn, revisionUri),
revisionDescriptor.getBranchName(),
nrn);
stmt = conn.createStatement();
- StringBuffer sql = new StringBuffer
- ("select 1 from VERSION_CONTENT where VERSION_ID = ");
- sql.append(versionId);
+ sql.setLength(0);
+ sql.append("SELECT 1 FROM SLIDE_REVISION_CONTENT ")
+ .append("WHERE REVISION_ID = ").append(versionId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
@@ -1421,7 +1431,7 @@
/**
- * Returns the URI ID corresponding to an URI.
+ * Returns the SLIDE_URI ID corresponding to an SLIDE_URI.
*/
protected long getUriId(Connection conn, String uri)
throws SQLException {
@@ -1431,7 +1441,7 @@
Long uriIdLong = (Long)uriIdLookup.get(uri);
if (uriIdLong == null) {
StringBuffer sql = new StringBuffer()
- .append("SELECT URI_ID FROM URI WHERE URI_STRING = '")
+ .append("SELECT URI_ID FROM SLIDE_URI WHERE URI_STRING = '")
.append(uri).append("'");
stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
@@ -1458,7 +1468,7 @@
/**
- * Retrieve the URI Name.
+ * Retrieve the SLIDE_URI Name.
*/
protected String getUri(Connection conn, long uriId)
throws SQLException {
@@ -1469,7 +1479,7 @@
String uri = (String)uriLookup.get(uriIdLong);
if (uri == null) {
StringBuffer sql = new StringBuffer()
- .append("SELECT URI_STRING FROM URI WHERE URI_ID = ")
+ .append("SELECT URI_STRING FROM SLIDE_URI WHERE URI_ID = ")
.append(uriId);
stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
@@ -1495,7 +1505,7 @@
/**
- * Adds the URI into the URI ID table.
+ * Adds the SLIDE_URI into the SLIDE_URI ID table.
*/
protected void setUriId(Connection conn, String uri)
throws SQLException {
@@ -1504,7 +1514,7 @@
try {
if (getUriId(conn, uri) == 0) {
StringBuffer sql = new StringBuffer()
- .append("INSERT INTO URI (URI_STRING) VALUES ('")
+ .append("INSERT INTO SLIDE_URI (URI_STRING) VALUES ('")
.append(uri).append("')");
stmt = conn.createStatement();
stmt.executeUpdate(sql.toString());
@@ -1530,7 +1540,8 @@
long uriId = getUriId(conn, uri);
if (uriId != 0) {
StringBuffer sql = new StringBuffer()
- .append("DELETE FROM URI WHERE URI_ID = ").append(uriId);
+ .append("DELETE FROM SLIDE_URI WHERE URI_ID = ")
+ .append(uriId);
stmt = conn.createStatement();
stmt.executeUpdate(sql.toString());
uriIdLookup.remove(uri);
@@ -1555,8 +1566,8 @@
Statement stmt = null;
try {
StringBuffer sql = new StringBuffer();
- sql.append("SELECT BRANCH_ID FROM BRANCH ")
- .append("WHERE BRANCH_STRING = '").append(branchName)
+ sql.append("SELECT BRANCH_ID FROM SLIDE_BRANCH ")
+ .append("WHERE BRANCH_NAME = '").append(branchName)
.append("'");
stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
@@ -1585,7 +1596,7 @@
try {
if (getBranchId(conn, branchName) == 0 ) {
StringBuffer sql = new StringBuffer();
- sql.append("INSERT INTO BRANCH (BRANCH_STRING) ")
+ sql.append("INSERT INTO SLIDE_BRANCH (BRANCH_NAME) ")
.append("VALUES ('").append(branchName).append("')");
stmt = conn.createStatement();
stmt.execute(sql.toString());
@@ -1609,8 +1620,8 @@
Statement stmt = null;
try {
StringBuffer sql = new StringBuffer();
- sql.append("SELECT LABEL_ID FROM LABEL ")
- .append("WHERE LABEL_STRING = '").append(label).append("'");
+ sql.append("SELECT LABEL_ID FROM SLIDE_LABEL ")
+ .append("WHERE LABEL_NAME = '").append(label).append("'");
stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
@@ -1637,12 +1648,12 @@
Statement stmt = null;
try {
StringBuffer sql = new StringBuffer();
- sql.append("SELECT LABEL_STRING FROM LABEL ")
+ sql.append("SELECT LABEL_NAME FROM SLIDE_LABEL ")
.append("WHERE LABEL_ID = ").append(labelID);
stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
- return rs.getString("LABEL_STRING");
+ return rs.getString("LABEL_NAME");
} else {
return null;
}
@@ -1666,7 +1677,7 @@
try {
if (getBranchId(conn, labelName) == 0) {
StringBuffer sql = new StringBuffer();
- sql.append("INSERT INTO LABEL (LABEL_STRING) ")
+ sql.append("INSERT INTO SLIDE_LABEL (LABEL_NAME) ")
.append("VALUES ('").append(labelName).append("')");
stmt = conn.createStatement();
stmt.executeUpdate(sql.toString());
@@ -1691,10 +1702,10 @@
Hashtable hshtempHash = new Hashtable();
Hashtable hshnewChild = new Hashtable();
Statement getStatement = conn.createStatement();
- StringBuffer sql = new StringBuffer
- ("select A.URI_STRING FROM URI A, CHILDREN B WHERE A.URI_ID = ");
- sql.append("B.CHILD_URI_ID AND B.URI_ID = ");
- sql.append(parent);
+ StringBuffer sql = new StringBuffer()
+ .append("SELECT A.URI_STRING FROM SLIDE_URI A, SLIDE_CHILD B ")
+ .append("WHERE A.URI_ID = B.CHILD_URI_ID ")
+ .append("AND B.URI_ID = ").append(parent);
ResultSet rslt = getStatement.executeQuery(sql.toString());
String s_child = null;
while (rslt.next()) {
@@ -1722,8 +1733,8 @@
Statement getStatement = conn.createStatement();
StringBuffer sql = new StringBuffer
- ("select 1 from LINKS where URI_ID = " );
- sql.append(parent).append(" and LINK_TO_ID = ").append(child);
+ ("select 1 from SLIDE_LINK where URI_ID = " );
+ sql.append(parent).append(" and TARGET_URI_ID = ").append(child);
ResultSet rslt = getStatement.executeQuery(sql.toString());
return rslt.next();
}
@@ -1737,7 +1748,7 @@
Statement getStatement = conn.createStatement();
StringBuffer sql = new StringBuffer
- ("select 1 from LOCKS where LOCK_ID = " );
+ ("select 1 from SLIDE_LOCK where LOCK_ID = " );
sql.append(parent);
ResultSet rslt = getStatement.executeQuery(sql.toString());
return rslt.next();
@@ -1745,7 +1756,7 @@
/**
- * Get the VersionID for the current URI
+ * Get the VersionID for the current SLIDE_URI
*/
protected long getRevisionId
(Connection conn, long uriId, String branch, NodeRevisionNumber nrn)
@@ -1757,15 +1768,16 @@
stmt = conn.createStatement();
sql.setLength(0);
- sql.append("SELECT A.VERSION_ID FROM VERSION_HISTORY A, BRANCH B ")
- .append("WHERE A.URI_ID = " ).append(uriId)
+ sql.append("SELECT A.REVISION_ID ")
+ .append("FROM SLIDE_REVISION A, SLIDE_BRANCH B ")
+ .append("WHERE A.URI_ID = ").append(uriId)
.append(" AND A.BRANCH_ID = B.BRANCH_ID ")
- .append(" AND B.BRANCH_STRING = '").append(branch)
- .append("' AND A.REVISION_NO ")
+ .append(" AND B.BRANCH_NAME = '").append(branch)
+ .append("' AND A.REVISION_NUMBER ")
.append((nrn != null) ? "= '" + nrn + "'" : "IS NULL");
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
- return rs.getLong("VERSION_ID");
+ return rs.getLong("REVISION_ID");
} else {
return 0;
}
@@ -1780,7 +1792,7 @@
/**
- * Set the Version ID for the current URI
+ * Set the Version ID for the current SLIDE_URI
*/
protected void setRevisionId
(Connection conn, long uriId, long branchId, String sXNumber)
@@ -1791,18 +1803,20 @@
StringBuffer sql = new StringBuffer();
stmt = conn.createStatement();
sql.setLength(0);
- sql.append("SELECT 1 FROM VERSION WHERE URI_ID = ").append(uriId);
+ sql.append("SELECT 1 FROM SLIDE_REVISION_HISTORY WHERE URI_ID = ")
+ .append(uriId);
ResultSet rs = stmt.executeQuery(sql.toString());
if (!rs.next()) {
sql.setLength(0);
- sql.append("INSERT INTO VERSION (URI_ID, IS_VERSIONED) ")
- .append("VALUES (").append(uriId).append(", ").append(0)
+ sql.append("INSERT INTO SLIDE_REVISION_HISTORY ")
+ .append("(URI_ID, VERSIONED) ").append("VALUES (")
+ .append(uriId).append(", ").append(0)
.append(")");
stmt.execute(sql.toString());
}
sql.setLength(0);
- sql.append("INSERT INTO VERSION_HISTORY ")
- .append("(URI_ID, BRANCH_ID, REVISION_NO) ")
+ sql.append("INSERT INTO SLIDE_REVISION ")
+ .append("(URI_ID, BRANCH_ID, REVISION_NUMBER) ")
.append("VALUES (").append(uriId).append(", ").append(branchId)
.append(", '").append(sXNumber).append("')");
stmt.execute(sql.toString());
@@ -1817,7 +1831,7 @@
/**
- * Get the revision number string for the current URI
+ * Get the revision number string for the current SLIDE_URI
*/
protected String getRevisionNumber
(Connection conn, long versionId, long uriId, String branch)
@@ -1827,15 +1841,15 @@
try {
StringBuffer sql = new StringBuffer();
stmt = conn.createStatement();
- sql.append("SELECT A.REVISION_NO ")
- .append("FROM VERSION_HISTORY A, BRANCH B ")
- .append("WHERE A.VERSION_ID = ").append(versionId)
+ sql.append("SELECT A.REVISION_NUMBER ")
+ .append("FROM SLIDE_REVISION A, SLIDE_BRANCH B ")
+ .append("WHERE A.REVISION_ID = ").append(versionId)
.append(" AND A.URI_ID = ").append(uriId)
.append(" AND A.BRANCH_ID = B.BRANCH_ID")
- .append(" AND B.BRANCH_STRING = '").append(branch).append("'");
+ .append(" AND B.BRANCH_NAME = '").append(branch).append("'");
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next()) {
- return rs.getString("REVISION_NO");
+ return rs.getString("REVISION_NUMBER");
} else {
return null;
}
@@ -1863,9 +1877,10 @@
StringBuffer sql = new StringBuffer();
// find or add the version ID
- long versionId = getRevisionId(conn, getUriId(conn, revisionUri),
- revisionDescriptor.getBranchName(),
- revisionDescriptor.getRevisionNumber());
+ long versionId =
+ getRevisionId(conn, getUriId(conn, revisionUri),
+ revisionDescriptor.getBranchName(),
+ revisionDescriptor.getRevisionNumber());
if (versionId == 0) {
setRevisionId(conn, getUriId(conn, revisionUri),
getBranchId(conn,
@@ -1877,7 +1892,7 @@
revisionDescriptor.getRevisionNumber());
}
- sql.append("INSERT INTO VERSION_CONTENT VALUES (?, ?)");
+ sql.append("INSERT INTO SLIDE_REVISION_CONTENT VALUES (?, ?)");
pstmt = conn.prepareStatement(sql.toString());
pstmt.setLong(1, versionId);
@@ -1957,8 +1972,8 @@
Statement stmt = null;
try {
StringBuffer sql = new StringBuffer();
- sql.append("DELETE FROM VERSION_CONTENT ")
- .append("WHERE VERSION_ID = ").append(versionId);
+ sql.append("DELETE FROM SLIDE_REVISION_CONTENT ")
+ .append("WHERE REVISION_ID = ").append(versionId);
stmt = conn.createStatement();
stmt.executeUpdate(sql.toString());
} finally {
1.13 +1 -1 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/JDBCStore.java
Index: JDBCStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/JDBCStore.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JDBCStore.java 22 Aug 2002 13:58:28 -0000 1.12
+++ JDBCStore.java 22 Aug 2002 14:58:01 -0000 1.13
@@ -375,7 +375,7 @@
return false;
}
Statement stmt = connection.createStatement();
- stmt.executeQuery("SELECT * FROM URI WHERE URI_ID IS NULL");
+ stmt.executeQuery("SELECT * FROM SLIDE_URI WHERE URI_ID IS NULL");
return true;
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
1.4 +82 -83 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/HSQLDBSchema.sql
Index: HSQLDBSchema.sql
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/HSQLDBSchema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HSQLDBSchema.sql 22 Aug 2002 12:10:15 -0000 1.3
+++ HSQLDBSchema.sql 22 Aug 2002 14:58:01 -0000 1.4
@@ -2,136 +2,135 @@
/****** CREATE SLIDE TABLES FOR HYPERSONIC DB ******/
/**********************************************************************/
-CREATE TABLE URI (
+CREATE TABLE SLIDE_URI (
URI_ID INT NOT NULL IDENTITY PRIMARY KEY,
URI_STRING VARCHAR(800) NOT NULL,
UNIQUE (URI_ID)
);
-CREATE TABLE OBJECT (
+CREATE TABLE SLIDE_OBJECT (
URI_ID INT PRIMARY KEY,
CLASS_NAME VARCHAR(255) NOT NULL,
- CONSTRAINT FK_OBJECT
- FOREIGN KEY (URI_ID) REFERENCES URI (URI_ID)
+ CONSTRAINT SLIDE_OBJECT
+ FOREIGN KEY (URI_ID) REFERENCES SLIDE_URI (URI_ID)
);
-CREATE TABLE CHILDREN (
+CREATE TABLE SLIDE_CHILD (
URI_ID INT NOT NULL,
CHILD_URI_ID INT NOT NULL,
- CONSTRAINT FK_CHILDREN
- FOREIGN KEY (URI_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (CHILD_URI_ID) REFERENCES URI (URI_ID),
+ CONSTRAINT FK_SLIDE_CHILD
+ FOREIGN KEY (URI_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (CHILD_URI_ID) REFERENCES SLIDE_URI (URI_ID),
UNIQUE (URI_ID, CHILD_URI_ID)
);
-CREATE TABLE LINKS (
+CREATE TABLE SLIDE_LINK (
URI_ID INT NOT NULL,
- LINK_TO_ID INT NOT NULL,
- CONSTRAINT FK_LINKS
- FOREIGN KEY (URI_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (LINK_TO_ID) REFERENCES URI (URI_ID),
- UNIQUE (URI_ID, LINK_TO_ID)
+ TARGET_URI_ID INT NOT NULL,
+ CONSTRAINT FK_SLIDE_LINK
+ FOREIGN KEY (URI_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (TARGET_URI_ID) REFERENCES SLIDE_URI (URI_ID),
+ UNIQUE (URI_ID, TARGET_URI_ID)
);
-CREATE TABLE LOCKS (
+CREATE TABLE SLIDE_LOCK (
LOCK_ID INT PRIMARY KEY,
OBJECT_ID INT NOT NULL,
SUBJECT_ID INT NOT NULL,
- TYPE_ID INT NOT NULL,
- EXPIRATION_DATE numeric(14, 0) NOT NULL,
- IS_INHERITABLE BIT NOT NULL,
- IS_EXCLUSIVE BIT NOT NULL,
- CONSTRAINT FK_LOCKS
- FOREIGN KEY (LOCK_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (OBJECT_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (SUBJECT_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (TYPE_ID) REFERENCES URI (URI_ID)
+ ACTION_ID INT NOT NULL,
+ EXPIRATION_DATE NUMERIC(14, 0) NOT NULL,
+ INHERITABLE BIT NOT NULL,
+ EXCLUSIVE BIT NOT NULL,
+ CONSTRAINT FK_SLIDE_LOCK
+ FOREIGN KEY (LOCK_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (OBJECT_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (SUBJECT_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (ACTION_ID) REFERENCES SLIDE_URI (URI_ID)
);
-CREATE TABLE BRANCH (
+CREATE TABLE SLIDE_BRANCH (
BRANCH_ID INT NOT NULL IDENTITY PRIMARY KEY,
- BRANCH_STRING VARCHAR(255) NOT NULL,
+ BRANCH_NAME VARCHAR(255) NOT NULL,
UNIQUE (BRANCH_ID)
);
-CREATE TABLE LABEL (
+CREATE TABLE SLIDE_LABEL (
LABEL_ID INT NOT NULL IDENTITY PRIMARY KEY,
- LABEL_STRING VARCHAR(255) NOT NULL,
+ LABEL_NAME VARCHAR(255) NOT NULL,
UNIQUE (LABEL_ID)
);
-CREATE TABLE VERSION (
+CREATE TABLE SLIDE_REVISION_HISTORY (
URI_ID INT PRIMARY KEY,
- IS_VERSIONED BIT NOT NULL,
- CONSTRAINT FK_VERSION
- FOREIGN KEY (URI_ID) REFERENCES URI (URI_ID)
+ VERSIONED BIT NOT NULL,
+ CONSTRAINT FK_SLIDE_REVISION_HISTORY
+ FOREIGN KEY (URI_ID) REFERENCES SLIDE_URI (URI_ID)
);
-CREATE TABLE VERSION_HISTORY (
- VERSION_ID INT NOT NULL IDENTITY PRIMARY KEY,
+CREATE TABLE SLIDE_REVISION (
+ REVISION_ID INT NOT NULL IDENTITY PRIMARY KEY,
URI_ID INT NOT NULL,
BRANCH_ID INT NOT NULL,
- REVISION_NO VARCHAR(20) NOT NULL,
- CONSTRAINT FK_VERSION_HISTORY
- FOREIGN KEY (URI_ID) REFERENCES VERSION (URI_ID),
- FOREIGN KEY (BRANCH_ID) REFERENCES BRANCH (BRANCH_ID),
- UNIQUE (URI_ID, BRANCH_ID, REVISION_NO)
+ REVISION_NUMBER VARCHAR(20) NOT NULL,
+ CONSTRAINT FK_SLIDE_REVISION
+ FOREIGN KEY (URI_ID) REFERENCES SLIDE_REVISION_HISTORY (URI_ID),
+ FOREIGN KEY (BRANCH_ID) REFERENCES SLIDE_BRANCH (BRANCH_ID),
+ UNIQUE (URI_ID, BRANCH_ID, REVISION_NUMBER)
);
-CREATE TABLE VERSION_PREDS (
- VERSION_ID INT NOT NULL,
+CREATE TABLE SLIDE_REVISION_PREDECESSOR (
+ REVISION_ID INT NOT NULL,
PREDECESSOR_ID INT NOT NULL,
- CONSTRAINT FH_VERSION_PREDS
- FOREIGN KEY (VERSION_ID) REFERENCES VERSION_HISTORY (VERSION_ID),
- FOREIGN KEY (PREDECESSOR_ID) REFERENCES VERSION_HISTORY (VERSION_ID),
- UNIQUE (VERSION_ID, PREDECESSOR_ID)
+ CONSTRAINT FH_SLIDE_REVISION_PREDECESSOR
+ FOREIGN KEY (REVISION_ID) REFERENCES SLIDE_REVISION (REVISION_ID),
+ FOREIGN KEY (PREDECESSOR_ID) REFERENCES SLIDE_REVISION (REVISION_ID),
+ UNIQUE (REVISION_ID, PREDECESSOR_ID)
);
-CREATE TABLE VERSION_LABELS (
- VERSION_ID INT NOT NULL,
+CREATE TABLE SLIDE_REVISION_LABEL (
+ REVISION_ID INT NOT NULL,
LABEL_ID INT NOT NULL,
- CONSTRAINT FK_VERSION_LABELS
- FOREIGN KEY (VERSION_ID) REFERENCES VERSION_HISTORY (VERSION_ID),
- FOREIGN KEY (LABEL_ID) REFERENCES LABEL (LABEL_ID),
- UNIQUE (VERSION_ID, LABEL_ID)
-);
-
-CREATE TABLE VERSION_CONTENT (
- VERSION_ID INT PRIMARY KEY,
- CONTENT longvarbinary NOT NULL,
- CONSTRAINT FK_VERSION_CONTENT
- FOREIGN KEY (VERSION_ID) REFERENCES VERSION_HISTORY (VERSION_ID)
-);
-
-CREATE TABLE PROPERTIES (
- VERSION_ID INT NOT NULL,
- PROPERTY_NAMESPACE VARCHAR(50) NOT NULL,
- PROPERTY_NAME VARCHAR(50) NOT NULL,
+ CONSTRAINT FK_SLIDE_REVISION_LABEL
+ FOREIGN KEY (REVISION_ID) REFERENCES SLIDE_REVISION (REVISION_ID),
+ FOREIGN KEY (LABEL_ID) REFERENCES SLIDE_LABEL (LABEL_ID),
+ UNIQUE (REVISION_ID, LABEL_ID)
+);
+
+CREATE TABLE SLIDE_REVISION_CONTENT (
+ REVISION_ID INT PRIMARY KEY,
+ CONTENT LONGVARBINARY NOT NULL,
+ CONSTRAINT FK_SLIDE_REVISION_CONTENT
+ FOREIGN KEY (REVISION_ID) REFERENCES SLIDE_REVISION (REVISION_ID)
+);
+
+CREATE TABLE SLIDE_REVISION_PROPERTY (
+ REVISION_ID INT NOT NULL,
+ PROPERTY_NAMESPACE VARCHAR(255) NOT NULL,
+ PROPERTY_NAME VARCHAR(255) NOT NULL,
PROPERTY_VALUE VARCHAR(255) NOT NULL,
- PROPERTY_TYPE VARCHAR(50) NOT NULL,
- IS_PROTECTED BIT NOT NULL,
- CONSTRAINT FK_PROPERTIES
- FOREIGN KEY (VERSION_ID)
- REFERENCES VERSION_HISTORY (VERSION_ID),
- UNIQUE (VERSION_ID, PROPERTY_NAMESPACE, PROPERTY_NAME)
+ PROTECTED BIT NOT NULL,
+ CONSTRAINT FK_SLIDE_REVISION_PROPERTY
+ FOREIGN KEY (REVISION_ID)
+ REFERENCES SLIDE_REVISION (REVISION_ID),
+ UNIQUE (REVISION_ID, PROPERTY_NAMESPACE, PROPERTY_NAME)
);
-CREATE TABLE PERMISSIONS (
+CREATE TABLE SLIDE_PERMISSION (
OBJECT_ID INT NOT NULL,
SUBJECT_ID INT NOT NULL,
ACTION_ID INT NOT NULL,
- VERSION_NO VARCHAR(20),
- IS_INHERITABLE BIT NOT NULL,
- IS_NEGATIVE BIT NOT NULL,
- CONSTRAINT FK_PERMISSIONS
- FOREIGN KEY (OBJECT_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (SUBJECT_ID) REFERENCES URI (URI_ID),
- FOREIGN KEY (ACTION_ID) REFERENCES URI (URI_ID),
+ REVISION_NUMBER VARCHAR(20),
+ INHERITABLE BIT NOT NULL,
+ NEGATIVE BIT NOT NULL,
+ CONSTRAINT FK_SLIDE_PERMISSION
+ FOREIGN KEY (OBJECT_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (SUBJECT_ID) REFERENCES SLIDE_URI (URI_ID),
+ FOREIGN KEY (ACTION_ID) REFERENCES SLIDE_URI (URI_ID),
UNIQUE (OBJECT_ID, SUBJECT_ID, ACTION_ID)
);
-INSERT INTO URI VALUES (0, '');
-INSERT INTO BRANCH VALUES (0, '');
-INSERT INTO LABEL VALUES (0, '');
-INSERT INTO VERSION VALUES(0, 0);
-INSERT INTO VERSION_HISTORY VALUES (0, 0, 0, '');
+INSERT INTO SLIDE_URI VALUES (0, '');
+INSERT INTO SLIDE_BRANCH VALUES (0, '');
+INSERT INTO SLIDE_LABEL VALUES (0, '');
+INSERT INTO SLIDE_REVISION_HISTORY VALUES(0, 0);
+INSERT INTO SLIDE_REVISION VALUES (0, 0, 0, '');
1.2 +87 -88 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerSchema.sql
Index: SQLServerSchema.sql
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerSchema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLServerSchema.sql 7 Aug 2002 18:49:49 -0000 1.1
+++ SQLServerSchema.sql 22 Aug 2002 14:58:01 -0000 1.2
@@ -7,60 +7,60 @@
/****** DROP SLIDE TABLES ******/
/**********************************************************************/
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[OBJECT]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[OBJECT]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_OBJECT]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_OBJECT]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[CHILDREN]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[CHILDREN]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_CHILD]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_CHILD]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[LINKS]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[LINKS]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_LINK]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_LINK]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[LOCKS]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[LOCKS]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_LOCK]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_LOCK]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[VERSION_CONTENT]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[VERSION_CONTENT]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_CONTENT]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_CONTENT]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[PROPERTIES]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[PROPERTIES]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_PROPERTY]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_PROPERTY]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[PERMISSIONS]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[PERMISSIONS]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_PERMISSION]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_PERMISSION]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[VERSION_PREDS]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[VERSION_PREDS]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_PREDECESSOR]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_PREDECESSOR]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[VERSION_LABELS]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[VERSION_LABELS]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_LABEL]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_LABEL]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[VERSION_HISTORY]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[VERSION_HISTORY]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[VERSION]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[VERSION]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_REVISION_HISTORY]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_REVISION_HISTORY]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[BRANCH]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[BRANCH]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_BRANCH]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_BRANCH]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[LABEL]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[LABEL]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_LABEL]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_LABEL]
GO
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[URI]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
-DROP TABLE [dbo].[URI]
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[SLIDE_URI]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+DROP TABLE [dbo].[SLIDE_URI]
GO
@@ -100,140 +100,139 @@
/****** CREATE SLIDE TABLES ******/
/**********************************************************************/
-CREATE TABLE URI (
+CREATE TABLE SLIDE_URI (
URI_ID id_type IDENTITY UNIQUE NOT NULL,
URI_STRING uri_str_type NOT NULL,
UNIQUE NONCLUSTERED (URI_ID)
)
GO
-CREATE TABLE OBJECT (
+CREATE TABLE SLIDE_OBJECT (
URI_ID id_type PRIMARY KEY,
CLASS_NAME varchar(255) NOT NULL,
CONSTRAINT FK_OBJECT_URI_ID
FOREIGN KEY (URI_ID)
- REFERENCES URI (URI_ID)
+ REFERENCES SLIDE_URI (URI_ID)
)
GO
-CREATE TABLE CHILDREN (
+CREATE TABLE SLIDE_CHILD (
URI_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
CHILD_URI_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
UNIQUE CLUSTERED (URI_ID, CHILD_URI_ID)
)
GO
-CREATE TABLE LINKS (
+CREATE TABLE SLIDE_LINK (
URI_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
- LINK_TO_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
- UNIQUE CLUSTERED (URI_ID, LINK_TO_ID)
+ REFERENCES SLIDE_URI (URI_ID),
+ TARGET_URI_ID id_type NOT NULL FOREIGN KEY
+ REFERENCES SLIDE_URI (URI_ID),
+ UNIQUE CLUSTERED (URI_ID, TARGET_URI_ID)
)
GO
-CREATE TABLE LOCKS (
+CREATE TABLE SLIDE_LOCK (
LOCK_ID id_type PRIMARY KEY,
OBJECT_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
SUBJECT_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
TYPE_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
EXPIRATION_DATE numeric(14, 0) NOT NULL,
- IS_INHERITABLE bit NOT NULL,
- IS_EXCLUSIVE bit NOT NULL,
+ INHERITABLE bit NOT NULL,
+ EXCLUSIVE bit NOT NULL,
CONSTRAINT FK_LOCKS_LOCK_ID
FOREIGN KEY (LOCK_ID)
- REFERENCES URI (URI_ID)
+ REFERENCES SLIDE_URI (URI_ID)
)
GO
-CREATE TABLE BRANCH (
+CREATE TABLE SLIDE_BRANCH (
BRANCH_ID id_type IDENTITY UNIQUE NOT NULL,
- BRANCH_STRING varchar(255) NOT NULL,
+ BRANCH_NAME varchar(255) NOT NULL,
UNIQUE NONCLUSTERED (BRANCH_ID)
)
GO
-CREATE TABLE LABEL (
+CREATE TABLE SLIDE_LABEL (
LABEL_ID id_type IDENTITY UNIQUE NOT NULL,
- LABEL_STRING varchar(255) NOT NULL,
+ LABEL_NAME varchar(255) NOT NULL,
UNIQUE NONCLUSTERED (LABEL_ID)
)
GO
-CREATE TABLE VERSION (
+CREATE TABLE SLIDE_REVISION_HISTORY (
URI_ID id_type PRIMARY KEY,
- IS_VERSIONED bit NOT NULL,
+ VERSIONED bit NOT NULL,
CONSTRAINT FK_VERSION_URI_ID
FOREIGN KEY (URI_ID)
- REFERENCES URI (URI_ID)
+ REFERENCES SLIDE_URI (URI_ID)
)
GO
-CREATE TABLE VERSION_HISTORY (
- VERSION_ID id_type IDENTITY UNIQUE NOT NULL,
+CREATE TABLE SLIDE_REVISION (
+ REVISION_ID id_type IDENTITY UNIQUE NOT NULL,
URI_ID id_type NOT NULL FOREIGN KEY
- REFERENCES VERSION (URI_ID),
+ REFERENCES SLIDE_REVISION_HISTORY (URI_ID),
BRANCH_ID id_type NOT NULL FOREIGN KEY
- REFERENCES BRANCH (BRANCH_ID),
- REVISION_NO VARCHAR(20) NOT NULL,
- UNIQUE NONCLUSTERED (URI_ID, BRANCH_ID, REVISION_NO)
+ REFERENCES SLIDE_BRANCH (BRANCH_ID),
+ REVISION_NUMBER VARCHAR(20) NOT NULL,
+ UNIQUE NONCLUSTERED (URI_ID, BRANCH_ID, REVISION_NUMBER)
)
GO
-CREATE TABLE VERSION_PREDS (
- VERSION_ID id_type NOT NULL FOREIGN KEY
- REFERENCES VERSION_HISTORY (VERSION_ID),
+CREATE TABLE SLIDE_REVISION_PREDECESSOR (
+ REVISION_ID id_type NOT NULL FOREIGN KEY
+ REFERENCES SLIDE_REVISION (REVISION_ID),
PREDECESSOR_ID id_type NOT NULL FOREIGN KEY
- REFERENCES VERSION_HISTORY (VERSION_ID),
- UNIQUE CLUSTERED (VERSION_ID, PREDECESSOR_ID)
+ REFERENCES SLIDE_REVISION (REVISION_ID),
+ UNIQUE CLUSTERED (REVISION_ID, PREDECESSOR_ID)
)
GO
-CREATE TABLE VERSION_LABELS (
- VERSION_ID id_type NOT NULL FOREIGN KEY
- REFERENCES VERSION_HISTORY (VERSION_ID),
+CREATE TABLE SLIDE_REVISION_LABEL (
+ REVISION_ID id_type NOT NULL FOREIGN KEY
+ REFERENCES SLIDE_REVISION (REVISION_ID),
LABEL_ID id_type NOT NULL FOREIGN KEY
- REFERENCES LABEL (LABEL_ID),
- UNIQUE CLUSTERED (VERSION_ID, LABEL_ID)
+ REFERENCES SLIDE_LABEL (LABEL_ID),
+ UNIQUE CLUSTERED (REVISION_ID, LABEL_ID)
)
GO
-CREATE TABLE VERSION_CONTENT (
- VERSION_ID id_type PRIMARY KEY,
+CREATE TABLE SLIDE_REVISION_CONTENT (
+ REVISION_ID id_type PRIMARY KEY,
CONTENT image NOT NULL,
CONSTRAINT FK_VC_VERSION_ID
- FOREIGN KEY (VERSION_ID)
- REFERENCES VERSION_HISTORY (VERSION_ID),
+ FOREIGN KEY (REVISION_ID)
+ REFERENCES SLIDE_REVISION (REVISION_ID),
)
GO
-CREATE TABLE PROPERTIES (
- VERSION_ID id_type NOT NULL FOREIGN KEY
- REFERENCES VERSION_HISTORY (VERSION_ID),
- PROPERTY_NAMESPACE varchar(50) NOT NULL,
- PROPERTY_NAME varchar(50) NOT NULL,
+CREATE TABLE SLIDE_REVISION_PROPERTY (
+ REVISION_ID id_type NOT NULL FOREIGN KEY
+ REFERENCES SLIDE_REVISION (REVISION_ID),
+ PROPERTY_NAMESPACE varchar(255) NOT NULL,
+ PROPERTY_NAME varchar(255) NOT NULL,
PROPERTY_VALUE varchar(255) NOT NULL,
- PROPERTY_TYPE varchar(50) NOT NULL,
- IS_PROTECTED bit NOT NULL,
- UNIQUE CLUSTERED (VERSION_ID, PROPERTY_NAMESPACE, PROPERTY_NAME)
+ PROTECTED bit NOT NULL,
+ UNIQUE CLUSTERED (REVISION_ID, PROPERTY_NAMESPACE, PROPERTY_NAME)
)
GO
-CREATE TABLE PERMISSIONS (
+CREATE TABLE SLIDE_REVISION_PERMISSION (
OBJECT_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
SUBJECT_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
+ REFERENCES SLIDE_URI (URI_ID),
ACTION_ID id_type NOT NULL FOREIGN KEY
- REFERENCES URI (URI_ID),
- VERSION_NO VARCHAR(20),
- IS_INHERITABLE bit NOT NULL,
- IS_NEGATIVE bit NOT NULL,
+ REFERENCES SLIDE_URI (URI_ID),
+ REVISION_NUMBER VARCHAR(20),
+ INHERITABLE bit NOT NULL,
+ NEGATIVE bit NOT NULL,
UNIQUE CLUSTERED (OBJECT_ID, SUBJECT_ID, ACTION_ID)
)
GO
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>