diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-19 09:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 09:25:46 +0100 |
| commit | eb3cf6c5ec4381a69a623ccd97a91173f799d3a2 (patch) | |
| tree | f02ef5485926045302a96223371569cb9c560920 | |
| parent | deca6117baaca700bd06b02aa6d9647f5b8551f2 (diff) | |
| parent | 8c27f74a63c6eed61b859016757d0c74a80b044d (diff) | |
| download | nextcloud-server-eb3cf6c5ec4381a69a623ccd97a91173f799d3a2.tar.gz nextcloud-server-eb3cf6c5ec4381a69a623ccd97a91173f799d3a2.zip | |
Merge pull request #30129 from nextcloud/mdb10.6-pipeline
| -rw-r--r-- | .drone.yml | 36 | ||||
| -rw-r--r-- | config/config.sample.php | 2 | ||||
| -rw-r--r-- | lib/private/DB/ConnectionFactory.php | 1 | ||||
| -rw-r--r-- | lib/private/Repair/Collation.php | 5 |
4 files changed, 37 insertions, 7 deletions
diff --git a/.drone.yml b/.drone.yml index c01f4188a93..4825a6b1a7f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -362,6 +362,42 @@ trigger: --- kind: pipeline +name: mariadb10.6-php8.0 + +steps: +- name: submodules + image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest + commands: + - git submodule update --init +- name: mariadb10.6-php8.0 + image: ghcr.io/nextcloud/continuous-integration-php8.0:latest + commands: + - bash tests/drone-run-php-tests.sh || exit 0 + - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb + +services: +- name: cache + image: ghcr.io/nextcloud/continuous-integration-redis:latest +- name: mariadb + image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6continuous-integration-mariadb-10.6:10.6 + environment: + MYSQL_ROOT_PASSWORD: owncloud + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: owncloud + MYSQL_DATABASE: oc_autotest + tmpfs: + - /var/lib/mysql + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push + +--- +kind: pipeline name: mysql8.0-php7.4 steps: diff --git a/config/config.sample.php b/config/config.sample.php index 3eadbc61290..21ccab6732c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1572,7 +1572,7 @@ $CONFIG = [ * Tables will be created with * * character set: utf8mb4 * * collation: utf8mb4_bin - * * row_format: compressed + * * row_format: dynamic * * See: * https://dev.mysql.com/doc/refman/5.7/en/charset-unicode-utf8mb4.html diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index b4c7597f6d4..e9ed5979894 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -228,7 +228,6 @@ class ConnectionFactory { $connectionParams['defaultTableOptions'] = [ 'collate' => 'utf8mb4_bin', 'charset' => 'utf8mb4', - 'row_format' => 'compressed', 'tablePrefix' => $connectionParams['tablePrefix'] ]; } diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index 01773f7e69f..e949c261b80 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -90,11 +90,6 @@ class Collation implements IRepairStep { } $output->info("Change collation for $table ..."); - if ($characterSet === 'utf8mb4') { - // need to set row compression first - $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;'); - $query->execute(); - } $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;'); try { $query->execute(); |