Fix for postgres

Author: Nil Portugues Caldero

src/Builder/MySqlBuilder.php

@@ -31,7 +31,7 @@ public function writeColumnName(Column $column)
  return '*';
  }
 
- if (false !== strpos($column->getName(), "(")) {
+ if (false !== strpos($column->getName(), '(')) {
  return parent::writeColumnName($column);
  }
 

src/Manipulation/ColumnQuery.php

@@ -200,7 +200,7 @@ public function count($columnName = '*', $alias = '')
  $count .= ')';
 
  if (isset($alias) && \strlen($alias) > 0) {
- $count .= " AS '{$alias}'";
+ $count .= ' AS "'.$alias.'"';
  }
 
  $this->columns = array($count);

src/Syntax/Where.php

@@ -417,8 +417,8 @@ public function matchWithQueryExpansion(array $columns, array $values)
  }
 
  /**
- * @param string  $column
- * @param integer[] $values
+ * @param string $column
+ * @param int[]  $values
  *
  * @return $this
  */
@@ -430,8 +430,8 @@ public function in($column, array $values)
  }
 
  /**
- * @param string  $column
- * @param integer[] $values
+ * @param string $column
+ * @param int[]  $values
  *
  * @return $this
  */

tests/Builder/GenericBuilderTest.php

@@ -211,7 +211,7 @@ public function itShouldOutputHumanReadableQuery()
  LIMIT
  :v2,
  :v3
- ) AS 'user_role',
+ ) AS "user_role",
  (
  SELECT
  role.role_name
@@ -222,7 +222,7 @@ public function itShouldOutputHumanReadableQuery()
  LIMIT
  :v5,
  :v6
- ) AS 'role'
+ ) AS "role"
 FROM
  user
 WHERE

tests/Builder/Syntax/ColumnWriterTest.php

@@ -93,7 +93,7 @@ public function itShouldWriteColumnWithAlias()
 
  $result = $this->columnWriter->writeColumnWithAlias($column);
 
