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
67c4701e
Commit
67c4701e
authored
Jan 24, 2015
by
Marco Pivetta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/sqlite-offset-with-no-limit-support-2.5-backport' into 2.5
parents
cf3afaed
e3944004
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
SqlitePlatform.php
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
+12
-0
SqlitePlatformTest.php
tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
+6
-0
No files found.
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View file @
67c4701e
...
@@ -657,6 +657,18 @@ class SqlitePlatform extends AbstractPlatform
...
@@ -657,6 +657,18 @@ class SqlitePlatform extends AbstractPlatform
return
$sql
;
return
$sql
;
}
}
/**
* {@inheritDoc}
*/
protected
function
doModifyLimitQuery
(
$query
,
$limit
,
$offset
)
{
if
(
null
===
$limit
&&
null
!==
$offset
)
{
return
$query
.
' LIMIT -1 OFFSET '
.
$offset
;
}
return
parent
::
doModifyLimitQuery
(
$query
,
$limit
,
$offset
);
}
/**
/**
* {@inheritDoc}
* {@inheritDoc}
*/
*/
...
...
tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
View file @
67c4701e
...
@@ -290,6 +290,12 @@ class SqlitePlatformTest extends AbstractPlatformTestCase
...
@@ -290,6 +290,12 @@ class SqlitePlatformTest extends AbstractPlatformTestCase
$this
->
assertEquals
(
'SELECT * FROM user LIMIT 10'
,
$sql
);
$this
->
assertEquals
(
'SELECT * FROM user LIMIT 10'
,
$sql
);
}
}
public
function
testModifyLimitQueryWithOffsetAndEmptyLimit
()
{
$sql
=
$this
->
_platform
->
modifyLimitQuery
(
'SELECT * FROM user'
,
null
,
10
);
$this
->
assertEquals
(
'SELECT * FROM user LIMIT -1 OFFSET 10'
,
$sql
);
}
public
function
getGenerateAlterTableSql
()
public
function
getGenerateAlterTableSql
()
{
{
return
array
(
return
array
(
...
...
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