diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index c8b1014713..8e19af941c 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -45,6 +45,9 @@
+
+
-
+
patch.db-V2.1-AuditPathIndex
patch.schemaUpgradeScript.description
0
132
133
-
- classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-AuditPathIndex.sql
-
@@ -2264,6 +2261,7 @@
@@ -2465,5 +2463,27 @@
true
-
+
+
+ patch.db-V3.2-AddFKIndexes-2
+ patch.schemaUpgradeScript.description
+ 0
+ 4111
+ 4112
+
+ classpath:alfresco/dbscripts/upgrade/3.2/${db.script.dialect}/AlfrescoSchemaUpdate-3.2-AddFKIndexes-2.sql
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 8b3e61bddd..6090d71b50 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
-version.schema=4111
+version.schema=4113
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/DuplicateEntry.java b/source/java/org/alfresco/repo/admin/patch/impl/DuplicateEntry.java
new file mode 100644
index 0000000000..56bf1790d6
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/DuplicateEntry.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+/**
+ * Wrapper for duplicate entries
+ *
+ * @author Dmitry Velichkevich
+ */
+public class DuplicateEntry
+{
+ private static final int ODD_MULTIPLICATOR = 37;
+
+ private Long id;
+
+ private Long parentId;
+
+ private String name;
+
+ private Long amount;
+
+ public DuplicateEntry()
+ {
+ }
+
+ public DuplicateEntry(Long id, Long parentId, String name, Long amount)
+ {
+ this.id = id;
+ this.parentId = parentId;
+ this.name = name;
+ this.amount = amount;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getParentId()
+ {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public Long getAmount()
+ {
+ return amount;
+ }
+
+ public void setAmount(Long amount)
+ {
+ this.amount = amount;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof DuplicateEntry))
+ {
+ return false;
+ }
+ DuplicateEntry converted = (DuplicateEntry) obj;
+ return (id == converted.getId()) && (parentId == converted.getParentId()) && ((null == name) ? (null == converted.getName()) : (name.equals(converted.getName())));
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = (int) id.intValue();
+ result = DuplicateEntry.ODD_MULTIPLICATOR * result + (int) parentId.longValue();
+ result = DuplicateEntry.ODD_MULTIPLICATOR * result + (int) amount.longValue();
+ result = DuplicateEntry.ODD_MULTIPLICATOR * result + ((null != name) ? (name.hashCode()) : (0));
+ return result;
+ }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/EliminateDuplicatesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/EliminateDuplicatesPatch.java
new file mode 100644
index 0000000000..19a74ee29b
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/EliminateDuplicatesPatch.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.avm.AVMDAOs;
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMNodeType;
+import org.alfresco.util.GUID;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.orm.ibatis.SqlMapClientTemplate;
+
+/**
+ * ALF-4203
+ *
+ * This patch searches for AVM Node duplicates resulting from case insensitivity issues on
+ * earlier versions of the software (see ALF-1940) and eliminates them by changing the name
+ * of duplicates to make them unique. This is achieved by appending a unique suffix to
+ * duplicate node names.
+ *
+ * @author Dmitry Velichkevich
+ */
+public class EliminateDuplicatesPatch extends AbstractPatch
+{
+ private Log LOGGER = LogFactory.getLog(EliminateDuplicatesPatch.class);
+
+ private static final String RENAMED_MARK_KEY = "renamed.duplicate.mark";
+
+ private static final char EXTENSION_DELIMITER = '.';
+
+ private static final char TOKENS_DELIMITER = '-';
+
+ /**
+ * Internationalized mark to indicate renamed duplicate
+ */
+ private String renamedMark;
+
+ /**
+ * Temporary extension for renamed duplicates. May be 'not set'
+ */
+ private String temporaryExtension;
+
+ private AvmDuplicatesIBatisDao helper;
+
+ public EliminateDuplicatesPatch()
+ {
+ helper = new AvmDuplicatesIBatisDao();
+ }
+
+ public String getRenamedMark()
+ {
+ if (null == renamedMark)
+ {
+ String mark = I18NUtil.getMessage(RENAMED_MARK_KEY);
+ StringBuilder markBuilder = new StringBuilder().append(TOKENS_DELIMITER);
+ renamedMark = markBuilder.append(mark).append(TOKENS_DELIMITER).toString();
+ }
+ return renamedMark;
+ }
+
+ public void setTemporaryExtension(String temporaryExtension)
+ {
+ this.temporaryExtension = temporaryExtension;
+ }
+
+ public void setTemplate(SqlMapClientTemplate template)
+ {
+ helper.setTemplate(template);
+ }
+
+ @Override
+ protected String applyInternal() throws Exception
+ {
+ int totalRenamed = 0;
+ int duplicateGroupsAmount = 0;
+
+ // Receiving duplicates
+ List duplicates = helper.getDuplicates();
+ Iterator duplicatesIterator = duplicates.iterator();
+ DuplicateEntry duplicate = null;
+
+ // duplicates contains all the duplicates found ordered by parent_id, lower(name), child_id.
+ // Within this ordered list there are groups of duplicates (in which the parent_id and lower(name)
+ // are the same but the child_id varies). A duplicate group, by definition, must have two or more entries.
+ while (duplicatesIterator.hasNext() && (null != (duplicate = duplicatesIterator.next())))
+ {
+ // Increasing duplicate groups amount
+ duplicateGroupsAmount++;
+ int renamed = 0;
+
+ // First element of the duplicates group will be left with its current name. Marking first element of current group as marked
+ int processed = 1;
+
+ // amount is the number of duplicates in the current duplicate group
+ long amount = duplicate.getAmount();
+
+ // While we have duplicates and we are still within a duplicates group
+ // amount = the number of duplicates with the same parent and lowercase name
+ // processed = the number of duplicates in the current duplicates group that have been processed
+ while (duplicatesIterator.hasNext() && (amount > processed))
+ {
+ // Skipping first element from each group to leave at least one Node with initial name
+ duplicate = duplicatesIterator.next();
+ processed++;
+
+ String newName = generatePatchedName(duplicate);
+ boolean renamingResult = helper.renameNode(new DuplicateEntry(duplicate.getId(), duplicate.getParentId(), newName, 1L));
+ if (LOGGER.isDebugEnabled())
+ {
+ LOGGER.debug("Trying to rename Node with id = '" + duplicate.getId() + "' and parent id = '"
+ + duplicate.getParentId() + "' from '" + duplicate.getName() + "' to '" + newName + "'. Result: "
+ + renamingResult);
+ }
+ if (renamingResult)
+ {
+ renamed++;
+ totalRenamed++;
+ }
+ }
+
+ // Entries finished or another group reached
+ if (LOGGER.isDebugEnabled())
+ {
+ LOGGER.debug("Duplicates for '" + duplicate.getName().toLowerCase() + "' name and parentId='" + duplicate.getParentId() + "': " + duplicate.getAmount()
+ + ". Renamed: " + renamed);
+ }
+ }
+
+ StringBuilder result = new StringBuilder();
+ result.append(duplicateGroupsAmount).append(" duplicate group(s) were found\n");
+ result.append(duplicates.size()).append(" affected node entries\n");
+ result.append("----------------\nTotal renamed: ").append(totalRenamed).append('\n');
+ return result.toString();
+ }
+
+ /**
+ * With help of {@link GUID} utility class this method generates unique and internationalized name for some Node. Also returned name will be finished with
+ * {@link EliminateDuplicatesPatch#temporaryExtension} extension if it is not empty or null
+ *
+ * @param node - {@link DuplicateEntry} instance which contains required old name and Node id
+ * @return {@link String} value which represents unique and internationalized name generated from the duplicated one
+ */
+ private String generatePatchedName(DuplicateEntry node)
+ {
+ StringBuilder result = new StringBuilder();
+ StringBuilder extension = new StringBuilder();
+ AVMNode avmNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(node.getId());
+ String oldName = node.getName();
+ if (((AVMNodeType.LAYERED_FILE == avmNode.getType()) || (AVMNodeType.PLAIN_FILE == avmNode.getType())))
+ {
+ int dotPosition = oldName.indexOf(EXTENSION_DELIMITER);
+ if (-1 != dotPosition)
+ {
+ extension.append(oldName.substring(dotPosition));
+ oldName = oldName.substring(0, dotPosition);
+ }
+ if ((null != temporaryExtension) && (temporaryExtension.length() > 0))
+ {
+ extension.append(EXTENSION_DELIMITER).append(temporaryExtension);
+ }
+ }
+ result.append(oldName).append(getRenamedMark()).append(GUID.generate()).append(extension.toString());
+ return result.toString();
+ }
+
+ /**
+ * iBatis helper which introduces functionality for duplicates of some node receiving and renaming in avm_child_entries table
+ *
+ * @author Dmitry Velichkevich
+ */
+ private class AvmDuplicatesIBatisDao
+ {
+ private static final String QUERY_SELECT_DUPLICATES_ID = "alfresco.patch.select_AvmNodeDuplicates";
+
+ private static final String QUERY_RENAME_NODE_ID = "alfresco.patch.update_AvmNodeNameById";
+
+ private SqlMapClientTemplate template;
+
+ public void setTemplate(SqlMapClientTemplate template)
+ {
+ this.template = template;
+ }
+
+ /**
+ * Receives all duplicates found in some repository
+ *
+ * @return {@link List}<{@link DuplicateEntry}> list which contains all received duplicates wrapped into the {@link DuplicateEntry}
+ */
+ @SuppressWarnings("unchecked")
+ public List getDuplicates()
+ {
+ return template.queryForList(QUERY_SELECT_DUPLICATES_ID);
+ }
+
+ /**
+ * Renames some child which is duplicate for some other Node(s) in some Space
+ *
+ * @param renamedEntry - {@link DuplicateEntry} instance which specifies Id and new name for Node
+ * @return {@link Boolean} value which equals to true if renaming update has been finished successfully
+ */
+ public boolean renameNode(DuplicateEntry renamedEntry)
+ {
+ return template.update(QUERY_RENAME_NODE_ID, renamedEntry) > 0;
+ }
+ }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateAttrAVMLocksPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateAttrAVMLocksPatch.java
index 115ab49ef7..dadca1baf9 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/MigrateAttrAVMLocksPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateAttrAVMLocksPatch.java
@@ -92,27 +92,30 @@ public class MigrateAttrAVMLocksPatch extends AbstractPatch
Map result = (Map)valueObject;
String wpStoreId = (String)result.get("wpStoreId");
- String relPath = (String)result.get("relPath");
+ String path = (String)result.get("relPath");
String avmStore = (String)result.get("avmStore");
String lockOwner = (String)result.get("owner1");
- relPath = AVMLockingServiceImpl.normalizePath(relPath);
+ String relPath = AVMLockingServiceImpl.normalizePath(path);
HashMap lockData = new HashMap(2);
lockData.put(AVMLockingServiceImpl.KEY_LOCK_OWNER, lockOwner);
lockData.put(WCMUtil.LOCK_KEY_STORE_NAME, avmStore);
-
- attributeService.createAttribute(
- lockData,
- AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath);
-
- if (logger.isTraceEnabled())
+
+ if (!attributeService.exists(AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath))
{
- logger.trace("Set AVM Lock attr [wpStoreId="+wpStoreId+", relPath="+relPath+", lockOwner="+lockOwner+", avmStore="+avmStore+"]");
+ attributeService.createAttribute(lockData, AVMLockingServiceImpl.KEY_AVM_LOCKS, wpStoreId, relPath);
+ if (logger.isTraceEnabled())
+ {
+ logger.trace("Set AVM Lock attr [wpStoreId=" + wpStoreId + ", relPath=" + relPath + ", lockOwner=" + lockOwner + ", avmStore=" + avmStore + "]");
+ }
+ total++;
}
-
- total++;
-
+ else
+ {
+ logger.warn("'" + path + "' path has duplicates in normalized form. AVM lock unique attribute creation has been skipped");
+ }
+
if (logger.isDebugEnabled() && (total == 0 || (total % 1000 == 0) ))
{
logger.debug(" Handled " + total + " AVM Lock attributes");
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 3adca88875..ab85bc1350 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -39,6 +39,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import javax.sql.DataSource;
+
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.ibatis.SerializableTypeHandlerCallback;
import org.alfresco.repo.admin.patch.Patch;
@@ -48,11 +50,7 @@ import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect;
import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect;
import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect;
-import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.service.descriptor.Descriptor;
-import org.alfresco.service.descriptor.DescriptorService;
-import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.LogUtil;
import org.alfresco.util.TempFileProvider;
import org.alfresco.util.schemadump.Main;
@@ -78,7 +76,6 @@ import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.engine.ActionQueue;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.core.io.Resource;
@@ -194,6 +191,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
private static Log logger = LogFactory.getLog(SchemaBootstrap.class);
+ private DataSource dataSource;
private LocalSessionFactoryBean localSessionFactory;
private String schemaOuputFilename;
private boolean updateSchema;
@@ -222,6 +220,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean
globalProperties = new Properties();
}
+ public void setDataSource(DataSource dataSource)
+ {
+ this.dataSource = dataSource;
+ }
+
public void setLocalSessionFactory(LocalSessionFactoryBean localSessionFactory)
{
this.localSessionFactory = localSessionFactory;
@@ -402,25 +405,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
this.globalProperties = globalProperties;
}
- /**
- * Helper method to generate a schema creation SQL script from the given Hibernate
- * configuration.
- */
- private static void dumpSchemaCreate(Configuration cfg, File schemaOutputFile)
- {
- // if the file exists, delete it
- if (schemaOutputFile.exists())
- {
- schemaOutputFile.delete();
- }
- SchemaExport schemaExport = new SchemaExport(cfg)
- .setFormat(true)
- .setHaltOnError(true)
- .setOutputFile(schemaOutputFile.getAbsolutePath())
- .setDelimiter(";");
- schemaExport.execute(false, false, false, true);
- }
-
private SessionFactory getSessionFactory()
{
return (SessionFactory) localSessionFactory.getObject();
@@ -765,9 +749,9 @@ public class SchemaBootstrap extends AbstractLifecycleBean
else
{
// Check for scripts that must have been run
- checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false);
+ checkSchemaPatchScripts(cfg, connection, validateUpdateScriptPatches, false);
// Execute any pre-auto-update scripts
- checkSchemaPatchScripts(cfg, session, connection, preUpdateScriptPatches, true);
+ checkSchemaPatchScripts(cfg, connection, preUpdateScriptPatches, true);
// Build and execute changes generated by Hibernate
File tempFile = null;
@@ -801,7 +785,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
// Execute any post-auto-update scripts
- checkSchemaPatchScripts(cfg, session, connection, postUpdateScriptPatches, true);
+ checkSchemaPatchScripts(cfg, connection, postUpdateScriptPatches, true);
}
return create;
@@ -812,7 +796,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
*/
private void checkSchemaPatchScripts(
Configuration cfg,
- Session session,
Connection connection,
List scriptPatches,
boolean apply) throws Exception
@@ -952,7 +935,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
// Dump the normalized, pre-upgrade Alfresco schema. We keep the file for later reporting.
xmlPreSchemaOutputFile = dumpSchema(
- connection,
this.dialect,
TempFileProvider.createTempFile(
"AlfrescoSchema-" + this.dialect.getClass().getSimpleName() + "-",
@@ -1351,7 +1333,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
try
{
// make sure that we AUTO-COMMIT
- connection = session.connection();
+ connection = dataSource.getConnection();
connection.setAutoCommit(true);
Configuration cfg = localSessionFactory.getConfiguration();
@@ -1424,9 +1406,9 @@ public class SchemaBootstrap extends AbstractLifecycleBean
if (! createdSchema)
{
// verify that all patches have been applied correctly
- checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false); // check scripts
- checkSchemaPatchScripts(cfg, session, connection, preUpdateScriptPatches, false); // check scripts
- checkSchemaPatchScripts(cfg, session, connection, postUpdateScriptPatches, false); // check scripts
+ checkSchemaPatchScripts(cfg, connection, validateUpdateScriptPatches, false); // check scripts
+ checkSchemaPatchScripts(cfg, connection, preUpdateScriptPatches, false); // check scripts
+ checkSchemaPatchScripts(cfg, connection, postUpdateScriptPatches, false); // check scripts
}
if (executedStatements != null)
@@ -1440,7 +1422,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
// Dump the normalized, post-upgrade Alfresco schema.
File xmlPostSchemaOutputFile = dumpSchema(
- connection,
this.dialect,
TempFileProvider.createTempFile(
"AlfrescoSchema-" + this.dialect.getClass().getSimpleName() + "-",
@@ -1479,7 +1460,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// We have been forced to stop, so we do one last dump of the schema and throw an exception to
// escape further startup procedures
File xmlStopSchemaOutputFile = dumpSchema(
- connection,
this.dialect,
TempFileProvider.createTempFile(
"AlfrescoSchema-" + this.dialect.getClass().getSimpleName() + "-",
@@ -1538,12 +1518,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean
/**
* @return Returns the file that was written to or null if it failed
*/
- private File dumpSchema(Connection connection, Dialect dialect, String fileName, String err)
+ private File dumpSchema(Dialect dialect, String fileName, String err)
{
File xmlSchemaOutputFile = new File(fileName);
try
{
- Main xmlSchemaOutputMain = new Main(connection, dialect);
+ Main xmlSchemaOutputMain = new Main(dataSource, dialect);
xmlSchemaOutputMain.execute(xmlSchemaOutputFile);
}
catch (Throwable e)
@@ -1647,94 +1627,4 @@ public class SchemaBootstrap extends AbstractLifecycleBean
return false;
}
}
-
- private static final String DIR_SCHEMAS = "schemas";
- /**
- * Dump a set of creation files for all known Hibernate dialects. These will be
- * dumped into the default temporary location in a subdirectory named schemas.
- */
- public static void main(String[] args)
- {
- int exitCode = 0;
- try
- {
- exitCode = dumpDialects(args);
- }
- catch (Throwable e)
- {
- LogUtil.error(logger, e, "SchemaBootstrap script dump failed");
- exitCode = 1;
- }
- // We can exit
- System.exit(exitCode);
- }
-
- private static int dumpDialects(String[] dialectClassNames)
- {
- if (dialectClassNames.length == 0)
- {
- System.out.println(
- "\n" +
- " ERROR: A list of fully qualified class names is required");
- return 1;
- }
- ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
- SchemaBootstrap schemaBootstrap = (SchemaBootstrap) ctx.getBean("schemaBootstrap");
- LocalSessionFactoryBean localSessionFactoryBean = schemaBootstrap.getLocalSessionFactory();
- Configuration configuration = localSessionFactoryBean.getConfiguration();
-
- ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
- DescriptorService descriptorService = serviceRegistry.getDescriptorService();
- Descriptor descriptor = descriptorService.getServerDescriptor();
-
- File tempDir = TempFileProvider.getTempDir();
- File schemasDir = new File(tempDir, DIR_SCHEMAS);
- if (!schemasDir.exists())
- {
- schemasDir.mkdir();
- }
- File dumpDir = new File(schemasDir, descriptor.getVersion());
- if (!dumpDir.exists())
- {
- dumpDir.mkdir();
- }
- for (String dialectClassName : dialectClassNames)
- {
- Class dialectClazz = null;
- try
- {
- dialectClazz = Class.forName(dialectClassName);
- }
- catch (ClassNotFoundException e)
- {
- System.out.println(
- "\n" +
- " ERROR: Class not found: " + dialectClassName);
- continue;
- }
- if (!Dialect.class.isAssignableFrom(dialectClazz))
- {
- System.out.println(
- "\n" +
- " ERROR: The class name is not a valid dialect: " + dialectClassName);
- continue;
- }
- dumpDialectScript(configuration, dialectClazz, dumpDir);
- }
- // Done
- return 0;
- }
-
- private static void dumpDialectScript(Configuration configuration, Class dialectClazz, File directory)
- {
- // Set the dialect
- configuration.setProperty("hibernate.dialect", dialectClazz.getName());
-
- // First dump the dialect's schema
- String filename = "default-schema-create-" + dialectClazz.getName() + ".sql";
- File dumpFile = new File(directory, filename);
-
- // Write the file
- SchemaBootstrap.dumpSchemaCreate(configuration, dumpFile);
- }
}
diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
index 92b5643cc5..ad0b8ee429 100644
--- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
+++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
@@ -138,6 +138,12 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
public static final QName ASSOC_ASPECT_CHILD_ASSOC = QName.createQName(NAMESPACE, "aspect-child-assoc");
public static final QName ASSOC_ASPECT_NORMAL_ASSOC = QName.createQName(NAMESPACE, "aspect-normal-assoc");
+ public static final QName ASPECT_WITH_ASSOCIATIONS_EXTRA = QName.createQName(NAMESPACE, "withAssociationsExtra");
+ public static final QName ASSOC_ASPECT_CHILD_ASSOC_01 = QName.createQName(NAMESPACE, "aspect-child-assoc-01");
+ public static final QName ASSOC_ASPECT_CHILD_ASSOC_02 = QName.createQName(NAMESPACE, "aspect-child-assoc-02");
+ public static final QName ASSOC_ASPECT_NORMAL_ASSOC_01 = QName.createQName(NAMESPACE, "aspect-normal-assoc-01");
+ public static final QName ASSOC_ASPECT_NORMAL_ASSOC_02 = QName.createQName(NAMESPACE, "aspect-normal-assoc-02");
+
public static final QName TYPE_QNAME_TEST_MULTIPLE_TESTER = QName.createQName(NAMESPACE, "multiple-tester");
public static final QName PROP_QNAME_STRING_PROP_SINGLE = QName.createQName(NAMESPACE, "stringprop-single");
public static final QName PROP_QNAME_STRING_PROP_MULTIPLE = QName.createQName(NAMESPACE, "stringprop-multiple");
@@ -790,6 +796,24 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
0, nodeService.getChildAssocs(sourceNodeRef).size());
assertEquals("Expected exactly zero target",
0, nodeService.getTargetAssocs(sourceNodeRef, RegexQNamePattern.MATCH_ALL).size());
+
+ // Force different cleanup queries:
+ // ALF-5308: SQL error when changing name for record / folder with dispostion schedule applied
+ nodeService.addAspect(sourceNodeRef, ASPECT_WITH_ASSOCIATIONS_EXTRA, null);
+ // Make the associations
+ nodeService.addChild(
+ sourceNodeRef,
+ targetNodeRef,
+ ASSOC_ASPECT_CHILD_ASSOC_01,
+ QName.createQName(NAMESPACE, "aspect-child-01"));
+ nodeService.addChild(
+ sourceNodeRef,
+ targetNodeRef,
+ ASSOC_ASPECT_CHILD_ASSOC_02,
+ QName.createQName(NAMESPACE, "aspect-child-02"));
+ nodeService.createAssociation(sourceNodeRef, targetNodeRef, ASSOC_ASPECT_NORMAL_ASSOC_01);
+ nodeService.createAssociation(sourceNodeRef, targetNodeRef, ASSOC_ASPECT_NORMAL_ASSOC_02);
+ nodeService.removeAspect(sourceNodeRef, ASPECT_WITH_ASSOCIATIONS_EXTRA);
}
/**
diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest_model.xml b/source/java/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
index a33fe8f0f1..f3c43de001 100644
--- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
+++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
@@ -380,6 +380,56 @@
+
+ Aspect with Associations
+
+
+
+ false
+ false
+
+
+ sys:base
+ true
+ true
+
+
+
+
+ false
+ false
+
+
+ sys:base
+ true
+ true
+
+
+
+
+ false
+ false
+
+
+ sys:base
+ true
+ true
+
+
+
+
+ false
+ false
+
+
+ sys:base
+ true
+ true
+
+
+
+
+
Aspect ANO1
diff --git a/source/java/org/alfresco/util/schemadump/Main.java b/source/java/org/alfresco/util/schemadump/Main.java
index e083cc54ad..243e0c8278 100644
--- a/source/java/org/alfresco/util/schemadump/Main.java
+++ b/source/java/org/alfresco/util/schemadump/Main.java
@@ -41,6 +41,7 @@ import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
+import org.alfresco.util.PropertyCheck;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.TypeNames;
@@ -67,8 +68,8 @@ public class Main
/** Should we scale down string field widths (assuming 4 bytes to one character?). */
private boolean scaleCharacters;
- /** The JDBC connection. */
- private Connection con;
+ /** The JDBC DataSource. */
+ private DataSource dataSource;
/**
* The main method.
@@ -92,15 +93,13 @@ public class Main
/**
* Creates a new instance of this tool by starting up a full context.
*/
- @SuppressWarnings("unchecked")
public Main(final String contextPath) throws Exception
{
final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]
{
"file:" + contextPath
});
- final DataSource datasource = (DataSource) context.getBean("dataSource");
- this.con = datasource.getConnection();
+ this.dataSource = (DataSource) context.getBean("dataSource");
// Use Java reflection to bypass accessibility rules and get hold of hibernate's type mapping!
final Properties hibProps = (Properties) context.getBean("hibernateConfigProperties");
@@ -116,9 +115,9 @@ public class Main
* @param connection the database connection to use for metadata queries
* @param dialect the Hibernate dialect
*/
- public Main(final Connection connection, final Dialect dialect) throws Exception
+ public Main(final DataSource dataSource, final Dialect dialect) throws Exception
{
- this.con = connection;
+ this.dataSource = dataSource;
// Initialize
init(dialect);
@@ -163,7 +162,19 @@ public class Main
*/
public void execute(File outputFile) throws Exception
{
- final NamedElementCollection result = execute();
+ PropertyCheck.mandatory(this, "dataSource", dataSource);
+ // Get a Connection
+ Connection connection = dataSource.getConnection();
+ NamedElementCollection result = null;
+ try
+ {
+ connection.setAutoCommit(false);
+ result = execute(connection);
+ }
+ finally
+ {
+ try { connection.close(); } catch (Throwable e) {}
+ }
// Set up a SAX TransformerHandler for outputting XML
final SAXTransformerFactory stf = (SAXTransformerFactory) TransformerFactory.newInstance();
@@ -190,11 +201,11 @@ public class Main
*
* @return Returns the named XML elements
*/
- public NamedElementCollection execute() throws Exception
+ private NamedElementCollection execute(Connection con) throws Exception
{
final NamedElementCollection schemaCol = new NamedElementCollection("schema", "table");
- final DatabaseMetaData dbmd = this.con.getMetaData();
+ final DatabaseMetaData dbmd = con.getMetaData();
// Assume that if there are schemas, we want the one named after the connection user or the one called "dbo" (MS
// SQL hack)
@@ -398,19 +409,6 @@ public class Main
this.elementName = elementName;
}
- /**
- * Adds an attribute.
- *
- * @param name
- * the name
- * @param value
- * the value
- */
- public void addAttribute(final String name, final String value)
- {
- this.attributes.addAttribute("", "", name, "CDATA", value);
- }
-
/**
* Adds a named element.
*