projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17943 from jitendrapurohit/core-1906
[civicrm-core.git]
/
CRM
/
Utils
/
SQL
/
TempTable.php
diff --git
a/CRM/Utils/SQL/TempTable.php
b/CRM/Utils/SQL/TempTable.php
index da507cbcc2158c08744614adba839f4a39c68062..f0024d7ef79a5a15728fa8b35687061d04ca5c3b 100644
(file)
--- a/
CRM/Utils/SQL/TempTable.php
+++ b/
CRM/Utils/SQL/TempTable.php
@@
-13,7
+13,6
@@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
- *
* Table naming rules:
* - MySQL imposes a 64 char limit.
* - All temp tables start with "civicrm_tmp".
* Table naming rules:
* - MySQL imposes a 64 char limit.
* - All temp tables start with "civicrm_tmp".
@@
-149,8
+148,7
@@
class CRM_Utils_SQL_TempTable {
return '';
}
$dbUTF = CRM_Core_BAO_SchemaHandler::getDBCollation();
return '';
}
$dbUTF = CRM_Core_BAO_SchemaHandler::getDBCollation();
- if (in_array($dbUTF, ['utf8_unicode_ci', 'utf8mb4_unicode_ci'])
- && in_array($dbUTF, ['utf8', 'utf8mb4'])) {
+ if (strpos($dbUTF, 'utf8') !== FALSE) {
return '';
}
return self::UTF8;
return '';
}
return self::UTF8;
@@
-169,7
+167,7
@@
class CRM_Utils_SQL_TempTable {
$this->toSQL('CREATE'),
$columns,
$this->memory ? self::MEMORY : self::INNODB,
$this->toSQL('CREATE'),
$columns,
$this->memory ? self::MEMORY : self::INNODB,
- $this->
utf8 ? self::UTF8 : ''
+ $this->
getUtf8String()
);
CRM_Core_DAO::executeQuery($sql, [], TRUE, NULL, TRUE, FALSE);
$this->createSql = $sql;
);
CRM_Core_DAO::executeQuery($sql, [], TRUE, NULL, TRUE, FALSE);
$this->createSql = $sql;
@@
-275,7
+273,7
@@
class CRM_Utils_SQL_TempTable {
*/
public function setCategory($category) {
if ($category && !preg_match(self::CATEGORY_REGEXP, $category) || strlen($category) > self::CATEGORY_LENGTH) {
*/
public function setCategory($category) {
if ($category && !preg_match(self::CATEGORY_REGEXP, $category) || strlen($category) > self::CATEGORY_LENGTH) {
- throw new \RuntimeException("Malformed temp table category");
+ throw new \RuntimeException("Malformed temp table category
$category
");
}
$this->category = $category;
return $this;
}
$this->category = $category;
return $this;