diff --git a/resources/sql/autopatches/20210315.affectedpath.01.epoch.sql b/resources/sql/autopatches/20210315.affectedpath.01.epoch.sql new file mode 100644 --- /dev/null +++ b/resources/sql/autopatches/20210315.affectedpath.01.epoch.sql @@ -0,0 +1,2 @@ +ALTER TABLE {$NAMESPACE}_differential.differential_affectedpath + DROP epoch; diff --git a/resources/sql/autopatches/20210315.affectedpath.02.repositoryid.sql b/resources/sql/autopatches/20210315.affectedpath.02.repositoryid.sql new file mode 100644 --- /dev/null +++ b/resources/sql/autopatches/20210315.affectedpath.02.repositoryid.sql @@ -0,0 +1,2 @@ +ALTER TABLE {$NAMESPACE}_differential.differential_affectedpath + CHANGE repositoryID repositoryID INT UNSIGNED; diff --git a/src/applications/differential/engine/DifferentialAffectedPathEngine.php b/src/applications/differential/engine/DifferentialAffectedPathEngine.php --- a/src/applications/differential/engine/DifferentialAffectedPathEngine.php +++ b/src/applications/differential/engine/DifferentialAffectedPathEngine.php @@ -32,7 +32,7 @@ if ($repository) { $repository_id = $repository->getID(); } else { - return; + $repository_id = null; } $paths = $this->getAffectedPaths(); @@ -48,10 +48,9 @@ foreach ($path_ids as $path_id) { $sql[] = qsprintf( $conn, - '(%d, %d, %d, %d)', + '(%nd, %d, %d)', $repository_id, $path_id, - PhabricatorTime::getNow(), $revision->getID()); } @@ -64,7 +63,7 @@ foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) { queryfx( $conn, - 'INSERT INTO %R (repositoryID, pathID, epoch, revisionID) VALUES %LQ', + 'INSERT INTO %R (repositoryID, pathID, revisionID) VALUES %LQ', $table, $chunk); } diff --git a/src/applications/differential/storage/DifferentialAffectedPath.php b/src/applications/differential/storage/DifferentialAffectedPath.php --- a/src/applications/differential/storage/DifferentialAffectedPath.php +++ b/src/applications/differential/storage/DifferentialAffectedPath.php @@ -8,7 +8,6 @@ protected $repositoryID; protected $pathID; - protected $epoch; protected $revisionID; protected function getConfiguration() { @@ -16,15 +15,16 @@ self::CONFIG_TIMESTAMPS => false, self::CONFIG_COLUMN_SCHEMA => array( 'id' => null, + 'repositoryID' => 'id?', ), self::CONFIG_KEY_SCHEMA => array( 'PRIMARY' => null, - 'repositoryID' => array( - 'columns' => array('repositoryID', 'pathID', 'epoch'), - ), 'revisionID' => array( 'columns' => array('revisionID'), ), + 'key_path' => array( + 'columns' => array('pathID', 'repositoryID'), + ), ), ) + parent::getConfiguration(); }