OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade deps for MSSQL tests

Browse Source
This commit is contained in:
Alejandro Celaya
2023-02-12 19:07:07 +01:00
parent 49b6063501
commit e48d0f4f0c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/infra/ci/install-ms-odbc.sh
View File

@@ -3,7 +3,7 @@
set -ex set -ex
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 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 apt-get update
ACCEPT_EULA=Y apt-get install msodbcsql17 ACCEPT_EULA=Y apt-get install msodbcsql18
apt-get install unixodbc-dev apt-get install unixodbc-dev

4
module/Core/src/Tag/Repository/TagRepository.php
View File

@@ -64,13 +64,13 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
? $commonJoinCondition ? $commonJoinCondition
: $visitsSubQuery->expr()->and( : $visitsSubQuery->expr()->and(
$commonJoinCondition, $commonJoinCondition,
$visitsSubQuery->expr()->eq('v.potential_bot', $conn->quote('0')) $visitsSubQuery->expr()->eq('v.potential_bot', $conn->quote('0')),
); );
return $visitsSubQuery return $visitsSubQuery
->select('st.tag_id AS tag_id', 'COUNT(DISTINCT v.id) AS ' . $aggregateAlias) ->select('st.tag_id AS tag_id', 'COUNT(DISTINCT v.id) AS ' . $aggregateAlias)
->from('visits', 'v') ->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')) ->join('s', 'short_urls_in_tags', 'st', $visitsSubQuery->expr()->eq('st.short_url_id', 's.id'))
->groupBy('st.tag_id'); ->groupBy('st.tag_id');
}; };