[misc] use DOCKER_LOGIN as user if secret available

Author: rusher

.github/workflows/ci.yml

@@ -25,10 +25,10 @@ jobs:
     if: |
       github.event_name != 'schedule' ||
       github.ref == 'refs/heads/main' ||
-      github.ref == 'refs/heads/develop' ||
-      github.ref == 'refs/heads/maintenance/3.2' ||
-      github.ref == 'refs/heads/maintenance/3.3' ||
-      github.ref == 'refs/heads/maintenance/3.4'
+      startsWith(github.ref, 'refs/heads/develop')  ||
+      startsWith(github.ref, 'refs/heads/maintenance/3.2') ||
+      startsWith(github.ref, 'refs/heads/maintenance/3.3') ||
+      startsWith(github.ref, 'refs/heads/maintenance/3.4')
     outputs:
       matrix: ${{ steps.set-matrix.outputs.final-matrix }}
     steps:
@@ -62,8 +62,8 @@ jobs:
           test-db-database: ${{ env.TEST_DB_DATABASE }}
           test-db-port: ${{ env.TEST_DB_PORT }}
           additional-conf: ${{ matrix.additional-conf || '' }}
-          registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_PWD != '' && 'mariadbtest' || '') }}
-          registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_PWD }}
+          registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_TOKEN != '' && secrets.DOCKER_LOGIN || '') }}
+          registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_TOKEN }}
           os: ${{ matrix.os }}
 
       - uses: actions/setup-node@v4

test/integration/query-callback.test.js

@@ -518,7 +518,7 @@ describe.concurrent('basic query callback', () => {
     if (shareConn.info.isMariaDB() && shareConn.info.hasMinVersion(10, 1, 2)) {
       const elapse = Date.now() - initTime;
       assert.isOk(elapse < 10000, 'elapse time was ' + elapse + ' but must be less around 100');
-      assert.isTrue(err.message.includes('Query execution was interrupted (max_statement_time exceeded)'));
+      assert.isTrue(err.message.includes('was interrupted'));
       assert.equal(err.errno, 1969);
       assert.equal(err.sqlState, 70100);
       assert.equal(err.code, 'ER_STATEMENT_TIMEOUT');

test/integration/query.test.js

@@ -422,7 +422,7 @@ describe.concurrent('basic query', () => {
     if (shareConn.info.isMariaDB() && shareConn.info.hasMinVersion(10, 1, 2)) {
       const elapse = Date.now() - initTime;
       assert.isOk(elapse < 10000, 'elapse time was ' + elapse + ' but must be less around 100');
-      assert.isTrue(err.message.includes('Query execution was interrupted (max_statement_time exceeded)'));
+      assert.isTrue(err.message.includes('was interrupted'));
       assert.equal(err.errno, 1969);
       assert.equal(err.sqlState, 70100);
       assert.equal(err.code, 'ER_STATEMENT_TIMEOUT');