tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Import: various fixes for PostgreSQL 

refs #11315
This commit is contained in:
Thomas Gelf 2016-03-05 20:01:31 +01:00
parent 5268db6a61
commit 9ede46f839
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/Director/Db.php
View File

@ -306,7 +306,7 @@ class Db extends DbConnection
{
$db = $this->db();
$query = $db->select()
->from('import_run', 'rowset_checksum')
->from('import_run', $this->dbHexFunc('rowset_checksum'))
->where('id = ?', $id);
return $db->fetchOne($query);
@ -381,7 +381,10 @@ class Db extends DbConnection
}
}
$lastRun = $db->select()->from('import_run', array('rowset_checksum'));
$lastRun = $db->select()->from(
'import_run',
array('checksum' => $this->dbHexFunc('rowset_checksum'))
);
if (is_int($source) || ctype_digit($source)) {
$lastRun->where('source_id = ?', $source);
@ -391,7 +394,6 @@ class Db extends DbConnection
$lastRun->order('start_time DESC')->limit(1);
$checksum = $db->fetchOne($lastRun);
// TODO: Postgres decoding?
return $this->fetchImportedRowsetRows($checksum, $columns);
}
@ -399,6 +401,8 @@ class Db extends DbConnection
public function fetchImportedRowsetRows($checksum, $columns)
{
$db = $this->db();
$binchecksum = Util::hex2binary($checksum);
$query = $db->select()->from(
array('rsr' => 'imported_rowset_row'),
array(
@ -419,7 +423,7 @@ class Db extends DbConnection
array('p' => 'imported_property'),
'p.checksum = rp.property_checksum',
array()
)->where('rsr.rowset_checksum = ?', $checksum)->order('r.object_name');
)->where('rsr.rowset_checksum = ?', $this->quoteBinary($binchecksum))->order('r.object_name');
if ($columns === null) {
$columns = $this->listImportedRowsetColumnNames($checksum);
@ -528,7 +532,7 @@ class Db extends DbConnection
array('rsr' => 'imported_rowset_row'),
'rsr.row_checksum = rp.row_checksum',
array()
)->where('rsr.rowset_checksum = ?', $checksum);
)->where('rsr.rowset_checksum = ?', $this->quoteBinary(Util::hex2binary($checksum)));
return $db->fetchCol($query);
}
@ -701,7 +705,7 @@ class Db extends DbConnection
return $this->getDbType() === 'pgsql';
}
protected function dbHexFunc($column)
public function dbHexFunc($column)
{
if ($this->isPgsql()) {
return sprintf("LOWER(ENCODE(%s, 'hex'))", $column);
@ -710,10 +714,10 @@ class Db extends DbConnection
}
}
protected function quoteBinary($binary)
public function quoteBinary($binary)
{
if ($this->isPgsql()) {
return new Zend_Db_Expr("\\x" . bin2hex($binary));
return new Zend_Db_Expr("'\\x" . bin2hex($binary) . "'");
}
return $binary;

31
library/Director/Import/Import.php
View File

@ -100,13 +100,16 @@ class Import
'import_run',
array(
'source_id' => $this->source->id,
'rowset_checksum' => $this->rowsetChecksum(),
'rowset_checksum' => $this->quoteBinary($this->rowsetChecksum()),
'start_time' => date('Y-m-d H:i:s'),
'succeeded' => 'y'
)
);
return $this->db->lastInsertId();
if ($this->connection->isPgsql()) {
return $this->db->lastInsertId('import_run', 'id');
} else {
return $this->db->lastInsertId();
}
}
/**
@ -207,7 +210,7 @@ class Import
if (! array_key_exists($checksum, $this->properties)) {
$this->properties[$checksum] = array(
'checksum' => $checksum,
'checksum' => $this->quoteBinary($checksum),
'property_name' => $key,
'property_value' => $value,
'format' => $format
@ -290,7 +293,7 @@ class Import
}
$this->rows[$checksum] = array(
'checksum' => $checksum,
'checksum' => $this->quoteBinary($checksum),
'object_name' => $object_name
);
@ -323,7 +326,7 @@ class Import
$newProperties = $this->newChecksums('imported_property', array_keys($this->properties));
}
$db->insert('imported_rowset', array('checksum' => $rowset));
$db->insert('imported_rowset', array('checksum' => $this->quoteBinary($rowset)));
foreach ($newProperties as $checksum) {
$db->insert('imported_property', $this->properties[$checksum]);
@ -333,7 +336,7 @@ class Import
$db->insert('imported_row', $rows[$row]);
foreach ($this->rowProperties[$row] as $property) {
$db->insert('imported_row_property', array(
'row_checksum' => $row,
'row_checksum' => $this->quoteBinary($row),
'property_checksum' => $property
));
}
@ -343,8 +346,8 @@ class Import
$db->insert(
'imported_rowset_row',
array(
'rowset_checksum' => $rowset,
'row_checksum' => $row
'rowset_checksum' => $this->quoteBinary($rowset),
'row_checksum' => $this->quoteBinary($row)
)
);
}
@ -414,7 +417,10 @@ class Import
$query = $db
->select()
->from($table, 'checksum')
->where('LOWER(HEX(checksum)) IN (?)', $hexed);
->where(
$this->connection->dbHexFunc('checksum') . ' IN (?)',
$hexed
);
$existing = $db->fetchCol($query);
@ -458,4 +464,9 @@ class Import
$el = $this->sortObject($el);
}
}
protected function quoteBinary($bin)
{
return $this->connection->quoteBinary($bin);
}
}