From 4086f222125262ee47bcca0fd1857a45b20fb41f Mon Sep 17 00:00:00 2001 From: Marcos Zuriaga Date: Sat, 15 Oct 2016 01:42:14 +0200 Subject: [PATCH] Refactored helper to use nextcloud query builder hoping this fixes the test problems with pgsql --- tests/db/DatabaseHelperTest.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/db/DatabaseHelperTest.php b/tests/db/DatabaseHelperTest.php index 0b208728..ab1ee8d7 100644 --- a/tests/db/DatabaseHelperTest.php +++ b/tests/db/DatabaseHelperTest.php @@ -68,6 +68,7 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase { */ public function setUpTable($table_name){ $table = $this->getTableDataset($table_name); + $table_no_prefix = substr($table_name, 3); // Cleanup any data currently inside the table $this->truncateTable($table_name); @@ -76,19 +77,14 @@ abstract class DatabaseHelperTest extends PHPUnit_Extensions_Database_TestCase { for ($i = 0; $i < $table->getRowCount(); $i++) { $row = $table->getRow($i); - $fields = ""; - $values = ""; + $qb = $this->db->getQueryBuilder(); + $qb->insert($table_no_prefix); + foreach ($row as $key => $value){ - $fields .= "`{$key}`, "; - $values .= is_numeric($value) ? $value : ("'{$value}'") ; - $values .= ", "; + $qb->setValue($key, is_numeric($value) ? $value : ("'{$value}'")); } - $fields = substr($fields, 0, count($fields) -3); - $values = substr($values, 0, count($values) -3); - - $q = "INSERT INTO $table_name ({$fields}) VALUES ({$values});"; - $this->db->executeQuery($q); + $qb->execute(); } }