From e48d0f4f0ce6c2212715ba12d7bd4141314846f2 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 12 Feb 2023 19:07:07 +0100 Subject: [PATCH] Upgrade deps for MSSQL tests --- data/infra/ci/install-ms-odbc.sh | 4 ++-- module/Core/src/Tag/Repository/TagRepository.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/infra/ci/install-ms-odbc.sh b/data/infra/ci/install-ms-odbc.sh index 1efdf8a3..f8226db8 100755 --- a/data/infra/ci/install-ms-odbc.sh +++ b/data/infra/ci/install-ms-odbc.sh @@ -3,7 +3,7 @@ set -ex curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - -curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list apt-get update -ACCEPT_EULA=Y apt-get install msodbcsql17 +ACCEPT_EULA=Y apt-get install msodbcsql18 apt-get install unixodbc-dev diff --git a/module/Core/src/Tag/Repository/TagRepository.php b/module/Core/src/Tag/Repository/TagRepository.php index 740a79ae..4e9eafac 100644 --- a/module/Core/src/Tag/Repository/TagRepository.php +++ b/module/Core/src/Tag/Repository/TagRepository.php @@ -64,13 +64,13 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito ? $commonJoinCondition : $visitsSubQuery->expr()->and( $commonJoinCondition, - $visitsSubQuery->expr()->eq('v.potential_bot', $conn->quote('0')) + $visitsSubQuery->expr()->eq('v.potential_bot', $conn->quote('0')), ); return $visitsSubQuery ->select('st.tag_id AS tag_id', 'COUNT(DISTINCT v.id) AS ' . $aggregateAlias) ->from('visits', 'v') - ->join('v', 'short_urls', 's', $visitsJoin) + ->join('v', 'short_urls', 's', $visitsJoin) // @phpstan-ignore-line ->join('s', 'short_urls_in_tags', 'st', $visitsSubQuery->expr()->eq('st.short_url_id', 's.id')) ->groupBy('st.tag_id'); };