Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mariadb 10.3 + mysql 8 to Drone, remove 10.2 workarounds #33255

Merged
merged 5 commits into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ pipeline:

services:
mariadb:
image: mariadb:10.2
image: ${MARIADB_IMAGE=mariadb:10.2}
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
Expand All @@ -434,7 +434,7 @@ services:
DB_TYPE: mariadb

mysql:
image: mysql:5.5
image: ${MYSQL_IMAGE=mysql:5.5}
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
Expand All @@ -444,16 +444,18 @@ services:
matrix:
DB_TYPE: mysql

mysqlmb4:
image: mysql:5.7
mysql8:
image: ${MYSQL_IMAGE=mysql:8.0}
# see http://php.net/manual/en/mysqli.requirements.php
command: --default-authentication-plugin=mysql_native_password
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=owncloud
- MYSQL_ROOT_PASSWORD=owncloud
when:
matrix:
DB_TYPE: mysqlmb4
DB_TYPE: mysql8

postgres:
image: ${POSTGRES_IMAGE=postgres:9.4}
Expand Down Expand Up @@ -602,8 +604,17 @@ matrix:
INSTALL_SERVER: true

- PHP_VERSION: 7.1
DB_TYPE: mysqlmb4
DB_TYPE: mysql
# mb4 support, with innodb_file_format=Barracuda
MYSQL_IMAGE: mysql:5.7
TEST_SUITE: phpunit
INSTALL_SERVER: true

- PHP_VERSION: 7.1
# mb4 support by default
DB_TYPE: mysql8
TEST_SUITE: phpunit
COVERAGE: false
INSTALL_SERVER: true

# - PHP_VERSION: 7.1
Expand All @@ -625,6 +636,14 @@ matrix:
COVERAGE: true
INSTALL_SERVER: true

- PHP_VERSION: 7.1
DB_TYPE: mariadb
# mb4 support by default
MARIADB_IMAGE: mariadb:10.3
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true

- PHP_VERSION: 7.1
DB_TYPE: oracle
TEST_SUITE: phpunit
Expand Down
4 changes: 0 additions & 4 deletions lib/private/DB/ConnectionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ public function getConnection($type, $additionalConnectionParams) {
case 'mysql':
$eventManager->addEventSubscriber(
new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
$eventManager->addEventListener(
Events::onSchemaColumnDefinition,
new MySqlSchemaColumnDefinitionListener()
);
break;
case 'oci':
$eventManager->addEventSubscriber(new OracleSessionInit);
Expand Down
244 changes: 0 additions & 244 deletions lib/private/DB/MySqlSchemaColumnDefinitionListener.php

This file was deleted.

Loading