Merge pull request #4835 from cakephp/issue-4830

Remove AS from table aliases.
cakephp · Oct 11, 2014 · 797ce52 · 797ce52
2 parents 060a41c + 87d6537
commit 797ce52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Database/QueryCompiler.php b/src/Database/QueryCompiler.php
@@ -175,7 +175,7 @@ protected function _buildFromPart($parts, $query, $generator) {
 		$parts = $this->_stringifyExpressions($parts, $generator);
 		foreach ($parts as $k => $p) {
 			if (!is_numeric($k)) {
-				$p = $p . ' AS ' . $k;
+				$p = $p . ' ' . $k;
 			}
 			$normalized[] = $p;
 		}

diff --git a/tests/TestCase/Database/Driver/SqlserverTest.php b/tests/TestCase/Database/Driver/SqlserverTest.php
@@ -182,7 +182,7 @@ public function testSelectLimitOldServer() {
 			->from('articles')
 			->offset(10);
 		$expected = 'SELECT * FROM (SELECT id, title, (ROW_NUMBER() OVER (ORDER BY (SELECT NULL))) AS [_cake_page_rownum_] ' .
-			'FROM articles) AS _cake_paging_ ' .
+			'FROM articles) _cake_paging_ ' .
 			'WHERE _cake_paging_._cake_page_rownum_ > :c0';
 		$this->assertEquals($expected, $query->sql());
 
@@ -192,7 +192,7 @@ public function testSelectLimitOldServer() {
 			->order(['id'])
 			->offset(10);
 		$expected = 'SELECT * FROM (SELECT id, title, (ROW_NUMBER() OVER (ORDER BY id)) AS [_cake_page_rownum_] ' .
-			'FROM articles) AS _cake_paging_ ' .
+			'FROM articles) _cake_paging_ ' .
 			'WHERE _cake_paging_._cake_page_rownum_ > :c0';
 		$this->assertEquals($expected, $query->sql());
 
@@ -204,7 +204,7 @@ public function testSelectLimitOldServer() {
 			->limit(10)
 			->offset(50);
 		$expected = 'SELECT * FROM (SELECT id, title, (ROW_NUMBER() OVER (ORDER BY id)) AS [_cake_page_rownum_] ' .
-			'FROM articles WHERE title = :c0) AS _cake_paging_ ' .
+			'FROM articles WHERE title = :c0) _cake_paging_ ' .
 			'WHERE (_cake_paging_._cake_page_rownum_ > :c1 AND _cake_paging_._cake_page_rownum_ <= :c2)';
 		$this->assertEquals($expected, $query->sql());
 	}

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2560,11 +2560,11 @@ public function testQuotingFromAndAlias() {
 
 		$query = new Query($this->connection);
 		$sql = $query->select('*')->from(['foo' => 'something'])->sql();
-		$this->assertQuotedQuery('FROM <something> AS <foo>$', $sql);
+		$this->assertQuotedQuery('FROM <something> <foo>$', $sql);
 
 		$query = new Query($this->connection);
 		$sql = $query->select('*')->from(['foo' => $query->newExpr('bar')])->sql();
-		$this->assertQuotedQuery('FROM \(bar\) AS <foo>$', $sql);
+		$this->assertQuotedQuery('FROM \(bar\) <foo>$', $sql);
 	}
 
 /**