Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
3caae110
Unverified
Commit
3caae110
authored
Jun 20, 2020
by
Grégoire Paris
Committed by
GitHub
Jun 20, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4094 from morozov/psalm-lvl5
Bump Psalm level to 5
parents
78de4498
b2ffff69
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
137 additions
and
49 deletions
+137
-49
Connection.php
lib/Doctrine/DBAL/Connection.php
+3
-2
AbstractMySQLDriver.php
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
+10
-1
AbstractPostgreSQLDriver.php
lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php
+10
-1
AbstractSQLAnywhereDriver.php
lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php
+10
-1
AbstractSQLServerDriver.php
lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php
+10
-1
DB2Statement.php
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
+6
-0
OCI8Connection.php
lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
+3
-2
PDOConnection.php
lib/Doctrine/DBAL/Driver/PDOConnection.php
+4
-1
SQLAnywhereStatement.php
...Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
+5
-0
SQLSrvConnection.php
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
+1
-1
Statement.php
lib/Doctrine/DBAL/Driver/Statement.php
+15
-15
QueryBuilder.php
lib/Doctrine/DBAL/Query/QueryBuilder.php
+1
-1
phpstan.neon.dist
phpstan.neon.dist
+5
-0
psalm.xml
psalm.xml
+18
-1
DriverTest.php
...Doctrine/Tests/DBAL/Driver/DrizzlePDOMySql/DriverTest.php
+1
-1
StatementIteratorTest.php
tests/Doctrine/Tests/DBAL/Driver/StatementIteratorTest.php
+6
-1
DriverTest.php
...ine/Tests/DBAL/Functional/Driver/PDOSqlsrv/DriverTest.php
+2
-2
DBAL630Test.php
tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL630Test.php
+13
-4
AbstractMySQLPlatformTestCase.php
...ne/Tests/DBAL/Platforms/AbstractMySQLPlatformTestCase.php
+1
-1
AbstractPlatformTestCase.php
...octrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
+1
-1
AbstractPostgreSqlPlatformTestCase.php
...sts/DBAL/Platforms/AbstractPostgreSqlPlatformTestCase.php
+1
-1
AbstractSQLServerPlatformTestCase.php
...ests/DBAL/Platforms/AbstractSQLServerPlatformTestCase.php
+1
-1
DB2PlatformTest.php
tests/Doctrine/Tests/DBAL/Platforms/DB2PlatformTest.php
+1
-1
OraclePlatformTest.php
tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php
+6
-6
SQLAnywherePlatformTest.php
...Doctrine/Tests/DBAL/Platforms/SQLAnywherePlatformTest.php
+1
-1
SqlitePlatformTest.php
tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
+2
-2
No files found.
lib/Doctrine/DBAL/Connection.php
View file @
3caae110
...
...
@@ -12,7 +12,6 @@ use Doctrine\DBAL\Driver\Connection as DriverConnection;
use
Doctrine\DBAL\Driver\PingableConnection
;
use
Doctrine\DBAL\Driver\ResultStatement
;
use
Doctrine\DBAL\Driver\ServerInfoAwareConnection
;
use
Doctrine\DBAL\Driver\Statement
as
DriverStatement
;
use
Doctrine\DBAL\Exception\InvalidArgumentException
;
use
Doctrine\DBAL\Platforms\AbstractPlatform
;
use
Doctrine\DBAL\Query\Expression\ExpressionBuilder
;
...
...
@@ -851,7 +850,7 @@ class Connection implements DriverConnection
*
* @param string $statement The SQL statement to prepare.
*
* @return
Driver
Statement The prepared statement.
* @return Statement The prepared statement.
*
* @throws DBALException
*/
...
...
@@ -1456,6 +1455,8 @@ class Connection implements DriverConnection
{
$this
->
connect
();
assert
(
$this
->
_conn
!==
null
);
return
$this
->
_conn
;
}
...
...
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
View file @
3caae110
...
...
@@ -12,6 +12,7 @@ use Doctrine\DBAL\Platforms\MySQL80Platform;
use
Doctrine\DBAL\Platforms\MySqlPlatform
;
use
Doctrine\DBAL\Schema\MySqlSchemaManager
;
use
Doctrine\DBAL\VersionAwarePlatformDriver
;
use
function
assert
;
use
function
preg_match
;
use
function
stripos
;
use
function
version_compare
;
...
...
@@ -197,7 +198,15 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
{
$params
=
$conn
->
getParams
();
return
$params
[
'dbname'
]
??
$conn
->
query
(
'SELECT DATABASE()'
)
->
fetchColumn
();
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
}
$database
=
$conn
->
query
(
'SELECT DATABASE()'
)
->
fetchColumn
();
assert
(
$database
!==
false
);
return
$database
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php
View file @
3caae110
...
...
@@ -13,6 +13,7 @@ use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use
Doctrine\DBAL\Platforms\PostgreSqlPlatform
;
use
Doctrine\DBAL\Schema\PostgreSqlSchemaManager
;
use
Doctrine\DBAL\VersionAwarePlatformDriver
;
use
function
assert
;
use
function
preg_match
;
use
function
strpos
;
use
function
version_compare
;
...
...
@@ -119,7 +120,15 @@ abstract class AbstractPostgreSQLDriver implements Driver, ExceptionConverterDri
{
$params
=
$conn
->
getParams
();
return
$params
[
'dbname'
]
??
$conn
->
query
(
'SELECT CURRENT_DATABASE()'
)
->
fetchColumn
();
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
}
$database
=
$conn
->
query
(
'SELECT CURRENT_DATABASE()'
)
->
fetchColumn
();
assert
(
$database
!==
false
);
return
$database
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php
View file @
3caae110
...
...
@@ -12,6 +12,7 @@ use Doctrine\DBAL\Platforms\SQLAnywhere16Platform;
use
Doctrine\DBAL\Platforms\SQLAnywherePlatform
;
use
Doctrine\DBAL\Schema\SQLAnywhereSchemaManager
;
use
Doctrine\DBAL\VersionAwarePlatformDriver
;
use
function
assert
;
use
function
preg_match
;
use
function
version_compare
;
...
...
@@ -119,7 +120,15 @@ abstract class AbstractSQLAnywhereDriver implements Driver, ExceptionConverterDr
{
$params
=
$conn
->
getParams
();
return
$params
[
'dbname'
]
??
$conn
->
query
(
'SELECT DB_NAME()'
)
->
fetchColumn
();
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
}
$database
=
$conn
->
query
(
'SELECT DB_NAME()'
)
->
fetchColumn
();
assert
(
$database
!==
false
);
return
$database
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php
View file @
3caae110
...
...
@@ -11,6 +11,7 @@ use Doctrine\DBAL\Platforms\SQLServer2012Platform;
use
Doctrine\DBAL\Platforms\SQLServerPlatform
;
use
Doctrine\DBAL\Schema\SQLServerSchemaManager
;
use
Doctrine\DBAL\VersionAwarePlatformDriver
;
use
function
assert
;
use
function
preg_match
;
use
function
version_compare
;
...
...
@@ -60,7 +61,15 @@ abstract class AbstractSQLServerDriver implements Driver, VersionAwarePlatformDr
{
$params
=
$conn
->
getParams
();
return
$params
[
'dbname'
]
??
$conn
->
query
(
'SELECT DB_NAME()'
)
->
fetchColumn
();
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
}
$database
=
$conn
->
query
(
'SELECT DB_NAME()'
)
->
fetchColumn
();
assert
(
$database
!==
false
);
return
$database
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
View file @
3caae110
...
...
@@ -13,6 +13,7 @@ use ReflectionObject;
use
ReflectionProperty
;
use
stdClass
;
use
function
array_change_key_case
;
use
function
assert
;
use
function
db2_bind_param
;
use
function
db2_execute
;
use
function
db2_fetch_array
;
...
...
@@ -30,6 +31,7 @@ use function func_get_args;
use
function
func_num_args
;
use
function
fwrite
;
use
function
gettype
;
use
function
is_int
;
use
function
is_object
;
use
function
is_resource
;
use
function
is_string
;
...
...
@@ -91,6 +93,8 @@ class DB2Statement implements IteratorAggregate, Statement
*/
public
function
bindValue
(
$param
,
$value
,
$type
=
ParameterType
::
STRING
)
{
assert
(
is_int
(
$param
));
return
$this
->
bindParam
(
$param
,
$value
,
$type
);
}
...
...
@@ -99,6 +103,8 @@ class DB2Statement implements IteratorAggregate, Statement
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
ParameterType
::
STRING
,
$length
=
null
)
{
assert
(
is_int
(
$column
));
switch
(
$type
)
{
case
ParameterType
::
INTEGER
:
$this
->
bind
(
$column
,
$variable
,
DB2_PARAM_IN
,
DB2_LONG
);
...
...
lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
View file @
3caae110
...
...
@@ -222,11 +222,12 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
public
function
errorCode
()
{
$error
=
oci_error
(
$this
->
dbh
);
if
(
$error
!==
false
)
{
$error
=
$error
[
'code'
];
return
$error
[
'code'
];
}
return
$error
;
return
null
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/PDOConnection.php
View file @
3caae110
...
...
@@ -38,7 +38,10 @@ class PDOConnection extends PDO implements Connection, ServerInfoAwareConnection
public
function
exec
(
$statement
)
{
try
{
return
parent
::
exec
(
$statement
);
$result
=
parent
::
exec
(
$statement
);
assert
(
$result
!==
false
);
return
$result
;
}
catch
(
\PDOException
$exception
)
{
throw
new
PDOException
(
$exception
);
}
...
...
lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
View file @
3caae110
...
...
@@ -12,6 +12,7 @@ use ReflectionClass;
use
ReflectionObject
;
use
stdClass
;
use
function
array_key_exists
;
use
function
assert
;
use
function
func_get_args
;
use
function
func_num_args
;
use
function
gettype
;
...
...
@@ -91,6 +92,8 @@ class SQLAnywhereStatement implements IteratorAggregate, Statement
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
ParameterType
::
STRING
,
$length
=
null
)
{
assert
(
is_int
(
$column
));
switch
(
$type
)
{
case
ParameterType
::
INTEGER
:
case
ParameterType
::
BOOLEAN
:
...
...
@@ -125,6 +128,8 @@ class SQLAnywhereStatement implements IteratorAggregate, Statement
*/
public
function
bindValue
(
$param
,
$value
,
$type
=
ParameterType
::
STRING
)
{
assert
(
is_int
(
$param
));
return
$this
->
bindParam
(
$param
,
$value
,
$type
);
}
...
...
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
View file @
3caae110
...
...
@@ -190,7 +190,7 @@ class SQLSrvConnection implements Connection, ServerInfoAwareConnection
return
$errors
[
0
][
'code'
];
}
return
false
;
return
null
;
}
/**
...
...
lib/Doctrine/DBAL/Driver/Statement.php
View file @
3caae110
...
...
@@ -19,12 +19,12 @@ interface Statement extends ResultStatement
* As mentioned above, the named parameters are not natively supported by the mysqli driver, use executeQuery(),
* fetchAll(), fetchArray(), fetchColumn(), fetchAssoc() methods to have the named parameter emulated by doctrine.
*
* @param
mixed
$param Parameter identifier. For a prepared statement using named placeholders,
* this will be a parameter name of the form :name. For a prepared statement
* using question mark placeholders, this will be the 1-indexed position of the parameter.
* @param mixed $value The value to bind to the parameter.
* @param int $type Explicit data type for the parameter using the {@link \Doctrine\DBAL\ParameterType}
* constants.
* @param
int|string
$param Parameter identifier. For a prepared statement using named placeholders,
*
this will be a parameter name of the form :name. For a prepared statement
*
using question mark placeholders, this will be the 1-indexed position of the parameter.
* @param mixed
$value The value to bind to the parameter.
* @param int
$type Explicit data type for the parameter using the {@link \Doctrine\DBAL\ParameterType}
*
constants.
*
* @return bool TRUE on success or FALSE on failure.
*/
...
...
@@ -44,15 +44,15 @@ interface Statement extends ResultStatement
* of stored procedures that return data as output parameters, and some also as input/output
* parameters that both send in data and are updated to receive it.
*
* @param
mixed
$column Parameter identifier. For a prepared statement using named placeholders,
* this will be a parameter name of the form :name. For a prepared statement using
* question mark placeholders, this will be the 1-indexed position of the parameter.
* @param mixed $variable Name of the PHP variable to bind to the SQL statement parameter.
* @param int $type Explicit data type for the parameter using the {@link \Doctrine\DBAL\ParameterType}
* constants. To return an INOUT parameter from a stored procedure, use the bitwise
* OR operator to set the PDO::PARAM_INPUT_OUTPUT bits for the data_type parameter.
* @param int|null $length You must specify maxlength when using an OUT bind
* so that PHP allocates enough memory to hold the returned value.
* @param
int|string
$column Parameter identifier. For a prepared statement using named placeholders,
*
this will be a parameter name of the form :name. For a prepared statement using
*
question mark placeholders, this will be the 1-indexed position of the parameter.
* @param mixed
$variable Name of the PHP variable to bind to the SQL statement parameter.
* @param int
$type Explicit data type for the parameter using the {@link \Doctrine\DBAL\ParameterType}
*
constants. To return an INOUT parameter from a stored procedure, use the bitwise
*
OR operator to set the PDO::PARAM_INPUT_OUTPUT bits for the data_type parameter.
* @param int|null
$length You must specify maxlength when using an OUT bind
*
so that PHP allocates enough memory to hold the returned value.
*
* @return bool TRUE on success or FALSE on failure.
*/
...
...
lib/Doctrine/DBAL/Query/QueryBuilder.php
View file @
3caae110
...
...
@@ -395,7 +395,7 @@ class QueryBuilder
* Gets the maximum number of results the query object was set to retrieve (the "limit").
* Returns NULL if all results will be returned.
*
* @return int The maximum number of results.
* @return int
|null
The maximum number of results.
*/
public
function
getMaxResults
()
{
...
...
phpstan.neon.dist
View file @
3caae110
...
...
@@ -95,3 +95,8 @@ parameters:
message: '~Method Doctrine\\DBAL\\Driver\\PDOSqlsrv\\Connection\:\:lastInsertId\(\) should return string but returns string\|false\|null\.~'
paths:
- %currentWorkingDirectory%/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
-
message: '~Method Doctrine\\DBAL\\Portability\\Connection::prepare\(\) should return Doctrine\\DBAL\\Statement but returns Doctrine\\DBAL\\Portability\\Statement\.~'
paths:
- %currentWorkingDirectory%/lib/Doctrine/DBAL/Portability/Connection.php
psalm.xml
View file @
3caae110
<?xml version="1.0"?>
<psalm
totallyTyped=
"false"
errorLevel=
"
6
"
errorLevel=
"
5
"
resolveFromConfigFile=
"true"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns=
"https://getpsalm.org/schema/config"
...
...
@@ -32,6 +32,15 @@
<file
name=
"lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php"
/>
</errorLevel>
</ConflictingReferenceConstraint>
<FalsableReturnStatement>
<errorLevel
type=
"suppress"
>
<!--
Fixing these issues requires an API change
-->
<file
name=
"lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php"
/>
<file
name=
"lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php"
/>
</errorLevel>
</FalsableReturnStatement>
<MethodSignatureMismatch>
<errorLevel
type=
"suppress"
>
<!--
...
...
@@ -41,6 +50,14 @@
<file
name=
"lib/Doctrine/DBAL/Driver/PDOConnection.php"
/>
</errorLevel>
</MethodSignatureMismatch>
<NullableReturnStatement>
<errorLevel
type=
"suppress"
>
<!--
Fixing this issue requires an API change
-->
<file
name=
"lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php"
/>
</errorLevel>
</NullableReturnStatement>
<TooFewArguments>
<errorLevel
type=
"suppress"
>
<!--
...
...
tests/Doctrine/Tests/DBAL/Driver/DrizzlePDOMySql/DriverTest.php
View file @
3caae110
...
...
@@ -39,7 +39,7 @@ class DriverTest extends PDOMySQLDriverTest
}
/**
*
@return mixed[][]
*
{@inheritDoc}
*/
protected
function
getDatabasePlatformsForVersions
()
:
array
{
...
...
tests/Doctrine/Tests/DBAL/Driver/StatementIteratorTest.php
View file @
3caae110
...
...
@@ -5,12 +5,14 @@ namespace Doctrine\Tests\DBAL\Driver;
use
Doctrine\DBAL\Driver\IBMDB2\DB2Statement
;
use
Doctrine\DBAL\Driver\Mysqli\MysqliStatement
;
use
Doctrine\DBAL\Driver\OCI8\OCI8Statement
;
use
Doctrine\DBAL\Driver\ResultStatement
;
use
Doctrine\DBAL\Driver\SQLAnywhere\SQLAnywhereStatement
;
use
Doctrine\DBAL\Driver\SQLSrv\SQLSrvStatement
;
use
Doctrine\DBAL\Driver\Statement
;
use
Doctrine\DBAL\Driver\StatementIterator
;
use
Doctrine\DBAL\Portability\Statement
as
PortabilityStatement
;
use
Doctrine\Tests\DbalTestCase
;
use
IteratorIterator
;
use
PHPUnit\Framework\MockObject\MockObject
;
use
Traversable
;
use
function
extension_loaded
;
...
...
@@ -18,16 +20,19 @@ use function extension_loaded;
class
StatementIteratorTest
extends
DbalTestCase
{
/**
* @param class-string<ResultStatement> $class
*
* @dataProvider statementProvider()
*/
public
function
testGettingIteratorDoesNotCallFetch
(
string
$class
)
:
void
{
$stmt
=
$this
->
createPartialMock
(
$class
,
[
'fetch'
,
'fetchAll'
,
'fetchColumn'
]);
$stmt
->
expects
(
$this
->
never
())
->
method
(
'fetch'
);
$stmt
->
expects
(
$this
->
never
())
->
method
(
'fetchAll'
);
$stmt
->
expects
(
$this
->
never
())
->
method
(
'fetchColumn'
);
$stmt
->
getIterator
(
);
new
IteratorIterator
(
$stmt
);
}
public
function
testIteratorIterationCallsFetchOncePerStep
()
:
void
...
...
tests/Doctrine/Tests/DBAL/Functional/Driver/PDOSqlsrv/DriverTest.php
View file @
3caae110
...
...
@@ -3,7 +3,7 @@
namespace
Doctrine\Tests\DBAL\Functional\Driver\PDOSqlsrv
;
use
Doctrine\DBAL\Driver
as
DriverInterface
;
use
Doctrine\DBAL\Driver\Connection
;
use
Doctrine\DBAL\Driver\
PDO
Connection
;
use
Doctrine\DBAL\Driver\PDOSqlsrv\Driver
;
use
Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest
;
use
Doctrine\Tests\TestUtil
;
...
...
@@ -40,7 +40,7 @@ class DriverTest extends AbstractDriverTest
/**
* @param int[]|string[] $driverOptions
*/
pr
otected
function
getConnection
(
array
$driverOptions
)
:
Connection
pr
ivate
function
getConnection
(
array
$driverOptions
)
:
PDO
Connection
{
$params
=
TestUtil
::
getConnectionParams
();
...
...
tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL630Test.php
View file @
3caae110
...
...
@@ -3,6 +3,7 @@
namespace
Doctrine\Tests\DBAL\Functional\Ticket
;
use
Doctrine\DBAL\DBALException
;
use
Doctrine\DBAL\Driver\PDOConnection
;
use
Doctrine\DBAL\ParameterType
;
use
Doctrine\Tests\DbalFunctionalTestCase
;
use
PDO
;
...
...
@@ -38,7 +39,7 @@ class DBAL630Test extends DbalFunctionalTestCase
protected
function
tearDown
()
:
void
{
if
(
$this
->
running
)
{
$this
->
connection
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
false
);
$this
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
false
);
}
parent
::
tearDown
();
...
...
@@ -72,7 +73,7 @@ class DBAL630Test extends DbalFunctionalTestCase
public
function
testBooleanConversionBoolParamEmulatedPrepares
()
:
void
{
$this
->
connection
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$this
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$platform
=
$this
->
connection
->
getDatabasePlatform
();
...
...
@@ -96,7 +97,7 @@ class DBAL630Test extends DbalFunctionalTestCase
?
bool
$statementValue
,
?
bool
$databaseConvertedValue
)
:
void
{
$this
->
connection
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$this
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$platform
=
$this
->
connection
->
getDatabasePlatform
();
...
...
@@ -120,7 +121,7 @@ class DBAL630Test extends DbalFunctionalTestCase
?
bool
$statementValue
,
bool
$databaseConvertedValue
)
:
void
{
$this
->
connection
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$this
->
getWrappedConnection
()
->
setAttribute
(
PDO
::
ATTR_EMULATE_PREPARES
,
true
);
$platform
=
$this
->
connection
->
getDatabasePlatform
();
...
...
@@ -170,4 +171,12 @@ class DBAL630Test extends DbalFunctionalTestCase
[
null
,
null
],
];
}
private
function
getWrappedConnection
()
:
PDOConnection
{
$connection
=
$this
->
connection
->
getWrappedConnection
();
self
::
assertInstanceOf
(
PDOConnection
::
class
,
$connection
);
return
$connection
;
}
}
tests/Doctrine/Tests/DBAL/Platforms/AbstractMySQLPlatformTestCase.php
View file @
3caae110
...
...
@@ -152,7 +152,7 @@ abstract class AbstractMySQLPlatformTestCase extends AbstractPlatformTestCase
return
'CREATE UNIQUE INDEX index_name ON test (test, test2)'
;
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id)'
;
}
...
...
tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
View file @
3caae110
...
...
@@ -250,7 +250,7 @@ abstract class AbstractPlatformTestCase extends DbalTestCase
self
::
assertEquals
(
$sql
,
$this
->
getGenerateForeignKeySql
());
}
abstract
p
ublic
function
getGenerateForeignKeySql
()
:
string
;
abstract
p
rotected
function
getGenerateForeignKeySql
()
:
string
;
public
function
testGeneratesConstraintCreationSql
()
:
void
{
...
...
tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSqlPlatformTestCase.php
View file @
3caae110
...
...
@@ -65,7 +65,7 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
return
'CREATE INDEX my_idx ON mytable (user_name, last_login)'
;
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id) NOT DEFERRABLE INITIALLY IMMEDIATE'
;
}
...
...
tests/Doctrine/Tests/DBAL/Platforms/AbstractSQLServerPlatformTestCase.php
View file @
3caae110
...
...
@@ -181,7 +181,7 @@ abstract class AbstractSQLServerPlatformTestCase extends AbstractPlatformTestCas
return
'CREATE UNIQUE INDEX index_name ON test (test, test2) WHERE test IS NOT NULL AND test2 IS NOT NULL'
;
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id)'
;
}
...
...
tests/Doctrine/Tests/DBAL/Platforms/DB2PlatformTest.php
View file @
3caae110
...
...
@@ -42,7 +42,7 @@ class DB2PlatformTest extends AbstractPlatformTestCase
];
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id)'
;
}
...
...
tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php
View file @
3caae110
...
...
@@ -93,7 +93,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
}
/**
*
@return mixed[]
*
{@inheritDoc}
*/
public
function
getGenerateTableWithMultiColumnUniqueIndexSql
()
:
array
{
...
...
@@ -234,7 +234,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
return
'CREATE UNIQUE INDEX index_name ON test (test, test2)'
;
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id)'
;
}
...
...
@@ -408,7 +408,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
}
/**
*
@return mixed[]
*
{@inheritDoc}
*/
protected
function
getQuotedColumnInPrimaryKeySQL
()
:
array
{
...
...
@@ -416,7 +416,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
}
/**
*
@return mixed[]
*
{@inheritDoc}
*/
protected
function
getQuotedColumnInIndexSQL
()
:
array
{
...
...
@@ -427,7 +427,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
}
/**
*
@return mixed[]
*
{@inheritDoc}
*/
protected
function
getQuotedNameInIndexSQL
()
:
array
{
...
...
@@ -438,7 +438,7 @@ class OraclePlatformTest extends AbstractPlatformTestCase
}
/**
*
@return mixed[]
*
{@inheritDoc}
*/
protected
function
getQuotedColumnInForeignKeySQL
()
:
array
{
...
...
tests/Doctrine/Tests/DBAL/Platforms/SQLAnywherePlatformTest.php
View file @
3caae110
...
...
@@ -43,7 +43,7 @@ class SQLAnywherePlatformTest extends AbstractPlatformTestCase
];
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id)'
;
}
...
...
tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
View file @
3caae110
...
...
@@ -286,9 +286,9 @@ class SqlitePlatformTest extends AbstractPlatformTestCase
parent
::
testGeneratesConstraintCreationSql
();
}
p
ublic
function
getGenerateForeignKeySql
()
:
string
p
rotected
function
getGenerateForeignKeySql
()
:
string
{
return
null
;
return
''
;
}
public
function
testModifyLimitQuery
()
:
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment