use hash(), set PrimaryKey after the hashing

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

3 files changed, 130 insertions, 9 deletions

diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index f02bb188..d6b25953 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -113,7 +113,6 @@ class CoreRequestBuilder {
 	 */
 	public function generatePrimaryKey(IQueryBuilder $qb, string $id) {
 		$qb->setValue('id_prim', $qb->createNamedParameter(hash('sha512', $id)));
-		$this->miscService->log('__' . hash('sha512', 'toto'));
 	}
 
 
diff --git a/lib/Migration/Version0002Date20190305091901.php b/lib/Migration/Version0002Date20190305091901.php
index 0c585ce4..a989a67d 100644
--- a/lib/Migration/Version0002Date20190305091901.php
+++ b/lib/Migration/Version0002Date20190305091901.php
@@ -91,9 +91,10 @@ class Version0002Date20190305091901 extends SimpleMigrationStep {
 
 			$table = $schema->getTable($tableName);
 
-			$prim = $this->getPrimField($field);
-			$table->addColumn($prim, Type::STRING, ['notnull' => false, 'length' => 255]);
-			$table->setPrimaryKey([$prim]);
+			$prim = self::getPrimField($field);
+			if (!$table->hasColumn($prim)) {
+				$table->addColumn($prim, Type::STRING, ['notnull' => false, 'length' => 255]);
+			}
 		}
 
 		return $schema;
@@ -110,11 +111,30 @@ class Version0002Date20190305091901 extends SimpleMigrationStep {
 		foreach (self::$setAsKeys as $edit) {
 			list($tableName, $field) = $edit;
 
-			$prim = $this->getPrimField($field);
+			$prim = self::getPrimField($field);
 			$qb = $this->connection->getQueryBuilder();
-			$qb->update($tableName)
-			   ->set($prim, $qb->createFunction('SHA2(' . $field . ', 512)'))
-			   ->execute();
+
+			/** @noinspection PhpMethodParametersCountMismatchInspection */
+			$qb->select('t.' . $field)
+			   ->from($tableName, 't');
+
+			$cursor = $qb->execute();
+			while ($data = $cursor->fetch()) {
+				$id = $data[$field];
+				$hash = hash('sha512', $id);
+				$update = $this->connection->getQueryBuilder();
+				$update->update($tableName);
+				$update->set($prim, $update->createNamedParameter($hash));
+				$update->where(
+					$qb->expr()
+					   ->eq($field, $update->createNamedParameter($id))
+				);
+				$update->execute();
+
+				$update->execute();
+			}
+			$cursor->closeCursor();
+
 		}
 	}
 
@@ -124,8 +144,9 @@ class Version0002Date20190305091901 extends SimpleMigrationStep {
 	 *
 	 * @return string
 	 */
-	private function getPrimField(string $field): string {
+	public static function getPrimField(string $field): string {
 		return $field . '_prim';
 	}
+
 }
 
diff --git a/lib/Migration/Version0002Date20190305091902.php b/lib/Migration/Version0002Date20190305091902.php
new file mode 100644
index 00000000..69f720f4
--- /dev/null
+++ b/lib/Migration/Version0002Date20190305091902.php
@@ -0,0 +1,101 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCA\Social\Db\CoreRequestBuilder;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0002Date20190305091902
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0002Date20190305091902 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		foreach (Version0002Date20190305091901::$setAsKeys as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+
+			$prim = Version0002Date20190305091901::getPrimField($field);
+			$table->setPrimaryKey([$prim]);
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+	}
+
+}
+