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.

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

Jump to bottom

Type and name sql argument of query function #2918

Closed
wants to merge 2 commits into from
Closed

Type and name sql argument of query function #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874971d
Use variable arguments in query function
rey0bs Nov 16, 2017
2002e52
Simplify PDO query call
rey0bs Nov 16, 2017
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
13 changes: 7 additions & 6 deletions lib/Doctrine/DBAL/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,25 +1006,26 @@ public function project($query, array $params, Closure $function)
/**
* Executes an SQL statement, returning a result set as a Statement object.
*
* @param string $sql
* @param array $args
*
* @return \Doctrine\DBAL\Driver\Statement
*
* @throws \Doctrine\DBAL\DBALException
*/
public function query()
public function query($sql, ...$args)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is a BC break and couldn't be considered for 2.x.

{
$this->connect();

$args = func_get_args();

$logger = $this->_config->getSQLLogger();
if ($logger) {
$logger->startQuery($args[0]);
$logger->startQuery($sql);
}

try {
$statement = $this->_conn->query(...$args);
$statement = $this->_conn->query($sql, ...$args);
} catch (Exception $ex) {
throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $args[0]);
throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $sql);
}

$statement->setFetchMode($this->defaultFetchMode);
Expand Down
8 changes: 3 additions & 5 deletions lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,18 +360,16 @@ public function rollbackSavepoint($savepoint)
/**
* {@inheritDoc}
*/
public function query()
public function query($sql, ...$args)
{
$this->connect('master');

$args = func_get_args();

$logger = $this->getConfiguration()->getSQLLogger();
if ($logger) {
$logger->startQuery($args[0]);
$logger->startQuery($sql);
}

$statement = $this->_conn->query(...$args);
$statement = $this->_conn->query($sql, ...$args);

if ($logger) {
$logger->stopQuery();
Expand Down
5 changes: 4 additions & 1 deletion lib/Doctrine/DBAL/Driver/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ function prepare($prepareString);
/**
* Executes an SQL statement, returning a result set as a Statement object.
*
* @param string $sql
* @param array $args
*
* @return \Doctrine\DBAL\Driver\Statement
*/
function query();
function query($sql, ...$args);

/**
* Quotes a string for use in a query.
Expand Down
4 changes: 1 addition & 3 deletions lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ public function prepare($sql)
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$sql = $args[0];
$stmt = $this->prepare($sql);
$stmt->execute();

Expand Down
4 changes: 1 addition & 3 deletions lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ public function prepare($prepareString)
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$sql = $args[0];
$stmt = $this->prepare($sql);
$stmt->execute();

Expand Down
4 changes: 1 addition & 3 deletions lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@ public function prepare($prepareString)
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$sql = $args[0];
//$fetchMode = $args[1];
$stmt = $this->prepare($sql);
$stmt->execute();
Expand Down
19 changes: 2 additions & 17 deletions lib/Doctrine/DBAL/Driver/PDOConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,10 @@ public function prepare($prepareString, $driverOptions = [])
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$argsCount = count($args);

try {
if ($argsCount == 4) {
return parent::query($args[0], $args[1], $args[2], $args[3]);
}

if ($argsCount == 3) {
return parent::query($args[0], $args[1], $args[2]);
}

if ($argsCount == 2) {
return parent::query($args[0], $args[1]);
}

return parent::query($args[0]);
return parent::query($sql, ...$args);
} catch (\PDOException $exception) {
throw new PDOException($exception);
}
Expand Down
5 changes: 2 additions & 3 deletions lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,9 @@ public function prepare($prepareString)
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$stmt = $this->prepare($args[0]);
$stmt = $this->prepare($sql);

$stmt->execute();

Expand Down
4 changes: 1 addition & 3 deletions lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,8 @@ public function prepare($sql)
/**
* {@inheritDoc}
*/
public function query()
public function query($sql, ...$args)
{
$args = func_get_args();
$sql = $args[0];
$stmt = $this->prepare($sql);
$stmt->execute();

Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/DBAL/Portability/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ public function prepare($statement)
/**
* {@inheritdoc}
*/
public function query()
public function query($sql, ...$args)
{
$this->connect();

$stmt = $this->_conn->query(...func_get_args());
$stmt = $this->_conn->query($sql, ...$args);
$stmt = new Statement($stmt, $this);
$stmt->setFetchMode($this->defaultFetchMode);

Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/Mocks/DriverConnectionMock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class DriverConnectionMock implements \Doctrine\DBAL\Driver\Connection
{
public function prepare($prepareString) {}
public function query() {}
public function query($sql, ...$args) {}
public function quote($input, $type=\PDO::PARAM_STR) {}
public function exec($statement) {}
public function lastInsertId($name = null) {}
Expand Down