composer update
This commit is contained in:
@@ -1,62 +1,39 @@
|
||||
<?php
|
||||
/*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* This software consists of voluntary contributions made by many individuals
|
||||
* and is licensed under the MIT license. For more information, see
|
||||
* <http://www.doctrine-project.org>.
|
||||
*/
|
||||
|
||||
namespace Doctrine\DBAL\Portability;
|
||||
|
||||
use Doctrine\DBAL\Cache\QueryCacheProfile;
|
||||
use Doctrine\DBAL\ColumnCase;
|
||||
use Doctrine\DBAL\Driver\PDOConnection;
|
||||
use PDO;
|
||||
use const CASE_LOWER;
|
||||
use const CASE_UPPER;
|
||||
use function func_get_args;
|
||||
|
||||
/**
|
||||
* Portability wrapper for a Connection.
|
||||
*
|
||||
* @link www.doctrine-project.org
|
||||
* @since 2.0
|
||||
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
||||
*/
|
||||
class Connection extends \Doctrine\DBAL\Connection
|
||||
{
|
||||
const PORTABILITY_ALL = 255;
|
||||
const PORTABILITY_NONE = 0;
|
||||
const PORTABILITY_RTRIM = 1;
|
||||
const PORTABILITY_EMPTY_TO_NULL = 4;
|
||||
const PORTABILITY_FIX_CASE = 8;
|
||||
public const PORTABILITY_ALL = 255;
|
||||
public const PORTABILITY_NONE = 0;
|
||||
public const PORTABILITY_RTRIM = 1;
|
||||
public const PORTABILITY_EMPTY_TO_NULL = 4;
|
||||
public const PORTABILITY_FIX_CASE = 8;
|
||||
|
||||
const PORTABILITY_DB2 = 13;
|
||||
const PORTABILITY_ORACLE = 9;
|
||||
const PORTABILITY_POSTGRESQL = 13;
|
||||
const PORTABILITY_SQLITE = 13;
|
||||
const PORTABILITY_OTHERVENDORS = 12;
|
||||
const PORTABILITY_DRIZZLE = 13;
|
||||
const PORTABILITY_SQLANYWHERE = 13;
|
||||
const PORTABILITY_SQLSRV = 13;
|
||||
public const PORTABILITY_DB2 = 13;
|
||||
public const PORTABILITY_ORACLE = 9;
|
||||
public const PORTABILITY_POSTGRESQL = 13;
|
||||
public const PORTABILITY_SQLITE = 13;
|
||||
public const PORTABILITY_OTHERVENDORS = 12;
|
||||
public const PORTABILITY_DRIZZLE = 13;
|
||||
public const PORTABILITY_SQLANYWHERE = 13;
|
||||
public const PORTABILITY_SQLSRV = 13;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
/** @var int */
|
||||
private $portability = self::PORTABILITY_NONE;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
/** @var int */
|
||||
private $case;
|
||||
|
||||
/**
|
||||
@@ -68,32 +45,32 @@ class Connection extends \Doctrine\DBAL\Connection
|
||||
if ($ret) {
|
||||
$params = $this->getParams();
|
||||
if (isset($params['portability'])) {
|
||||
if ($this->getDatabasePlatform()->getName() === "oracle") {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_ORACLE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === "postgresql") {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_POSTGRESQL;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === "sqlite") {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_SQLITE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === "drizzle") {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_DRIZZLE;
|
||||
if ($this->getDatabasePlatform()->getName() === 'oracle') {
|
||||
$params['portability'] &= self::PORTABILITY_ORACLE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'postgresql') {
|
||||
$params['portability'] &= self::PORTABILITY_POSTGRESQL;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'sqlite') {
|
||||
$params['portability'] &= self::PORTABILITY_SQLITE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'drizzle') {
|
||||
$params['portability'] &= self::PORTABILITY_DRIZZLE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'sqlanywhere') {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_SQLANYWHERE;
|
||||
$params['portability'] &= self::PORTABILITY_SQLANYWHERE;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'db2') {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_DB2;
|
||||
$params['portability'] &= self::PORTABILITY_DB2;
|
||||
} elseif ($this->getDatabasePlatform()->getName() === 'mssql') {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_SQLSRV;
|
||||
$params['portability'] &= self::PORTABILITY_SQLSRV;
|
||||
} else {
|
||||
$params['portability'] = $params['portability'] & self::PORTABILITY_OTHERVENDORS;
|
||||
$params['portability'] &= self::PORTABILITY_OTHERVENDORS;
|
||||
}
|
||||
$this->portability = $params['portability'];
|
||||
}
|
||||
|
||||
if (isset($params['fetch_case']) && $this->portability & self::PORTABILITY_FIX_CASE) {
|
||||
if ($this->_conn instanceof \Doctrine\DBAL\Driver\PDOConnection) {
|
||||
if ($this->_conn instanceof PDOConnection) {
|
||||
// make use of c-level support for case handling
|
||||
$this->_conn->setAttribute(\PDO::ATTR_CASE, $params['fetch_case']);
|
||||
$this->_conn->setAttribute(PDO::ATTR_CASE, $params['fetch_case']);
|
||||
} else {
|
||||
$this->case = ($params['fetch_case'] === ColumnCase::LOWER) ? CASE_LOWER : CASE_UPPER;
|
||||
$this->case = $params['fetch_case'] === ColumnCase::LOWER ? CASE_LOWER : CASE_UPPER;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,7 +97,7 @@ class Connection extends \Doctrine\DBAL\Connection
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function executeQuery($query, array $params = [], $types = [], QueryCacheProfile $qcp = null)
|
||||
public function executeQuery($query, array $params = [], $types = [], ?QueryCacheProfile $qcp = null)
|
||||
{
|
||||
$stmt = new Statement(parent::executeQuery($query, $params, $types, $qcp), $this);
|
||||
$stmt->setFetchMode($this->defaultFetchMode);
|
||||
|
@@ -1,72 +1,44 @@
|
||||
<?php
|
||||
/*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* This software consists of voluntary contributions made by many individuals
|
||||
* and is licensed under the MIT license. For more information, see
|
||||
* <http://www.doctrine-project.org>.
|
||||
*/
|
||||
|
||||
namespace Doctrine\DBAL\Portability;
|
||||
|
||||
use Doctrine\DBAL\Driver\Statement as DriverStatement;
|
||||
use Doctrine\DBAL\Driver\StatementIterator;
|
||||
use Doctrine\DBAL\FetchMode;
|
||||
use Doctrine\DBAL\ParameterType;
|
||||
use IteratorAggregate;
|
||||
use PDO;
|
||||
use function array_change_key_case;
|
||||
use function is_null;
|
||||
use function is_string;
|
||||
use function rtrim;
|
||||
|
||||
/**
|
||||
* Portability wrapper for a Statement.
|
||||
*
|
||||
* @link www.doctrine-project.org
|
||||
* @since 2.0
|
||||
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
||||
*/
|
||||
class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
|
||||
class Statement implements IteratorAggregate, DriverStatement
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
/** @var int */
|
||||
private $portability;
|
||||
|
||||
/**
|
||||
* @var \Doctrine\DBAL\Driver\Statement
|
||||
*/
|
||||
/** @var DriverStatement */
|
||||
private $stmt;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
/** @var int */
|
||||
private $case;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
/** @var int */
|
||||
private $defaultFetchMode = FetchMode::MIXED;
|
||||
|
||||
/**
|
||||
* Wraps <tt>Statement</tt> and applies portability measures.
|
||||
*
|
||||
* @param \Doctrine\DBAL\Driver\Statement $stmt
|
||||
* @param \Doctrine\DBAL\Portability\Connection $conn
|
||||
* @param DriverStatement $stmt
|
||||
*/
|
||||
public function __construct($stmt, Connection $conn)
|
||||
{
|
||||
$this->stmt = $stmt;
|
||||
$this->stmt = $stmt;
|
||||
$this->portability = $conn->getPortability();
|
||||
$this->case = $conn->getFetchCase();
|
||||
$this->case = $conn->getFetchCase();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,7 +118,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function fetch($fetchMode = null, $cursorOrientation = \PDO::FETCH_ORI_NEXT, $cursorOffset = 0)
|
||||
public function fetch($fetchMode = null, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0)
|
||||
{
|
||||
$fetchMode = $fetchMode ?: $this->defaultFetchMode;
|
||||
|
||||
@@ -180,7 +152,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
|
||||
&& ($fetchMode === FetchMode::ASSOCIATIVE || $fetchMode === FetchMode::MIXED)
|
||||
&& ($this->portability & Connection::PORTABILITY_FIX_CASE);
|
||||
|
||||
if ( ! $iterateRow && !$fixCase) {
|
||||
if (! $iterateRow && ! $fixCase) {
|
||||
return $rows;
|
||||
}
|
||||
|
||||
@@ -208,11 +180,11 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
|
||||
* @param int $iterateRow
|
||||
* @param bool $fixCase
|
||||
*
|
||||
* @return array
|
||||
* @return mixed
|
||||
*/
|
||||
protected function fixRow($row, $iterateRow, $fixCase)
|
||||
{
|
||||
if ( ! $row) {
|
||||
if (! $row) {
|
||||
return $row;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user