Skip to content

Pdo 2. Fix psalm #74

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 3 commits into from
Feb 28, 2022
Merged

Pdo 2. Fix psalm #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfea993
Pdo 2. Fix psalm
darkdef Feb 28, 2022
316967a
styleci fix
darkdef Feb 28, 2022
180eece
styleci fix
darkdef Feb 28, 2022
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: 3 additions & 3 deletions src/DMLQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Yiisoft\Db\Expression\ExpressionInterface;
use Yiisoft\Db\Query\DMLQueryBuilder as AbstractDMLQueryBuilder;
use Yiisoft\Db\Query\QueryBuilderInterface;
use Yiisoft\Db\Query\QueryInterface;
use Yiisoft\Db\Query\Query;

final class DMLQueryBuilder extends AbstractDMLQueryBuilder
{
Expand All @@ -26,7 +26,7 @@ public function __construct(private QueryBuilderInterface $queryBuilder)
/**
* @throws Exception|InvalidArgumentException|InvalidConfigException|NotSupportedException
*/
public function insertEx(string $table, QueryInterface|array $columns, array &$params = []): string
public function insertEx(string $table, Query|array $columns, array &$params = []): string
{
/**
* @psalm-var string[] $names
Expand Down Expand Up @@ -83,7 +83,7 @@ public function resetSequence(string $tableName, mixed $value = null): string
*/
public function upsert(
string $table,
QueryInterface|array $insertColumns,
Query|array $insertColumns,
bool|array $updateColumns,
array &$params = []
): string {
Expand Down
7 changes: 5 additions & 2 deletions src/PDO/CommandPDOMssql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(private ConnectionPDOInterface $db, QueryCache $quer

/**
* @inheritDoc
*/
*/
public function insertEx(string $table, array $columns): bool|array
{
$params = [];
Expand All @@ -30,7 +30,10 @@ public function insertEx(string $table, array $columns): bool|array
$this->setSql($sql)->bindValues($params);
$this->prepare(false);

return $this->queryOne();
/** @psalm-var array|bool */
$result = $this->queryOne();

return is_array($result) ? $result : false;
}

public function queryBuilder(): QueryBuilderInterface
Expand Down