From c40a2c998ae14ad9ddb0d89259f9d260f5b7ba73 Mon Sep 17 00:00:00 2001 From: SOFe Date: Tue, 14 Dec 2021 19:25:03 +0800 Subject: [PATCH] Fixed callback types in executeXxxRaw methods --- .../libasynql/base/DataConnectorImpl.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libasynql/src/poggit/libasynql/base/DataConnectorImpl.php b/libasynql/src/poggit/libasynql/base/DataConnectorImpl.php index e55f6812..10e1cb13 100644 --- a/libasynql/src/poggit/libasynql/base/DataConnectorImpl.php +++ b/libasynql/src/poggit/libasynql/base/DataConnectorImpl.php @@ -122,7 +122,7 @@ public function executeGeneric(string $queryName, array $args = [], ?callable $o }, $onError); } - public function executeGenericRaw(array $queries, array $args = [], ?callable $onSuccess = null, ?callable $onError = null) : void{ + public function executeGenericRaw(array $queries, array $args = [[]], ?callable $onSuccess = null, ?callable $onError = null) : void{ $this->executeImplRaw($queries, $args, SqlThread::MODE_GENERIC, static function() use ($onSuccess){ if($onSuccess !== null){ $onSuccess(); @@ -138,10 +138,10 @@ public function executeChange(string $queryName, array $args = [], ?callable $on }, $onError); } - public function executeChangeRaw(array $queries, array $args = [], ?callable $onSuccess = null, ?callable $onError = null) : void{ - $this->executeImplRaw($queries, $args, SqlThread::MODE_CHANGE, static function(SqlChangeResult $result) use ($onSuccess){ + public function executeChangeRaw(array $queries, array $args = [[]], ?callable $onSuccess = null, ?callable $onError = null) : void{ + $this->executeImplRaw($queries, $args, SqlThread::MODE_CHANGE, static function(array $results) use ($onSuccess){ if($onSuccess !== null){ - $onSuccess($result->getAffectedRows()); + $onSuccess(array_map(fn($result) => $result->getAffectedRows(), $results)); } }, $onError); } @@ -154,10 +154,10 @@ public function executeInsert(string $queryName, array $args = [], ?callable $on }, $onError); } - public function executeInsertRaw(array $queries, array $args = [], ?callable $onInserted = null, ?callable $onError = null) : void{ - $this->executeImplRaw($queries, $args, SqlThread::MODE_INSERT, static function(SqlInsertResult $result) use ($onInserted){ + public function executeInsertRaw(array $queries, array $args = [[]], ?callable $onInserted = null, ?callable $onError = null) : void{ + $this->executeImplRaw($queries, $args, SqlThread::MODE_INSERT, static function(array $results) use ($onInserted){ if($onInserted !== null){ - $onInserted($result->getInsertId(), $result->getAffectedRows()); + $onInserted(array_map(fn($result) => $result->getInsertId(), $results)); } }, $onError); } @@ -170,10 +170,10 @@ public function executeSelect(string $queryName, array $args = [], ?callable $on }, $onError); } - public function executeSelectRaw(array $queries, array $args = [], ?callable $onSelect = null, ?callable $onError = null) : void{ - $this->executeImplRaw($queries, $args, SqlThread::MODE_SELECT, static function(SqlSelectResult $result) use ($onSelect){ + public function executeSelectRaw(array $queries, array $args = [[]], ?callable $onSelect = null, ?callable $onError = null) : void{ + $this->executeImplRaw($queries, $args, SqlThread::MODE_SELECT, static function(array $results) use ($onSelect){ if($onSelect !== null){ - $onSelect($result->getRows(), $result->getColumnInfo()); + $onSelect(array_map(fn($result) => $result->getRows(), $results)); } }, $onError); }