parent
08c4df9ecc
commit
3c02f7499f
|
@ -17,6 +17,9 @@ before switching to a new version.
|
||||||
* FIX: Custom Fields attached to a Service Template have not been shown for Apply
|
* FIX: Custom Fields attached to a Service Template have not been shown for Apply
|
||||||
Rules whose name matched the Template Name (#1602)
|
Rules whose name matched the Template Name (#1602)
|
||||||
|
|
||||||
|
### Import and Sync
|
||||||
|
* FIX: There was an issue with specific binary checksums on MySQL (#1556)
|
||||||
|
|
||||||
1.5.0
|
1.5.0
|
||||||
-----
|
-----
|
||||||
### Fixed issues
|
### Fixed issues
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Icinga\Module\Director\Objects;
|
namespace Icinga\Module\Director\Objects;
|
||||||
|
|
||||||
use Icinga\Module\Director\Data\Db\DbObject;
|
use Icinga\Module\Director\Data\Db\DbObject;
|
||||||
|
use Icinga\Module\Director\Db;
|
||||||
|
|
||||||
class ImportRun extends DbObject
|
class ImportRun extends DbObject
|
||||||
{
|
{
|
||||||
|
@ -63,6 +64,8 @@ class ImportRun extends DbObject
|
||||||
public function fetchRows($columns, $filter = null, $keys = null)
|
public function fetchRows($columns, $filter = null, $keys = null)
|
||||||
{
|
{
|
||||||
$db = $this->getDb();
|
$db = $this->getDb();
|
||||||
|
/** @var Db $connection */
|
||||||
|
$connection = $this->getConnection();
|
||||||
$binchecksum = $this->rowset_checksum;
|
$binchecksum = $this->rowset_checksum;
|
||||||
|
|
||||||
$query = $db->select()->from(
|
$query = $db->select()->from(
|
||||||
|
@ -85,7 +88,17 @@ class ImportRun extends DbObject
|
||||||
array('p' => 'imported_property'),
|
array('p' => 'imported_property'),
|
||||||
'p.checksum = rp.property_checksum',
|
'p.checksum = rp.property_checksum',
|
||||||
array()
|
array()
|
||||||
)->where('rsr.rowset_checksum = ?', $this->getConnection()->quoteBinary($binchecksum))->order('r.object_name');
|
)->order('r.object_name');
|
||||||
|
if ($connection->isMysql()) {
|
||||||
|
$query->where('rsr.rowset_checksum = :checksum')->bind([
|
||||||
|
'checksum' => $binchecksum
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
$query->where(
|
||||||
|
'rsr.rowset_checksum = ?',
|
||||||
|
$connection->quoteBinary($binchecksum)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if ($columns === null) {
|
if ($columns === null) {
|
||||||
$columns = $this->listColumnNames();
|
$columns = $this->listColumnNames();
|
||||||
|
|
Loading…
Reference in New Issue