Update Oracle migration to CDO 4.6

These are analogous to the H2 implementation, but unverified.

bundles/specmate-dbprovider-oracle/src/specmate/dbprovider/oracle/AttributeToSQLMapper.java

@@ -110,42 +110,43 @@ public void migrateNewDateAttribute(String objectName, String attributeName, Dat
 	public void migrateNewObjectReference(String objectName, String attributeName) throws SpecmateException {
 		migrateNewReference(objectName, attributeName, "NUMBER");
 	}
-	
+
 	@Override
 	public void migrateNewStringReference(String objectName, String attributeName) throws SpecmateException {
 		migrateNewReference(objectName, attributeName, "VARCHAR2(4000)");
 	}
-	
+
 	private void migrateNewReference(String objectName, String attributeName, String type) throws SpecmateException {
 		String failmsg = "Migration: Could not add column " + attributeName + " to table " + objectName + ".";
 		String tableNameList = getListTableName(objectName, attributeName);
 		List<String> queries = new ArrayList<>();
 
 		queries.add("ALTER TABLE " + objectName + " ADD " + attributeName + " NUMBER");
-		queries.add("CREATE TABLE " + tableNameList + " (" + "CDO_SOURCE NUMBER NOT NULL, "
-				+ "CDO_VERSION NUMBER NOT NULL, " + "CDO_IDX NUMBER NOT NULL, " + "CDO_VALUE " + type +")");
+		queries.add("CREATE TABLE " + tableNameList + " (" + "CDO_SOURCE VARCHAR2(255) NOT NULL, "
+				+ "CDO_BRANCH NUMBER NOT NULL, " + "CDO_VERSION NUMBER NOT NULL, " + "CDO_IDX NUMBER NOT NULL, "
+				+ "CDO_VALUE " + type + ")");
 		queries.add("CREATE UNIQUE INDEX " + SQLUtil.createTimebasedIdentifier("PK", OracleProviderConfig.MAX_ID_LENGTH)
-				+ " ON " + tableNameList + " (CDO_SOURCE ASC, CDO_VERSION ASC, CDO_IDX ASC)");
+				+ " ON " + tableNameList + " (CDO_SOURCE ASC, CDO_BRANCH ASC, CDO_VERSION ASC, CDO_IDX ASC)");
 		queries.add("ALTER TABLE " + tableNameList + " ADD CONSTRAINT "
 				+ SQLUtil.createTimebasedIdentifier("C", OracleProviderConfig.MAX_ID_LENGTH)
-				+ " PRIMARY KEY (CDO_SOURCE, CDO_VERSION, CDO_IDX)");
+				+ " PRIMARY KEY (CDO_SOURCE, CDO_BRANCH, CDO_VERSION, CDO_IDX)");
 		queries.add(insertExternalAttributeReference(objectName, attributeName));
 		SQLUtil.executeStatements(queries, connection, failmsg);
 	}
-	
-	private String getListTableName(String objectName, String attributeName) throws SpecmateException{
+
+	private String getListTableName(String objectName, String attributeName) throws SpecmateException {
 		String firstShot = objectName + "_" + attributeName + "_LIST";
-		if(firstShot.length()<=ORACLE_MAX_TABLE_NAME_LENGTH){
+		if (firstShot.length() <= ORACLE_MAX_TABLE_NAME_LENGTH) {
 			return firstShot;
-		} 
+		}
 		int id = Math.abs(getLatestId());
 		id++;
 		String idStr = Integer.toString(id);
-		String suffix = "_FLS"+idStr;
-		if(suffix.length()>attributeName.length()){
+		String suffix = "_FLS" + idStr;
+		if (suffix.length() > attributeName.length()) {
 			throw new SpecmateException("Could not shorten list table name for attribute " + attributeName);
 		}
-		String tableName = firstShot.substring(0,ORACLE_MAX_TABLE_NAME_LENGTH-suffix.length()) + suffix;
+		String tableName = firstShot.substring(0, ORACLE_MAX_TABLE_NAME_LENGTH - suffix.length()) + suffix;
 		return tableName;
 	}
 

bundles/specmate-dbprovider-oracle/src/specmate/dbprovider/oracle/ObjectToSQLMapper.java

@@ -22,16 +22,17 @@ public void newObject(String tableName) throws SpecmateException {
 		String failmsg = "Migration: Could not add table " + tableName + ".";
 		List<String> queries = new ArrayList<>();
 
-		queries.add("CREATE TABLE " + tableName + "(" + "CDO_ID NUMBER NOT NULL, " + "CDO_VERSION NUMBER NOT NULL, "
-				+ "CDO_CREATED NUMBER NOT NULL, " + "CDO_REVISED NUMBER NOT NULL, " + "CDO_RESOURCE NUMBER NOT NULL, "
-				+ "CDO_CONTAINER NUMBER NOT NULL, " + "CDO_FEATURE NUMBER NOT NULL)");
+		queries.add("CREATE TABLE " + tableName + "(" + "CDO_ID VARCHAR2(255) NOT NULL, "
+				+ "CDO_VERSION NUMBER NOT NULL, " + "CDO_BRANCH NUMBER NOT NULL, " + "CDO_CREATED NUMBER NOT NULL, "
+				+ "CDO_REVISED NUMBER NOT NULL, " + "CDO_RESOURCE VARCHAR2(255) NOT NULL, "
+				+ "CDO_CONTAINER VARCHAR2(255) NOT NULL, " + "CDO_FEATURE NUMBER NOT NULL)");
 		queries.add("CREATE UNIQUE INDEX " + SQLUtil.createTimebasedIdentifier("PK", OracleProviderConfig.MAX_ID_LENGTH)
-				+ " ON " + tableName + " (CDO_ID ASC, CDO_VERSION ASC)");
+				+ " ON " + tableName + " (CDO_ID ASC, CDO_VERSION ASC, CDO_BRANCH ASC)");
 		queries.add("CREATE INDEX " + SQLUtil.createTimebasedIdentifier("I", OracleProviderConfig.MAX_ID_LENGTH)
 				+ " ON " + tableName + " (CDO_REVISED ASC)");
 		queries.add("ALTER TABLE " + tableName + " ADD CONSTRAINT "
 				+ SQLUtil.createTimebasedIdentifier("C", OracleProviderConfig.MAX_ID_LENGTH)
-				+ " PRIMARY KEY (CDO_ID, CDO_VERSION)");
+				+ " PRIMARY KEY (CDO_ID, CDO_VERSION, CDO_BRANCH)");
 		SQLUtil.executeStatements(queries, connection, failmsg);
 	}