Fix segmentMatchNONE system test for MySQL 8.0 (#135)

* Fix segmentMatchNONE test for MySQL 8.0

Comparing date/time segments against the placeholder string 'campaign'
(e.g. visitEndServerDate != 'campaign') is rejected by MySQL 8.0 as an
invalid DATE value; MySQL 5.7 tolerated it. Give each date/time segment a
valid, type-appropriate value instead - a date for DATE() segments and an
integer for the HOUR()/MINUTE()/YEAR()/... extractions - so they stay
covered and the query runs on MySQL 8.0. The matched result is unchanged
(the segment still matches no visits via the impossible deviceType condition).

* Run plugin tests against MySQL 8.0 and MariaDB 10.6

The workflow inherited the shared action's MySQL 5.7 default, which is below
Matomo's new minimum. Pin the database-backed jobs to the supported floor:
PluginTests now runs a MySQL 8.0 + MariaDB 10.6 matrix, and the UI job runs
on MySQL 8.0.

* Only upload plugin test artifacts for the MySQL matrix leg

PluginTests runs a MySQL + MariaDB matrix; the upload-artifacts condition
matched both legs and uploaded twice. Restrict the upload to the MySQL leg.

Author: sgiehl

.github/workflows/matomo-tests.yml

@@ -39,6 +39,9 @@ jobs:
       matrix:
         php: [ '8.1', '8.5' ]
         target: ['minimum_required_matomo', 'maximum_supported_matomo']
+        database:
+          - { engine: 'Mysql', version: '8.0' }
+          - { engine: 'Mariadb', version: '10.6' }
     steps:
       - uses: actions/checkout@v3
         with:
@@ -52,9 +55,11 @@ jobs:
           plugin-name: 'CustomVariables'
           php-version: ${{ matrix.php }}
           test-type: 'PluginTests'
+          mysql-engine: ${{ matrix.database.engine }}
+          mysql-version: ${{ matrix.database.version }}
           matomo-test-branch: ${{ matrix.target }}
           artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
-          upload-artifacts: ${{ matrix.php == '8.1' && matrix.target == 'maximum_supported_matomo' }}
+          upload-artifacts: ${{ matrix.php == '8.1' && matrix.target == 'maximum_supported_matomo' && matrix.database.engine == 'Mysql' }}
   UI:
     runs-on: ubuntu-24.04
     steps:
@@ -70,5 +75,7 @@ jobs:
           test-type: 'UI'
           php-version: '8.1'
           node-version: '16'
+          mysql-engine: 'Mysql'
+          mysql-version: '8.0'
           artifacts-pass: ${{ secrets.ARTIFACTS_PASS }}
           upload-artifacts: true

tests/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php

@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\CustomVariables\tests\System;
 
+use Piwik\Columns\Dimension;
 use Piwik\Plugins\API\tests\System\AutoSuggestAPITest;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Plugins\CustomVariables\tests\Fixtures\TwoVisitsWithCustomVariables;
@@ -63,9 +64,15 @@ public function getSegmentToTest()
         $this->assertGreaterThan($minimumExpectedSegmentsCount, count($segments));
         $segmentExpression = array();
 
+        $temporalSegmentValues = self::getTemporalSegmentValues();
+
         $seenVisitorId = false;
         foreach ($segments as $segment) {
-            $value = 'campaign';
+            // Date/time segments can't be compared against an arbitrary string: MySQL 8.0 rejects
+            // e.g. "visitEndServerDate != 'campaign'" as an invalid DATE value (5.7 tolerated it).
+            // Give them a valid, type-appropriate value (a date for DATE() segments, a number for
+            // the HOUR()/MINUTE()/YEAR()/... integer extractions) so they stay covered.
+            $value = $temporalSegmentValues[$segment] ?? 'campaign';
             if ($segment == 'visitorId') {
                 $seenVisitorId = true;
                 $value = '34c31e04394bdc63';
@@ -107,6 +114,42 @@ public static function getOutputPrefix()
         return 'twoVisitsWithCustomVariables_segmentMatchNONE';
     }
 
+    /**
+     * Returns a valid comparison value for every non-internal segment backed by a date/time typed
+     * dimension, keyed by segment name.
+     *
+     * These segments map to SQL that expects either a date (e.g. DATE(...)) or an integer (the
+     * HOUR()/MINUTE()/YEAR()/... extractions), so an arbitrary string like "campaign" produces an
+     * invalid DATE value error on MySQL 8.0. The returned values are valid for the respective
+     * comparison.
+     */
+    private static function getTemporalSegmentValues(): array
+    {
+        $temporalTypes = [
+            Dimension::TYPE_DATE,
+            Dimension::TYPE_DATETIME,
+            Dimension::TYPE_TIME,
+            Dimension::TYPE_TIMESTAMP,
+        ];
+
+        $values = [];
+        foreach (Dimension::getAllDimensions() as $dimension) {
+            if (!in_array($dimension->getType(), $temporalTypes, true)) {
+                continue;
+            }
+
+            foreach ($dimension->getSegments() as $segment) {
+                $isIntegerExtraction = (bool) preg_match(
+                    '/^\s*(HOUR|MINUTE|SECOND|DAYOFWEEK|DAYOFMONTH|DAYOFYEAR|WEEKOFYEAR|WEEK|MONTH|QUARTER|YEAR)\s*\(/i',
+                    $segment->getSqlSegment()
+                );
+                $values[$segment->getSegment()] = $isIntegerExtraction ? '99' : '2099-12-31';
+            }
+        }
+
+        return $values;
+    }
+
     public static function getPathToTestDirectory()
     {
         return dirname(__FILE__);