upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

feat(database): Add option to test for mariadb

Browse source 
There are some behavioral differences that apps may need to check for.
See discussion on #51175 for more info.

This preserves the existing behavior of getDatabaseProvider()

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
This commit is contained in:
Varun Patil 2025-08-03 19:10:09 -07:00 committed by Joas Schilling
parent 1518ded8b1
commit 5ecd3c4b49
No known key found for this signature in database
GPG key ID: F72FA5B49FFA96B0
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/DB/Connection.php
View file

@ -16,6 +16,7 @@ use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Exception\ConnectionLost;
use Doctrine\DBAL\Platforms\MariaDBPlatform;
use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
@ -915,11 +916,13 @@ class Connection extends PrimaryReadReplicaConnection {
}
/**
* @return IDBConnection::PLATFORM_MYSQL|IDBConnection::PLATFORM_ORACLE|IDBConnection::PLATFORM_POSTGRES|IDBConnection::PLATFORM_SQLITE
* @return IDBConnection::PLATFORM_MYSQL|IDBConnection::PLATFORM_ORACLE|IDBConnection::PLATFORM_POSTGRES|IDBConnection::PLATFORM_SQLITE|IDBConnection::PLATFORM_MARIADB
*/
public function getDatabaseProvider(): string {
public function getDatabaseProvider(bool $strict = false): string {
$platform = $this->getDatabasePlatform();
if ($platform instanceof MySQLPlatform) {
if ($strict && $platform instanceof MariaDBPlatform) {
return IDBConnection::PLATFORM_MARIADB;
} elseif ($platform instanceof MySQLPlatform) {
return IDBConnection::PLATFORM_MYSQL;
} elseif ($platform instanceof OraclePlatform) {
return IDBConnection::PLATFORM_ORACLE;

6
lib/private/DB/ConnectionAdapter.php
View file

@ -237,10 +237,10 @@ class ConnectionAdapter implements IDBConnection {
}
/**
* @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE
* @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE|self::PLATFORM_MARIADB
*/
public function getDatabaseProvider(): string {
return $this->inner->getDatabaseProvider();
public function getDatabaseProvider(bool $strict = false): string {
return $this->inner->getDatabaseProvider($strict);
}
/**

2
lib/private/DB/QueryBuilder/QueryBuilder.php
View file

@ -96,6 +96,7 @@ class QueryBuilder implements IQueryBuilder {
return match($this->connection->getDatabaseProvider()) {
IDBConnection::PLATFORM_ORACLE => new OCIExpressionBuilder($this->connection, $this, $this->logger),
IDBConnection::PLATFORM_POSTGRES => new PgSqlExpressionBuilder($this->connection, $this, $this->logger),
IDBConnection::PLATFORM_MARIADB,
IDBConnection::PLATFORM_MYSQL => new MySqlExpressionBuilder($this->connection, $this, $this->logger),
IDBConnection::PLATFORM_SQLITE => new SqliteExpressionBuilder($this->connection, $this, $this->logger),
};
@ -121,6 +122,7 @@ class QueryBuilder implements IQueryBuilder {
return match($this->connection->getDatabaseProvider()) {
IDBConnection::PLATFORM_ORACLE => new OCIFunctionBuilder($this->connection, $this, $this->helper),
IDBConnection::PLATFORM_POSTGRES => new PgSqlFunctionBuilder($this->connection, $this, $this->helper),
IDBConnection::PLATFORM_MARIADB,
IDBConnection::PLATFORM_MYSQL => new FunctionBuilder($this->connection, $this, $this->helper),
IDBConnection::PLATFORM_SQLITE => new SqliteFunctionBuilder($this->connection, $this, $this->helper),
};

13
lib/public/IDBConnection.php
View file

@ -44,6 +44,11 @@ interface IDBConnection {
*/
public const PLATFORM_SQLITE = 'sqlite';
/**
* @since 32.0.0
*/
public const PLATFORM_MARIADB = 'mariadb';
/**
* Gets the QueryBuilder for the connection.
*
@ -357,11 +362,15 @@ interface IDBConnection {
/**
* Returns the database provider name
*
* @link https://github.com/nextcloud/server/issues/30877
*
* @param bool $strict differentiate between database flavors, e.g. MySQL vs MariaDB
* @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE|self::PLATFORM_MARIADB
* @since 32.0.0 Optional parameter $strict was added
* @since 28.0.0
* @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE
*/
public function getDatabaseProvider(): string;
public function getDatabaseProvider(bool $strict = false): string;
/**
* Get the shard definition by name, if configured