mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-08-29 08:17:18 +08:00
Squashed 'public/legacy/' changes from 23d711b70..bb959a145
bb959a145 SuiteCRM 7.12.1 release changes 9ad0a7fe5 Use wildcard rather than the defunct "_all" field d9f34d544 Prevent Email Reminders - Inactive Users 72557797d Create Standardised isEnabled User Check c1f5c8c62 Fix #8432 - Remove index limit from mssql index names upon create and repair edf9ff254 Fix #9217 - Revert "Fix Users index incompatible with MSSQL" 91035782b Fix #9119 - Rebuild theme cache after custom property changed in Studio dd000459c Fix typo in word administrator 8bb65887d Fix Issue #9192: Fix duplication of folders_rel table entries. 4104e5c5c Fix #9367 - Update PDF template warning 86b04461a Fix #9358 - Meeting invite notification emails not sending to all invitees. e55657e18 Fix #6994: Update pollMonitoredInboxesAOP to check SugarFolder has been retrieved correctly. 8211f43fb Update PDF references 63d63e520 Implement PDF extension 75553a9ee Update MPDF structure 1960e8364 Fix rebuild scss git-subtree-dir: public/legacy git-subtree-split: bb959a1451f926ccf5bb7b0da1909435e5450d05
This commit is contained in:
parent
75ea167930
commit
d075ac6581
35 changed files with 350 additions and 120 deletions
|
@ -960,6 +960,10 @@ abstract class DBManager
|
|||
$value['type'] = 'index';
|
||||
}
|
||||
|
||||
if (isset($value['fields'])) {
|
||||
$value['fields'] = $this->removeIndexLimit($value['fields']);
|
||||
}
|
||||
|
||||
if (!isset($compareIndices[$name])) {
|
||||
//First check if an index exists that doesn't match our name, if so, try to rename it
|
||||
$found = false;
|
||||
|
@ -4114,4 +4118,13 @@ abstract class DBManager
|
|||
{
|
||||
return trim(str_replace(array("\r", "\n"), " ", $sql));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $fields
|
||||
* @return string|string[]|null
|
||||
*/
|
||||
protected function removeIndexLimit($fields)
|
||||
{
|
||||
return $fields;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1492,6 +1492,9 @@ EOSQL;
|
|||
{
|
||||
$type = $definition['type'];
|
||||
$fields = is_array($definition['fields']) ? implode(',', $definition['fields']) : $definition['fields'];
|
||||
|
||||
$fields = $this->removeIndexLimit($fields);
|
||||
|
||||
$name = $definition['name'];
|
||||
$sql = '';
|
||||
|
||||
|
@ -2129,4 +2132,14 @@ EOQ;
|
|||
{
|
||||
return 'NEWID()';
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove unsupported index limit
|
||||
* @param $fields
|
||||
* @return string|string[]|null
|
||||
*/
|
||||
protected function removeIndexLimit($fields)
|
||||
{
|
||||
return preg_replace('/(\s?\(\d+\))/', '', $fields);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue