From d59891369ddbcdd019413bd1a82e18a7c7a8c919 Mon Sep 17 00:00:00 2001 From: Rolf Staege Date: Thu, 10 Dec 2020 17:12:54 +0100 Subject: [PATCH 1/4] ... --- src/Manipulation/ColumnQuery.php | 2 +- src/Syntax/SyntaxFactory.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Manipulation/ColumnQuery.php b/src/Manipulation/ColumnQuery.php index 8a1ff6d..adf8d8a 100644 --- a/src/Manipulation/ColumnQuery.php +++ b/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); diff --git a/src/Syntax/SyntaxFactory.php b/src/Syntax/SyntaxFactory.php index 21032dc..8c05351 100644 --- a/src/Syntax/SyntaxFactory.php +++ b/src/Syntax/SyntaxFactory.php @@ -60,7 +60,7 @@ public static function createColumn(array &$argument, $table = null) $columnAlias = \array_keys($argument); $columnAlias = $columnAlias[0]; - if (\is_numeric($columnAlias) || \strpos($columnName, '*') !== false) { + if (\is_numeric($columnAlias) || (\strpos($columnName, '*') !== false && \strlen(\trim($columnName)==1))) { $columnAlias = null; } From e66de068b07205f14314882dd9f3010e1e425aee Mon Sep 17 00:00:00 2001 From: roelfsche Date: Thu, 10 Dec 2020 21:13:36 +0100 Subject: [PATCH 2/4] Update SyntaxFactory.php fixed parentheses issue --- src/Syntax/SyntaxFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Syntax/SyntaxFactory.php b/src/Syntax/SyntaxFactory.php index 8c05351..9e812b9 100644 --- a/src/Syntax/SyntaxFactory.php +++ b/src/Syntax/SyntaxFactory.php @@ -60,7 +60,7 @@ public static function createColumn(array &$argument, $table = null) $columnAlias = \array_keys($argument); $columnAlias = $columnAlias[0]; - if (\is_numeric($columnAlias) || (\strpos($columnName, '*') !== false && \strlen(\trim($columnName)==1))) { + if (\is_numeric($columnAlias) || (\strpos($columnName, '*') !== false && \strlen(\trim($columnName))==1)) { $columnAlias = null; } From baf15278ebe9bb046c3cb9c3bc75d40b8d460905 Mon Sep 17 00:00:00 2001 From: roelfsche Date: Thu, 10 Dec 2020 21:17:24 +0100 Subject: [PATCH 3/4] Update ColumnQuery.php --- src/Manipulation/ColumnQuery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Manipulation/ColumnQuery.php b/src/Manipulation/ColumnQuery.php index adf8d8a..8a1ff6d 100644 --- a/src/Manipulation/ColumnQuery.php +++ b/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); From 305e8f7cf8656b39e0e6bebbce16fd5b99fb3c8c Mon Sep 17 00:00:00 2001 From: Rolf Staege Date: Mon, 15 Jan 2024 07:49:50 +0100 Subject: [PATCH 4/4] fix(#74): deprecation warning removed --- src/Syntax/Column.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Syntax/Column.php b/src/Syntax/Column.php index aa244f9..70ddea2 100644 --- a/src/Syntax/Column.php +++ b/src/Syntax/Column.php @@ -112,7 +112,7 @@ public function getAlias() */ public function setAlias($alias) { - if (0 == \strlen($alias)) { + if (empty($alias) || 0 == \strlen($alias)) { $this->alias = null; return $this;