php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSSQL tests (#17426)

Browse Source
This commit is contained in:
Alexander Kartavenko
2019-07-11 19:39:46 +03:00
committed by Alexander Makarov
parent 7e77dd2322
commit d98f4e69b5
7 changed files with 171 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/framework/db/BatchQueryResultTest.php
View File

@ -7,7 +7,6 @@
namespace yiiunit\framework\db;
use Yii;
use yii\db\BatchQueryResult;
use yii\db\Query;
use yiiunit\data\ar\ActiveRecord;
@ -23,10 +22,6 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
public function testQuery()
{
if ($this->driverName === 'sqlsrv') {
$this->markTestSkipped('Should be fixed');
}
$db = $this->getConnection();
// initialize property test
@ -40,20 +35,14 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
// normal query
$query = new Query();
$query->from('customer')->orderBy('id');
$allRows = [];
$batch = $query->batch(2, $db);
foreach ($batch as $rows) {
$allRows = array_merge($allRows, $rows);
}
$allRows = $this->getAllRowsFromBach($batch);
$this->assertCount(3, $allRows);
$this->assertEquals('user1', $allRows[0]['name']);
$this->assertEquals('user2', $allRows[1]['name']);
$this->assertEquals('user3', $allRows[2]['name']);
// rewind
$allRows = [];
foreach ($batch as $rows) {
$allRows = array_merge($allRows, $rows);
}
$allRows = $this->getAllRowsFromBach($batch);
$this->assertCount(3, $allRows);
// reset
$batch->reset();
@ -71,10 +60,7 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
// query with index
$query = new Query();
$query->from('customer')->indexBy('name');
$allRows = [];
foreach ($query->batch(2, $db) as $rows) {
$allRows = array_merge($allRows, $rows);
}
$allRows = $this->getAllRowsFromBach($query->batch(2, $db));
$this->assertCount(3, $allRows);
$this->assertEquals('address1', $allRows['user1']['address']);
$this->assertEquals('address2', $allRows['user2']['address']);
@ -83,10 +69,7 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
// each
$query = new Query();
$query->from('customer')->orderBy('id');
$allRows = [];
foreach ($query->each(2, $db) as $index => $row) {
$allRows[$index] = $row;
}
$allRows = $this->getAllRowsFromEach($query->each(2, $db));
$this->assertCount(3, $allRows);
$this->assertEquals('user1', $allRows[0]['name']);
$this->assertEquals('user2', $allRows[1]['name']);
@ -95,10 +78,7 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
// each with key
$query = new Query();
$query->from('customer')->orderBy('id')->indexBy('name');
$allRows = [];
foreach ($query->each(100, $db) as $key => $row) {
$allRows[$key] = $row;
}
$allRows = $this->getAllRowsFromEach($query->each(100, $db));
$this->assertCount(3, $allRows);
$this->assertEquals('address1', $allRows['user1']['address']);
$this->assertEquals('address2', $allRows['user2']['address']);
@ -107,17 +87,10 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
public function testActiveQuery()
{
if ($this->driverName === 'sqlsrv') {
$this->markTestSkipped('Should be fixed');
}
$db = $this->getConnection();
$query = Customer::find()->orderBy('id');
$customers = [];
foreach ($query->batch(2, $db) as $models) {
$customers = array_merge($customers, $models);
}
$customers = $this->getAllRowsFromBach($query->batch(2, $db));
$this->assertCount(3, $customers);
$this->assertEquals('user1', $customers[0]->name);
$this->assertEquals('user2', $customers[1]->name);
@ -125,16 +98,33 @@ abstract class BatchQueryResultTest extends DatabaseTestCase
// batch with eager loading
$query = Customer::find()->with('orders')->orderBy('id');
$customers = [];
foreach ($query->batch(2, $db) as $models) {
$customers = array_merge($customers, $models);
foreach ($models as $model) {
$this->assertTrue($model->isRelationPopulated('orders'));
}
$customers = $this->getAllRowsFromBach($query->batch(2, $db));
foreach ($customers as $customer) {
$this->assertTrue($customer->isRelationPopulated('orders'));
}
$this->assertCount(3, $customers);
$this->assertCount(1, $customers[0]->orders);
$this->assertCount(2, $customers[1]->orders);
$this->assertCount(0, $customers[2]->orders);
}
protected function getAllRowsFromBach(BatchQueryResult $batch)
{
$allRows = [];
foreach ($batch as $rows) {
$allRows = array_merge($allRows, $rows);
}
return $allRows;
}
protected function getAllRowsFromEach(BatchQueryResult $each)
{
$allRows = [];
foreach ($each as $index => $row) {
$allRows[$index] = $row;
}
return $allRows;
}
}