aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-11 15:40:29 +0200
committerGitHub <noreply@github.com>2016-10-11 15:40:29 +0200
commit9785343d6ac879b5e150b128f97b82e788a2df09 (patch)
treeb0df6c63d7f8909f576f3c86283575bcb07e14ea
parentcc4b51490e5ad1c950c543eed6e6cd5285a1af5d (diff)
parentb1641cc113945700e29bc05d15e964f26e799020 (diff)
downloadnextcloud-server-9785343d6ac879b5e150b128f97b82e788a2df09.tar.gz
nextcloud-server-9785343d6ac879b5e150b128f97b82e788a2df09.zip
Merge pull request #1682 from nextcloud/bump_doctrine
Bump doctrine
m---------3rdparty0
-rw-r--r--tests/lib/DB/QueryBuilder/QueryBuilderTest.php20
2 files changed, 10 insertions, 10 deletions
diff --git a/3rdparty b/3rdparty
-Subproject cc365d1299570f1d0ca2e4e1eede5ead15dc9da
+Subproject 106b98063b183a721c2863daea519d55a5da1d0
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index de8f84ac345..3c10d25c535 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -740,7 +740,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT `column` FROM WHERE ' . $expectedQuery,
+ 'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -765,7 +765,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT `column` FROM WHERE ' . $expectedQuery,
+ 'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -797,7 +797,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT `column` FROM WHERE ' . $expectedQuery,
+ 'SELECT `column` WHERE ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -829,7 +829,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT `column` FROM GROUP BY ' . $expectedQuery,
+ 'SELECT `column` GROUP BY ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -862,7 +862,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT `column` FROM GROUP BY ' . $expectedQuery,
+ 'SELECT `column` GROUP BY ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -957,7 +957,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT FROM ' . $expectedQuery,
+ 'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -999,7 +999,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT FROM ' . $expectedQuery,
+ 'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -1041,7 +1041,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT FROM ' . $expectedQuery,
+ 'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -1071,7 +1071,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT FROM ' . $expectedQuery,
+ 'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}
@@ -1109,7 +1109,7 @@ class QueryBuilderTest extends \Test\TestCase {
);
$this->assertSame(
- 'SELECT FROM ' . $expectedQuery,
+ 'SELECT ' . $expectedQuery,
$this->queryBuilder->getSQL()
);
}