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
4a556cbd
Unverified
Commit
4a556cbd
authored
Feb 09, 2019
by
Marco Pivetta
Committed by
GitHub
Feb 09, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3452 from morozov/issues/3451
Fixed AppVeyor build configuration and the issue on SQL Server
parents
92920ede
ccc6a0af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
.appveyor.yml
.appveyor.yml
+11
-3
SQLServerPlatform.php
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
+1
-1
No files found.
.appveyor.yml
View file @
4a556cbd
...
...
@@ -131,17 +131,25 @@ before_test:
}
test_script
:
-
cd C:\projects\dbal
-
ps
:
>-
if ($env:db_version) {
$env:phpunit_config = "tests\appveyor\$($env:db).$($env:db_version).$($env:driver).appveyor.xml"
} else {
$env:phpunit_config = "tests\appveyor\$($env:db).$($env:driver).appveyor.xml"
}
-
ps
:
>-
if ($env:coverage -eq "yes") {
vendor\bin\phpunit -c $($env:phpunit_config) --coverage-clover clover.xml
appveyor-retry ocular code-coverage:upload --format=php-clover clover.xml
} else {
vendor\bin\phpunit -c $($env:phpunit_config)
}
if ($LastExitCode -ne 0) {
$host.SetShouldExit($LastExitCode)
}
after_test
:
-
ps
:
>-
if ($env:coverage -eq "yes") {
appveyor-retry ocular code-coverage:upload --format=php-clover clover.xml
}
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View file @
4a556cbd
...
...
@@ -1278,7 +1278,7 @@ SQL
// Even if the TOP n is very large, the use of a CTE will
// allow the SQL Server query planner to optimize it so it doesn't
// actually scan the entire range covered by the TOP clause.
if
(
!
preg_match
(
'/^(\s*SELECT\s+(?:DISTINCT\s+)?)(.*)$/i
m
'
,
$query
,
$matches
))
{
if
(
!
preg_match
(
'/^(\s*SELECT\s+(?:DISTINCT\s+)?)(.*)$/i
s
'
,
$query
,
$matches
))
{
return
$query
;
}
...
...
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