Skip to content

Commit 4197c1e

Browse files
mmorerammmoreram
committed
Added write operations result
- Last inserted ID - Number of affected rows !PgSQL is not implementing this yet. Values 0 for both variables!
1 parent 413566d commit 4197c1e

File tree

6 files changed

+156
-25
lines changed

6 files changed

+156
-25
lines changed

‎src/Connection.php

+19-6
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,8 @@ public function upsert(
358358
*
359359
* @param string $name
360360
* @param array $fields
361+
* @param array $extra
362+
* @param bool $autoincrementId
361363
*
362364
* @return PromiseInterface<Connection>
363365
*
@@ -366,7 +368,9 @@ public function upsert(
366368
*/
367369
public function createTable(
368370
string $name,
369-
array $fields
371+
array $fields,
372+
array $extra = [],
373+
bool $autoincrementId = false
370374
): PromiseInterface {
371375
if (empty($fields)) {
372376
throw InvalidArgumentException::fromEmptyFieldsArray();
@@ -375,15 +379,24 @@ public function createTable(
375379
$schema = new Schema();
376380
$table = $schema->createTable($name);
377381
foreach ($fields as $field => $type) {
378-
$extra = [];
379-
if ($type = 'string') {
380-
$extra = ['length' => 255];
382+
$extraField = (
383+
array_key_exists($field, $extra) &&
384+
is_array($extra[$field])
385+
) ? $extra[$field] : [];
386+
387+
if (
388+
$type == 'string' &&
389+
!array_key_exists('length', $extraField)
390+
) {
391+
$extraField = ['length' => 255];
381392
}
382393

383-
$table->addColumn($field, $type, $extra);
394+
$table->addColumn($field, $type, $extraField);
384395
}
385396

386-
$table->setPrimaryKey([array_key_first($fields)]);
397+
$id = array_key_first($fields);
398+
$table->setPrimaryKey([$id]);
399+
$table->getColumn($id)->setAutoincrement($autoincrementId);
387400

388401
return $this->executeSchema($schema);
389402
}

‎src/Driver/Mysql/MysqlDriver.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ public function query(
8282
->connection
8383
->query($sql, $parameters)
8484
->then(function (QueryResult $queryResult) {
85-
return new Result($queryResult->resultRows);
85+
86+
return new Result(
87+
$queryResult->resultRows,
88+
$queryResult->insertId,
89+
$queryResult->affectedRows
90+
);
8691
})
8792
->otherwise(function (Exception $exception) {
8893
$message = $exception->getMessage();

‎src/Driver/PostgreSQL/PostgreSQLDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function query(
118118
return $deferred
119119
->promise()
120120
->then(function ($results) {
121-
return new Result($results);
121+
return new Result($results, 0, 0);
122122
});
123123
}
124124
}

‎src/Driver/SQLite/SQLiteDriver.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,12 @@ public function query(
7878
->database
7979
->query($sql, $parameters)
8080
->then(function (SQLiteResult $sqliteResult) {
81-
return new Result($sqliteResult->rows);
81+
82+
return new Result(
83+
$sqliteResult->rows,
84+
$sqliteResult->insertId,
85+
$sqliteResult->changed
86+
);
8287
})
8388
->otherwise(function (RuntimeException $exception) {
8489
$message = $exception->getMessage();

‎src/Result.php

+50-10
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,56 @@ class Result
2323
/**
2424
* @var mixed
2525
*/
26-
private $data;
26+
private $rows;
27+
28+
/**
29+
* @var int|null
30+
*/
31+
private $lastInsertedId;
32+
33+
/**
34+
* @var int|null
35+
*/
36+
private $affectedRows;
2737

2838
/**
2939
* Result constructor.
3040
*
31-
* @param mixed $data
41+
* @param mixed $rows
42+
* @param int|null $lastInsertedId
43+
* @param int|null $affectedRows
3244
*/
33-
public function __construct($data)
45+
public function __construct(
46+
$rows,
47+
?int $lastInsertedId,
48+
?int $affectedRows
49+
)
3450
{
35-
$this->data = $data;
51+
$this->rows = $rows;
52+
$this->lastInsertedId = $lastInsertedId;
53+
$this->affectedRows = $affectedRows;
3654
}
3755

3856
/**
3957
* Fetch count.
58+
*
59+
* @return int
4060
*/
41-
public function fetchCount()
61+
public function fetchCount() : int
4262
{
43-
return count($this->data);
63+
return is_array($this->rows)
64+
? count($this->rows)
65+
: 0;
4466
}
4567

4668
/**
4769
* Fetch all rows.
70+
*
71+
* @return mixed
4872
*/
4973
public function fetchAllRows()
5074
{
51-
return $this->data;
75+
return $this->rows;
5276
}
5377

5478
/**
@@ -58,9 +82,25 @@ public function fetchAllRows()
5882
*/
5983
public function fetchFirstRow()
6084
{
61-
return is_array($this->data)
62-
&& count($this->data) >= 1
63-
? reset($this->data)
85+
return is_array($this->rows)
86+
&& count($this->rows) >= 1
87+
? reset($this->rows)
6488
: null;
6589
}
90+
91+
/**
92+
* @return int|null
93+
*/
94+
public function getLastInsertedId(): ?int
95+
{
96+
return $this->lastInsertedId;
97+
}
98+
99+
/**
100+
* @return int|null
101+
*/
102+
public function getAffectedRows(): ?int
103+
{
104+
return $this->affectedRows;
105+
}
66106
}

‎tests/ConnectionTest.php

+74-6
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,21 @@ abstract protected function getConnection(LoopInterface $loop): Connection;
4848

4949
/**
5050
* @param Connection $connection
51+
* @param bool $autoincrementedId
5152
*
5253
* @return PromiseInterface
5354
*/
54-
protected function createInfrastructure(Connection $connection): PromiseInterface
55+
protected function createInfrastructure(
56+
Connection $connection,
57+
bool $autoincrementedId = false
58+
): PromiseInterface
5559
{
5660
return $connection
5761
->createTable('test', [
58-
'id' => 'string',
62+
'id' => $autoincrementedId ? 'integer' : 'string',
5963
'field1' => 'string',
6064
'field2' => 'string',
61-
])
65+
], [], $autoincrementedId)
6266
->otherwise(function (TableExistsException $_) use ($connection) {
6367
// Silent pass
6468

@@ -87,15 +91,19 @@ protected function dropInfrastructure(Connection $connection): PromiseInterface
8791

8892
/**
8993
* @param Connection $connection
94+
* @param bool $autoincrementedId
9095
*
9196
* @return PromiseInterface
9297
*/
93-
protected function resetInfrastructure(Connection $connection): PromiseInterface
98+
protected function resetInfrastructure(
99+
Connection $connection,
100+
bool $autoincrementedId = false
101+
): PromiseInterface
94102
{
95103
return $this
96104
->dropInfrastructure($connection)
97-
->then(function () use ($connection) {
98-
return $this->createInfrastructure($connection);
105+
->then(function () use ($connection, $autoincrementedId) {
106+
return $this->createInfrastructure($connection, $autoincrementedId);
99107
});
100108
}
101109

@@ -446,4 +454,64 @@ public function testDelete()
446454

447455
await($promise, $loop, self::MAX_TIMEOUT);
448456
}
457+
458+
/**
459+
* Test get last inserted id
460+
*
461+
* @group lele
462+
*/
463+
public function testGetLastInsertedId()
464+
{
465+
if (get_class($this) === PostgreSQLConnectionTest::class) {
466+
$this->markTestSkipped('Not implemented yet on postgresql');
467+
return;
468+
}
469+
470+
$loop = $this->createLoop();
471+
$connection = $this->getConnection($loop);
472+
$promise = $this
473+
->resetInfrastructure($connection, true)
474+
->then(function (Connection $connection) {
475+
return $connection->insert('test', [
476+
'field1' => 'val1',
477+
'field2' => 'val2',
478+
]);
479+
})
480+
->then(function(Result $result) {
481+
$this->assertEquals(1, $result->getLastInsertedId());
482+
})
483+
->then(function () use ($connection) {
484+
return all([
485+
$connection->insert('test', [
486+
'field1' => 'val3',
487+
'field2' => 'val4',
488+
]),
489+
$connection->insert('test', [
490+
'field1' => 'val5',
491+
'field2' => 'val6',
492+
])
493+
]);
494+
})
495+
->then(function(array $results) {
496+
$this->assertEquals(1, $results[0]->getAffectedRows());
497+
$this->assertEquals(3, $results[1]->getLastInsertedId());
498+
})
499+
->then(function () use ($connection) {
500+
return all([
501+
$connection->delete('test', [
502+
'id' => 2,
503+
]),
504+
$connection->insert('test', [
505+
'field1' => 'val7',
506+
'field2' => 'val8',
507+
])
508+
]);
509+
})
510+
->then(function(array$results) {
511+
$this->assertEquals(1, $results[0]->getAffectedRows());
512+
$this->assertEquals(4, $results[1]->getLastInsertedId());
513+
});
514+
515+
await($promise, $loop, self::MAX_TIMEOUT);
516+
}
449517
}

0 commit comments

Comments
 (0)