Skip to content

Commit

Permalink
Merge pull request #1086 from keboola/hotfix-config-no-rows-in-result
Browse files Browse the repository at this point in the history
Revert slow and sometimes broken query to get version
  • Loading branch information
zajca authored Jun 21, 2023
2 parents 1ebf8e0 + 6475011 commit d364710
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 74 deletions.
18 changes: 9 additions & 9 deletions tests/Common/BranchComponentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ public function testCreateFromVersionCreateRowsAndVersions(): void

// check that new config has different version identifier
$mainConfig = $components->getConfiguration($componentId, $configurationId);
$mainVersionIdentifier = $mainConfig['currentVersion']['versionIdentifier'];
// $mainVersionIdentifier = $mainConfig['currentVersion']['versionIdentifier'];
$newConfigDetail = $components->getConfiguration($componentId, $newConfig['id']);
$newConfigVuid1 = $newConfigDetail['currentVersion']['versionIdentifier'];
$this->assertNotEquals($mainVersionIdentifier, $newConfigVuid1);
// $newConfigVuid1 = $newConfigDetail['currentVersion']['versionIdentifier'];
// $this->assertNotEquals($mainVersionIdentifier, $newConfigVuid1);

$rows = $components->listConfigurationRows((new ListConfigurationRowsOptions())
->setComponentId($componentId)
Expand Down Expand Up @@ -90,12 +90,12 @@ public function testCreateFromVersionCreateRowsAndVersions(): void
$components->updateConfigurationRow($rowConfig);

$configData = $components->getConfigurationVersion($componentId, $configurationId, 2);
$newConfigVuid2 = $configData['versionIdentifier'];
$this->assertNotEquals(
$newConfigVuid1,
$newConfigVuid2,
'Updated configuration should have different version identifier'
);
// $newConfigVuid2 = $configData['versionIdentifier'];
// $this->assertNotEquals(
// $newConfigVuid1,
// $newConfigVuid2,
// 'Updated configuration should have different version identifier'
// );
$this->assertArrayHasKey('rows', $configData);
foreach ($configData['rows'] as $row) {
$this->assertArrayHasKey('configuration', $row);
Expand Down
Loading

0 comments on commit d364710

Please sign in to comment.