diff options
author | Joas Schilling <coding@schilljs.com> | 2017-03-26 18:11:57 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2017-04-06 11:01:15 +0300 |
commit | ea34f3bbbdd51c914dd79ab5cf00fd739b23418b (patch) | |
tree | bda206ae9e3361a071193ab0427e0c3ff8bd45da /core | |
parent | 392610e3c6dd45de73790047d3151a309d72b1da (diff) |
Make sure blob columns are correctly converted as parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/Command/Db/ConvertType.php | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index a8969251bab..5bb43400d61 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -28,6 +28,7 @@ namespace OC\Core\Command\Db; +use OCP\DB\QueryBuilder\IQueryBuilder; use \OCP\IConfig; use OC\DB\Connection; use OC\DB\ConnectionFactory; @@ -54,6 +55,9 @@ class ConvertType extends Command implements CompletionAwareInterface { */ protected $connectionFactory; + /** @var array */ + protected $columnTypes; + /** * @param \OCP\IConfig $config * @param \OC\DB\ConnectionFactory $connectionFactory @@ -304,7 +308,7 @@ class ConvertType extends Command implements CompletionAwareInterface { } foreach ($row as $key => $value) { - $insertQuery->setParameter($key, $value); + $insertQuery->setParameter($key, $value, $this->getColumnType($table, $key)); } $insertQuery->execute(); } @@ -313,6 +317,25 @@ class ConvertType extends Command implements CompletionAwareInterface { $progress->finish(); } + protected function getColumnType($table, $column) { + if (isset($this->columnTypes[$table][$column])) { + return $this->columnTypes[$table][$column]; + } + + $prefix = $this->config->getSystemValue('dbtableprefix', 'oc_'); + $this->columnTypes[$table][$column] = null; + if ($table === $prefix . 'cards' && $column === 'carddata') { + $this->columnTypes[$table][$column] = IQueryBuilder::PARAM_LOB; + } else if ($column === 'calendardata') { + if ($table === $prefix . 'calendarobjects' || + $table === $prefix . 'schedulingobjects') { + $this->columnTypes[$table][$column] = IQueryBuilder::PARAM_LOB; + } + } + + return $this->columnTypes[$table][$column]; + } + protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) { $this->config->setSystemValue('maintenance', true); try { |