Skip to content
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.

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

(#8298) Restart sequence for Postgresql when loading fixtures #20227

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion framework/test/ActiveFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@
$table = $this->getTableSchema();
$this->db->createCommand()->delete($table->fullName)->execute();
if ($table->sequenceName !== null) {
$this->db->createCommand()->executeResetSequence($table->fullName, 1);
if ('pgsql' === $this->db->driverName) {
$this->db->createCommand("ALTER SEQUENCE {$table->sequenceName} RESTART;")->execute();

Check warning on line 134 in framework/test/ActiveFixture.php

View check run for this annotation

Codecov / codecov/patch

framework/test/ActiveFixture.php#L134

Added line #L134 was not covered by tests
} else {
$this->db->createCommand()->executeResetSequence($table->fullName, 1);
}
}
}

Expand Down
44 changes: 44 additions & 0 deletions tests/framework/test/ActiveFixtureTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

use Yii;
use yii\db\Connection;
use yii\di\Instance;
use yii\test\ActiveFixture;
use yii\test\FixtureTrait;
use yiiunit\data\ar\ActiveRecord;
Expand Down Expand Up @@ -55,6 +56,36 @@ public function testGetData()
$test->tearDown();
}

/**
* Testing the use of offset fixtures
* @return void
* @throws \yii\base\InvalidConfigException
* @throws \yii\db\Exception
*/
public function testOffsetGetData()
{
$test = new CustomerOffsetDbTestCase();
/** @var Connection $db */
$db = Instance::ensure('db', Connection::class);
if ('pgsql' === $db->driverName) {
$db->createCommand('alter sequence customer_id_seq start 2 minvalue 2 restart 2;')->execute();
}
$test->setUp();
$fixture = $test->getFixture('customers');

$this->assertEquals(CustomerFixture::className(), get_class($fixture));
$this->assertCount(2, $fixture);
$this->assertEquals(2, $fixture['customer1']['id']);
$this->assertEquals('customer1@example.com', $fixture['customer1']['email']);
$this->assertEquals(1, $fixture['customer1']['profile_id']);

$this->assertEquals(3, $fixture['customer2']['id']);
$this->assertEquals('customer2@example.com', $fixture['customer2']['email']);
$this->assertEquals(2, $fixture['customer2']['profile_id']);

$test->tearDown();
}

public function testGetModel()
{
$test = new CustomerDbTestCase();
Expand Down Expand Up @@ -225,6 +256,19 @@ public function fixtures()
}
}

class CustomerOffsetDbTestCase extends BaseDbTestCase
{
public function fixtures()
{
return [
'customers' => [
'class' => CustomerFixture::className(),
'dataFile' => '@app/framework/test/data/customer_offset_sequence.php',
],
];
}
}

class CustomDirectoryDbTestCase extends BaseDbTestCase
{
public function fixtures()
Expand Down
25 changes: 25 additions & 0 deletions tests/framework/test/data/customer_offset_sequence.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license https://www.yiiframework.com/license/
*/

return [
'customer1' => [
'id' => 2,
'email' => 'customer1@example.com',
'name' => 'customer1',
'address' => 'address1',
'status' => 1,
'profile_id' => 1,
],
'customer2' => [
'id' => 3,
'email' => 'customer2@example.com',
'name' => 'customer2',
'address' => 'address2',
'status' => 2,
'profile_id' => 2,
],
];
Loading