Skip to content

Fix bug with null values in scope #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 22, 2015
Merged

Fix bug with null values in scope #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bd43c1
Fix bug with null values in scope
adayth Dec 21, 2015
2f97ac5
Fix whitespace StyleCI issue
adayth Dec 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Model/Behavior/SequenceBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,14 @@ public function beforeSave(Event $event, Entity $entity, ArrayObject $options)
if (count($newScope) !== count($config['scope'])) {
return;
}

// Modify where clauses when NULL values are used
foreach ($newScope as $field => $value) {
if (is_null($value)) {
$newScope[$field . ' IS'] = $value;
unset($newScope[$field]);
}
}
}

$orderField = $config['order'];
Expand Down
54 changes: 54 additions & 0 deletions tests/TestCase/Model/Behavior/SequenceBehaviorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,60 @@ public function testSaveScoped()
$this->assertOrder([11, 12, 13, 14, 15], $GroupedItems, ['group_field' => 3]);
}

/**
* [testSaveNullScoped description].
*
* @return void
*/
public function testSaveNullScoped()
{
$GroupedItems = TableRegistry::get('GroupedItems', [
'table' => 'grouped_items',
'alias' => 'GroupedItems',
'className' => 'Sequence\Test\TestCase\Model\Behavior\GroupedItems',
]);

// Test group 2 (group_field = 2) as group NULL (group_field = null)
$GroupedItems->updateAll(['group_field' => null], ['group_field' => 2]);

// Testing saving a new record (order not specified) sets order to highest + 1
$entity = $GroupedItems->newEntity([
'name' => 'Item F',
'group_field' => null,
]);
$entity = $GroupedItems->save($entity);
$this->assertOrder([6, 7, 8, 9, 10, (int)$entity->id], $GroupedItems, ['group_field IS' => null]);
$this->assertOrder([1, 2, 3, 4, 5], $GroupedItems, ['group_field' => 1]);
$this->assertOrder([11, 12, 13, 14, 15], $GroupedItems, ['group_field' => 3]);

// Test saving new record with order specified
$entity = $GroupedItems->newEntity([
'name' => 'Item G',
'group_field' => null,
'position' => 3,
]);
$entity = $GroupedItems->save($entity);
$this->assertOrder([6, 7, 8, 17, 9, 10, 16], $GroupedItems, ['group_field IS' => null]);
$this->assertOrder([1, 2, 3, 4, 5], $GroupedItems, ['group_field' => 1]);
$this->assertOrder([11, 12, 13, 14, 15], $GroupedItems, ['group_field' => 3]);

// Test editing record with new order
$entity = $GroupedItems->get(4);
$entity->position = 2;
$entity = $GroupedItems->save($entity);
$this->assertOrder([1, 2, 4, 3, 5], $GroupedItems, ['group_field' => 1]);
$this->assertOrder([6, 7, 8, 17, 9, 10, 16], $GroupedItems, ['group_field IS' => null]);
$this->assertOrder([11, 12, 13, 14, 15], $GroupedItems, ['group_field' => 3]);

// Test changing group
$entity = $GroupedItems->get(2);
$entity->set('group_field', null);
$entity = $GroupedItems->save($entity);
$this->assertOrder([1, 4, 3, 5], $GroupedItems, ['group_field' => 1]);
$this->assertOrder([6, 2, 7, 8, 17, 9, 10, 16], $GroupedItems, ['group_field IS' => null]);
$this->assertOrder([11, 12, 13, 14, 15], $GroupedItems, ['group_field' => 3]);
}

/**
* [testSaveKeyword description].
*
Expand Down