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
8d0bd31e
Commit
8d0bd31e
authored
Dec 22, 2012
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'DBAL-399' into 2.3
parents
00f9575d
d1843938
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
SQLParserUtils.php
lib/Doctrine/DBAL/SQLParserUtils.php
+2
-2
SQLParserUtilsTest.php
tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php
+2
-0
No files found.
lib/Doctrine/DBAL/SQLParserUtils.php
View file @
8d0bd31e
...
...
@@ -54,7 +54,7 @@ class SQLParserUtils
$stmtLen
=
strlen
(
$statement
);
$paramMap
=
array
();
for
(
$i
=
0
;
$i
<
$stmtLen
;
$i
++
)
{
if
(
$statement
[
$i
]
==
$match
&&
!
$inLiteral
)
{
if
(
$statement
[
$i
]
==
$match
&&
!
$inLiteral
&&
(
$isPositional
||
$statement
[
$i
+
1
]
!=
'='
)
)
{
// real positional parameter detected
if
(
$isPositional
)
{
$paramMap
[
$count
]
=
$i
;
...
...
@@ -180,4 +180,4 @@ class SQLParserUtils
return
array
(
$query
,
$paramsOrd
,
$typesOrd
);
}
}
\ No newline at end of file
}
tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php
View file @
8d0bd31e
...
...
@@ -35,6 +35,8 @@ class SQLParserUtilsTest extends \Doctrine\Tests\DbalTestCase
array
(
'SELECT ":foo" FROM Foo WHERE bar IN (:name1, :name2)'
,
false
,
array
(
37
=>
'name1'
,
45
=>
'name2'
)),
array
(
"SELECT ':foo' FROM Foo WHERE bar IN (:name1, :name2)"
,
false
,
array
(
37
=>
'name1'
,
45
=>
'name2'
)),
array
(
'SELECT :foo_id'
,
false
,
array
(
7
=>
'foo_id'
)),
// Ticket DBAL-231
array
(
'SELECT @rank := 1'
,
false
,
array
()),
// Ticket DBAL-398
array
(
'SELECT @rank := 1 AS rank, :foo AS foo FROM :bar'
,
false
,
array
(
27
=>
'foo'
,
44
=>
'bar'
)),
// Ticket DBAL-398
);
}
...
...
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