- $this->assertSame('user.user_id AS \'userId\'', $result);
+ $this->assertSame('user.user_id AS "userId"', $result);
  }
 
  /**
@@ -118,8 +118,8 @@ public function itShouldBeAbleToWriteColumnAsASelectStatement()
  ->equals('user_id', 4);
 
  $expected = 'SELECT user.user_id, user.username, '.
- '(SELECT role.role_name FROM role WHERE (role.role_id = :v1) LIMIT :v2, :v3) AS \'user_role\', '.
- '(SELECT role.role_name FROM role WHERE (role.role_id = :v4) LIMIT :v5, :v6) AS \'role\' '.
+ '(SELECT role.role_name FROM role WHERE (role.role_id = :v1) LIMIT :v2, :v3) AS "user_role", '.
+ '(SELECT role.role_name FROM role WHERE (role.role_id = :v4) LIMIT :v5, :v6) AS "role" '.
  'FROM user WHERE (user.user_id = :v7)';
 
  $this->assertSame($expected, $this->writer->write($this->query));
@@ -140,7 +140,7 @@ public function itShouldBeAbleToWriteColumnAsAValueStatement()
  ->where()
  ->equals('user_id', 1);
 
- $expected = 'SELECT user.user_id, user.username, :v1 AS \'priority\' FROM user WHERE (user.user_id = :v2)';
+ $expected = 'SELECT user.user_id, user.username, :v1 AS "priority" FROM user WHERE (user.user_id = :v2)';
  $this->assertSame($expected, $this->writer->write($this->query));
 
  $expected = array(':v1' => 10, ':v2' => 1);
@@ -159,7 +159,7 @@ public function itShouldBeAbleToWriteColumnAsAFuncWithBracketsStatement()
  ->where()
  ->equals('user_id', 1);
 
- $expected = 'SELECT user.user_id, user.username, MAX(user_id) AS \'max_id\' FROM user WHERE (user.user_id = :v1)';
+ $expected = 'SELECT user.user_id, user.username, MAX(user_id) AS "max_id" FROM user WHERE (user.user_id = :v1)';
  $this->assertSame($expected, $this->writer->write($this->query));
 
  $expected = array(':v1' => 1);
@@ -178,7 +178,7 @@ public function itShouldBeAbleToWriteColumnAsAFuncWithoutBracketsStatement()
  ->where()
  ->equals('user_id', 1);
 
- $expected = 'SELECT user.user_id, user.username, CURRENT_TIMESTAMP AS \'server_time\' FROM user WHERE (user.user_id = :v1)';
+ $expected = 'SELECT user.user_id, user.username, CURRENT_TIMESTAMP AS "server_time" FROM user WHERE (user.user_id = :v1)';
  $this->assertSame($expected, $this->writer->write($this->query));
 
  $expected = array(':v1' => 1);

tests/Builder/Syntax/SelectWriterTest.php

@@ -190,7 +190,7 @@ public function itShouldAllowColumnAlias()
  )
  );
 
- $expected = "SELECT user.user_id AS 'userId', user.name AS 'username', user.email AS 'email' FROM user";
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email" FROM user';
 
  $this->assertSame($expected, $this->writer->write($this->query));
  }
@@ -228,7 +228,7 @@ public function itShouldAllowColumnOrderUsingColumnAlias()
  ->orderBy('email', OrderBy::DESC);
 
  $expected =
- 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\' FROM '.
+ 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email" FROM '.
  'user ORDER BY user.user_id ASC, user.email DESC';
 
  $this->assertSame($expected, $this->writer->write($this->query));
@@ -309,7 +309,7 @@ public function itShouldBeAbleToDoALeftJoinWithOrderByOnJoinedTable()
  ->leftJoin('news', 'user_id', 'author_id', array('title', 'body', 'created_at', 'updated_at'))
  ->orderBy('created_at', OrderBy::DESC);
 
- $expected = 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\', user.created_at,'.
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email", user.created_at,'.
  ' news.title, news.body, news.created_at, news.updated_at FROM user LEFT JOIN news ON (news.author_id '.
  '= user.user_id) ORDER BY user.user_id DESC, news.created_at DESC';
 
@@ -349,7 +349,7 @@ public function itShouldBeAbleToDoAJoinWithOrderByOnJoinedTable()
  ->join('news', 'user_id', 'author_id', array('title', 'body', 'created_at', 'updated_at'))
  ->orderBy('created_at', OrderBy::DESC);
 
- $expected = 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\', user.created_at,'.
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email", user.created_at,'.
  ' news.title, news.body, news.created_at, news.updated_at FROM user JOIN news ON (news.author_id ='.
  ' user.user_id) ORDER BY user.user_id DESC, news.created_at DESC';
 
@@ -405,7 +405,7 @@ public function itShouldBeAbleToOn()
 
  $this->query->limit(1, 10);
 
- $expected = 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\', user.created_at,'.
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email", user.created_at,'.
  ' news.title, news.body, news.created_at, news.updated_at FROM user JOIN news ON '.
  '(news.author_id = user.user_id) AND (news.author_id = :v1) ORDER BY '.
  'user.user_id DESC, news.created_at DESC LIMIT :v2, :v3';
@@ -469,7 +469,7 @@ public function itShouldBeAbleToCountTotalRowsSettingDefaultColumnWithAlias()
  ->equals('user_id', 1)
  ->equals('user_id', 2);
 
- $expected = 'SELECT COUNT(user.user_id) AS \'total_users\' FROM user GROUP BY user.user_id, user.name HAVING (user.user_id = :v1) AND (user.user_id = :v2)';
+ $expected = 'SELECT COUNT(user.user_id) AS "total_users" FROM user GROUP BY user.user_id, user.name HAVING (user.user_id = :v1) AND (user.user_id = :v2)';
 
  $this->assertSame($expected, $this->writer->write($this->query));
  $expected = array(':v1' => 1, ':v2' => 2);
@@ -496,7 +496,7 @@ public function itShouldBeAbleToGroupByOperator()
  ->equals('user_id', 1)
  ->equals('user_id', 2);
 
- $expected = 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\', user.created_at'.
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email", user.created_at'.
  ' FROM user GROUP BY user.user_id, user.name HAVING (user.user_id = :v1) AND (user.user_id = :v2)';
 
  $this->assertSame($expected, $this->writer->write($this->query));
@@ -545,7 +545,7 @@ public function itShouldBeAbleToSetHavingOperatorToOr()
  ->equals('user_id', 1)
  ->equals('user_id', 2);
 
- $expected = 'SELECT user.user_id AS \'userId\', user.name AS \'username\', user.email AS \'email\', user.created_at'.
+ $expected = 'SELECT user.user_id AS "userId", user.name AS "username", user.email AS "email", user.created_at'.
  ' FROM user GROUP BY user.user_id, user.name HAVING (user.user_id = :v1) OR (user.user_id = :v2)';
 
  $this->assertSame($expected, $this->writer->write($this->query));

tests/Builder/Syntax/WhereWriterTest.php

@@ -529,10 +529,10 @@ public function itShouldAllowWhereConditionAsLiteral()
  $this->query
  ->setTable('user')
  ->where()
- ->asLiteral("(username is not null and status=:status)")
+ ->asLiteral('(username is not null and status=:status)')
  ->notEquals('name', '%N%');
 
- $expected = "SELECT user.* FROM user WHERE (username is not null and status=:status) AND (user.name <> :v1)";
+ $expected = 'SELECT user.* FROM user WHERE (username is not null and status=:status) AND (user.name <> :v1)';
 
  $this->assertSame($expected, $this->writer->write($this->query));
 

tests/Syntax/WhereTest.php

@@ -413,7 +413,7 @@ public function itShouldSetNotExistsCondition()
  */
  public function itShouldReturnLiterals()
  {
- $result = $this->where->asLiteral("(username is not null and status=:status)")->getComparisons();
- $this->assertSame("(username is not null and status=:status)", $result[0]);
+ $result = $this->where->asLiteral('(username is not null and status=:status)')->getComparisons();
+ $this->assertSame('(username is not null and status=:status)', $result[0]);
  }
 }