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
f4f92aee
Commit
f4f92aee
authored
Jul 29, 2012
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'DBAL-301' into 2.3
parents
659de9a1
b75d8633
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
11 deletions
+12
-11
DB2Statement.php
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
+1
-1
MysqliStatement.php
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
+1
-1
OCI8Statement.php
lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
+2
-2
SQLSrvStatement.php
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
+2
-2
Statement.php
lib/Doctrine/DBAL/Driver/Statement.php
+2
-1
Statement.php
lib/Doctrine/DBAL/Portability/Statement.php
+1
-1
Statement.php
lib/Doctrine/DBAL/Statement.php
+2
-2
doctrine-common
lib/vendor/doctrine-common
+1
-1
No files found.
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
View file @
f4f92aee
...
@@ -56,7 +56,7 @@ class DB2Statement implements \IteratorAggregate, Statement
...
@@ -56,7 +56,7 @@ class DB2Statement implements \IteratorAggregate, Statement
/**
/**
* {@inheritdoc}
* {@inheritdoc}
*/
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
)
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
)
{
{
$this
->
_bindParam
[
$column
]
=&
$variable
;
$this
->
_bindParam
[
$column
]
=&
$variable
;
...
...
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
View file @
f4f92aee
...
@@ -86,7 +86,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
...
@@ -86,7 +86,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
/**
/**
* {@inheritdoc}
* {@inheritdoc}
*/
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
)
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
)
{
{
if
(
null
===
$type
)
{
if
(
null
===
$type
)
{
$type
=
's'
;
$type
=
's'
;
...
...
lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
View file @
f4f92aee
...
@@ -106,13 +106,13 @@ class OCI8Statement implements \IteratorAggregate, Statement
...
@@ -106,13 +106,13 @@ class OCI8Statement implements \IteratorAggregate, Statement
*/
*/
public
function
bindValue
(
$param
,
$value
,
$type
=
null
)
public
function
bindValue
(
$param
,
$value
,
$type
=
null
)
{
{
return
$this
->
bindParam
(
$param
,
$value
,
$type
);
return
$this
->
bindParam
(
$param
,
$value
,
$type
,
null
);
}
}
/**
/**
* {@inheritdoc}
* {@inheritdoc}
*/
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
)
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
)
{
{
$column
=
isset
(
$this
->
_paramMap
[
$column
])
?
$this
->
_paramMap
[
$column
]
:
$column
;
$column
=
isset
(
$this
->
_paramMap
[
$column
])
?
$this
->
_paramMap
[
$column
]
:
$column
;
...
...
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
View file @
f4f92aee
...
@@ -102,13 +102,13 @@ class SQLSrvStatement implements IteratorAggregate, Statement
...
@@ -102,13 +102,13 @@ class SQLSrvStatement implements IteratorAggregate, Statement
public
function
bindValue
(
$param
,
$value
,
$type
=
null
)
public
function
bindValue
(
$param
,
$value
,
$type
=
null
)
{
{
return
$this
->
bindParam
(
$param
,
$value
,
$type
);
return
$this
->
bindParam
(
$param
,
$value
,
$type
,
null
);
}
}
/**
/**
* {@inheritdoc}
* {@inheritdoc}
*/
*/
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
)
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
)
{
{
if
(
!
is_numeric
(
$column
))
{
if
(
!
is_numeric
(
$column
))
{
throw
new
SQLSrvException
(
"sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead."
);
throw
new
SQLSrvException
(
"sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead."
);
...
...
lib/Doctrine/DBAL/Driver/Statement.php
View file @
f4f92aee
...
@@ -70,9 +70,10 @@ interface Statement extends ResultStatement
...
@@ -70,9 +70,10 @@ interface Statement extends ResultStatement
* @param integer $type Explicit data type for the parameter using the PDO::PARAM_* constants. To return
* @param integer $type Explicit data type for the parameter using the PDO::PARAM_* constants. To return
* an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
* 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.
* PDO::PARAM_INPUT_OUTPUT bits for the data_type parameter.
* @param integer $length You must specify maxlength when using an OUT bind so that PHP allocates enough memory to hold the returned value.
* @return boolean Returns TRUE on success or FALSE on failure.
* @return boolean Returns TRUE on success or FALSE on failure.
*/
*/
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
);
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
);
/**
/**
* errorCode
* errorCode
...
...
lib/Doctrine/DBAL/Portability/Statement.php
View file @
f4f92aee
...
@@ -66,7 +66,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
...
@@ -66,7 +66,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
$this
->
case
=
$conn
->
getFetchCase
();
$this
->
case
=
$conn
->
getFetchCase
();
}
}
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
)
public
function
bindParam
(
$column
,
&
$variable
,
$type
=
null
,
$length
=
null
)
{
{
return
$this
->
stmt
->
bindParam
(
$column
,
$variable
,
$type
);
return
$this
->
stmt
->
bindParam
(
$column
,
$variable
,
$type
);
}
}
...
...
lib/Doctrine/DBAL/Statement.php
View file @
f4f92aee
...
@@ -116,9 +116,9 @@ class Statement implements \IteratorAggregate, DriverStatement
...
@@ -116,9 +116,9 @@ class Statement implements \IteratorAggregate, DriverStatement
* @param integer $type The PDO binding type.
* @param integer $type The PDO binding type.
* @return boolean TRUE on success, FALSE on failure.
* @return boolean TRUE on success, FALSE on failure.
*/
*/
public
function
bindParam
(
$name
,
&
$var
,
$type
=
PDO
::
PARAM_STR
)
public
function
bindParam
(
$name
,
&
$var
,
$type
=
PDO
::
PARAM_STR
,
$length
=
null
)
{
{
return
$this
->
stmt
->
bindParam
(
$name
,
$var
,
$type
);
return
$this
->
stmt
->
bindParam
(
$name
,
$var
,
$type
,
$length
);
}
}
/**
/**
...
...
doctrine-common
@
e0bb6522
Subproject commit
15b04ec520ccded3dc0eba65b12a69ff1931360f
Subproject commit
e0bb65229e6dfc1f012a0eef9e23016308652e46
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