inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
124856 cturlica: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124703 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124682 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
            124674: MNT-15211: Follow-on (note: only affects NDB)
            - use string_value 400 to enable schema bootstrap (and be consistent with existing customer pilot DBs)
            - minor tweaks to unit test cases (note: only affects NDB)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:05:21 +00:00
parent 3e5a51b778
commit 109204efbb
4 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
View File

@@ -172,6 +172,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
public static final int DEFAULT_LOCK_RETRY_WAIT_SECONDS = 5;
public static final int DEFAULT_MAX_STRING_LENGTH = 1024;
public static final int DEFAULT_MAX_STRING_LENGTH_NDB = 400;
private static volatile int maxStringLength = DEFAULT_MAX_STRING_LENGTH;
private Dialect dialect;
@@ -181,15 +182,17 @@ public class SchemaBootstrap extends AbstractLifecycleBean
/**
* @see #DEFAULT_MAX_STRING_LENGTH
*/
private static final void setMaxStringLength(int length)
private static final void setMaxStringLength(int length, Dialect dialect)
{
if (length < 1024)
int max = (dialect instanceof AlfrescoMySQLClusterNDBDialect ? DEFAULT_MAX_STRING_LENGTH_NDB : DEFAULT_MAX_STRING_LENGTH);
if (length < max)
{
throw new AlfrescoRuntimeException("The maximum string length must >= 1024 characters.");
throw new AlfrescoRuntimeException("The maximum string length must >= "+max+" characters.");
}
SchemaBootstrap.maxStringLength = length;
}
/**
* @return Returns the maximum number of characters that a string field can be
*/
@@ -1490,7 +1493,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
sql = sql.replaceAll("(?i) BIT ", " BOOLEAN ");
sql = sql.replaceAll("(?i) BIT,", " BOOLEAN,");
sql = sql.replaceAll("(?i) string_value text", " string_value VARCHAR(1024)");
sql = sql.replaceAll("(?i) string_value text", " string_value VARCHAR("+DEFAULT_MAX_STRING_LENGTH_NDB+")");
sql = sql.replaceAll("(?i) VARCHAR(4000)", "TEXT(4000)");
}
@@ -1646,18 +1649,18 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// serializable_value varbinary(8192),
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
}
else if (dialect instanceof AlfrescoMySQLClusterNDBDialect)
{
// string_value varchar(400),
// serializable_value blob,
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH_NDB;
}
else if (dialect instanceof MySQLInnoDBDialect)
{
// string_value text,
// serializable_value blob,
maxStringLength = Integer.MAX_VALUE;
}
else if (dialect instanceof AlfrescoMySQLClusterNDBDialect)
{
// string_value varchar(1024),
// serializable_value blob,
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
}
else if (dialect instanceof AlfrescoOracle9Dialect)
{
// string_value varchar2(1024 char),
@@ -1670,13 +1673,14 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// serializable_value bytea,
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
}
SchemaBootstrap.setMaxStringLength(maxStringLength);
SchemaBootstrap.setMaxStringLength(maxStringLength, dialect);
SerializableTypeHandler.setSerializableType(serializableType);
// Now override the maximum string length if it was set directly
if (maximumStringLength > 0)
{
SchemaBootstrap.setMaxStringLength(maximumStringLength);
SchemaBootstrap.setMaxStringLength(maximumStringLength, dialect);
}
}