Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ea824f3

Browse files
OcramiusOcramius
committed
Merge branch 'hotfix/doctrine#1365-query-dql-function-test-determinism'
2 parents 19e24ee + f93f601 commit ea824f3

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

‎tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function testAggregateCount()
6161

6262
public function testFunctionAbs()
6363
{
64-
$result = $this->_em->createQuery('SELECT m, ABS(m.salary * -1) AS abs FROM Doctrine\Tests\Models\Company\CompanyManager m')
64+
$result = $this->_em->createQuery('SELECT m, ABS(m.salary * -1) AS abs FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
6565
->getResult();
6666

6767
$this->assertEquals(4, count($result));
@@ -73,7 +73,7 @@ public function testFunctionAbs()
7373

7474
public function testFunctionConcat()
7575
{
76-
$arg = $this->_em->createQuery('SELECT m, CONCAT(m.name, m.department) AS namedep FROM Doctrine\Tests\Models\Company\CompanyManager m')
76+
$arg = $this->_em->createQuery('SELECT m, CONCAT(m.name, m.department) AS namedep FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
7777
->getArrayResult();
7878

7979
$this->assertEquals(4, count($arg));
@@ -85,7 +85,7 @@ public function testFunctionConcat()
8585

8686
public function testFunctionLength()
8787
{
88-
$result = $this->_em->createQuery('SELECT m, LENGTH(CONCAT(m.name, m.department)) AS namedeplength FROM Doctrine\Tests\Models\Company\CompanyManager m')
88+
$result = $this->_em->createQuery('SELECT m, LENGTH(CONCAT(m.name, m.department)) AS namedeplength FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
8989
->getArrayResult();
9090

9191
$this->assertEquals(4, count($result));
@@ -98,7 +98,7 @@ public function testFunctionLength()
9898
public function testFunctionLocate()
9999
{
100100
$dql = "SELECT m, LOCATE('e', LOWER(m.name)) AS loc, LOCATE('e', LOWER(m.name), 7) AS loc2 ".
101-
"FROM Doctrine\Tests\Models\Company\CompanyManager m";
101+
"FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
102102

103103
$result = $this->_em->createQuery($dql)
104104
->getArrayResult();
@@ -116,7 +116,7 @@ public function testFunctionLocate()
116116

117117
public function testFunctionLower()
118118
{
119-
$result = $this->_em->createQuery("SELECT m, LOWER(m.name) AS lowername FROM Doctrine\Tests\Models\Company\CompanyManager m")
119+
$result = $this->_em->createQuery("SELECT m, LOWER(m.name) AS lowername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
120120
->getArrayResult();
121121

122122
$this->assertEquals(4, count($result));
@@ -128,7 +128,7 @@ public function testFunctionLower()
128128

129129
public function testFunctionMod()
130130
{
131-
$result = $this->_em->createQuery("SELECT m, MOD(m.salary, 3500) AS amod FROM Doctrine\Tests\Models\Company\CompanyManager m")
131+
$result = $this->_em->createQuery("SELECT m, MOD(m.salary, 3500) AS amod FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
132132
->getArrayResult();
133133

134134
$this->assertEquals(4, count($result));
@@ -140,7 +140,7 @@ public function testFunctionMod()
140140

141141
public function testFunctionSqrt()
142142
{
143-
$result = $this->_em->createQuery("SELECT m, SQRT(m.salary) AS sqrtsalary FROM Doctrine\Tests\Models\Company\CompanyManager m")
143+
$result = $this->_em->createQuery("SELECT m, SQRT(m.salary) AS sqrtsalary FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
144144
->getArrayResult();
145145

146146
$this->assertEquals(4, count($result));
@@ -152,7 +152,7 @@ public function testFunctionSqrt()
152152

153153
public function testFunctionUpper()
154154
{
155-
$result = $this->_em->createQuery("SELECT m, UPPER(m.name) AS uppername FROM Doctrine\Tests\Models\Company\CompanyManager m")
155+
$result = $this->_em->createQuery("SELECT m, UPPER(m.name) AS uppername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC")
156156
->getArrayResult();
157157

158158
$this->assertEquals(4, count($result));
@@ -186,7 +186,7 @@ public function testFunctionTrim()
186186
{
187187
$dql = "SELECT m, TRIM(TRAILING '.' FROM m.name) AS str1, ".
188188
" TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 ".
189-
"FROM Doctrine\Tests\Models\Company\CompanyManager m";
189+
"FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC";
190190

191191
$result = $this->_em->createQuery($dql)->getArrayResult();
192192

@@ -207,7 +207,7 @@ public function testFunctionTrim()
207207

208208
public function testOperatorAdd()
209209
{
210-
$result = $this->_em->createQuery('SELECT m, m.salary+2500 AS add FROM Doctrine\Tests\Models\Company\CompanyManager m')
210+
$result = $this->_em->createQuery('SELECT m, m.salary+2500 AS add FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
211211
->getResult();
212212

213213
$this->assertEquals(4, count($result));
@@ -219,7 +219,7 @@ public function testOperatorAdd()
219219

220220
public function testOperatorSub()
221221
{
222-
$result = $this->_em->createQuery('SELECT m, m.salary-2500 AS sub FROM Doctrine\Tests\Models\Company\CompanyManager m')
222+
$result = $this->_em->createQuery('SELECT m, m.salary-2500 AS sub FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
223223
->getResult();
224224

225225
$this->assertEquals(4, count($result));
@@ -231,7 +231,7 @@ public function testOperatorSub()
231231

232232
public function testOperatorMultiply()
233233
{
234-
$result = $this->_em->createQuery('SELECT m, m.salary*2 AS op FROM Doctrine\Tests\Models\Company\CompanyManager m')
234+
$result = $this->_em->createQuery('SELECT m, m.salary*2 AS op FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
235235
->getResult();
236236

237237
$this->assertEquals(4, count($result));
@@ -246,7 +246,7 @@ public function testOperatorMultiply()
246246
*/
247247
public function testOperatorDiv()
248248
{
249-
$result = $this->_em->createQuery('SELECT m, (m.salary/0.5) AS op FROM Doctrine\Tests\Models\Company\CompanyManager m')
249+
$result = $this->_em->createQuery('SELECT m, (m.salary/0.5) AS op FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC')
250250
->getResult();
251251

252252
$this->assertEquals(4, count($result));

0 commit comments

Comments
 (0)