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
08735910
Commit
08735910
authored
Nov 21, 2011
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #74 from soulii/master
Portability column forced to lowercase
parents
67985484
89cbfdd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Connection.php
lib/Doctrine/DBAL/Portability/Connection.php
+1
-1
Statement.php
lib/Doctrine/DBAL/Portability/Statement.php
+2
-2
No files found.
lib/Doctrine/DBAL/Portability/Connection.php
View file @
08735910
...
...
@@ -46,7 +46,7 @@ class Connection extends \Doctrine\DBAL\Connection
/**
* @var int
*/
private
$case
=
\PDO
::
CASE_NATURAL
;
private
$case
;
public
function
connect
()
{
...
...
lib/Doctrine/DBAL/Portability/Statement.php
View file @
08735910
...
...
@@ -118,7 +118,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
$row
=
$this
->
fixRow
(
$row
,
$this
->
portability
&
(
Connection
::
PORTABILITY_EMPTY_TO_NULL
|
Connection
::
PORTABILITY_RTRIM
),
(
$fetchStyle
==
PDO
::
FETCH_ASSOC
||
$fetchStyle
==
PDO
::
FETCH_BOTH
)
&&
(
$this
->
portability
&
Connection
::
PORTABILITY_FIX_CASE
)
!
is_null
(
$this
->
case
)
&&
(
$fetchStyle
==
PDO
::
FETCH_ASSOC
||
$fetchStyle
==
PDO
::
FETCH_BOTH
)
&&
(
$this
->
portability
&
Connection
::
PORTABILITY_FIX_CASE
)
);
return
$row
;
...
...
@@ -133,7 +133,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
}
$iterateRow
=
$this
->
portability
&
(
Connection
::
PORTABILITY_EMPTY_TO_NULL
|
Connection
::
PORTABILITY_RTRIM
);
$fixCase
=
(
$fetchStyle
==
PDO
::
FETCH_ASSOC
||
$fetchStyle
==
PDO
::
FETCH_BOTH
)
&&
(
$this
->
portability
&
Connection
::
PORTABILITY_FIX_CASE
);
$fixCase
=
!
is_null
(
$this
->
case
)
&&
(
$fetchStyle
==
PDO
::
FETCH_ASSOC
||
$fetchStyle
==
PDO
::
FETCH_BOTH
)
&&
(
$this
->
portability
&
Connection
::
PORTABILITY_FIX_CASE
);
if
(
!
$iterateRow
&&
!
$fixCase
)
{
return
$rows
;
}
...
...
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