Skip to content

Commit dfd1413

Browse files
jessarcherjessarcher
authored
[1.x] Add mariadb driver support plus Laravel 11 CI tests (#330)
* Add Laravel 11 CI tests * Fix CI database authentication * Add mariadb driver support
1 parent 6fc88b3 commit dfd1413

File tree

5 files changed

+36
-25
lines changed

5 files changed

+36
-25
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ jobs:
1717
mysql:
1818
image: mysql:5.7
1919
env:
20-
MYSQL_ALLOW_EMPTY_PASSWORD: yes
21-
MYSQL_DATABASE: forge
20+
MYSQL_RANDOM_ROOT_PASSWORD: yes
21+
MYSQL_DATABASE: pulse
22+
MYSQL_USER: pulse
23+
MYSQL_PASSWORD: password
2224
ports:
2325
- 3306:3306
2426
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -32,7 +34,7 @@ jobs:
3234
fail-fast: true
3335
matrix:
3436
php: [8.1, 8.2, 8.3]
35-
laravel: [10]
37+
laravel: [10, 11]
3638
stability: [prefer-lowest, prefer-stable]
3739

3840
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MySQL 5.7
@@ -61,17 +63,22 @@ jobs:
6163
run: vendor/bin/pest
6264
env:
6365
DB_CONNECTION: mysql
64-
DB_USERNAME: root
66+
DB_DATABASE: pulse
67+
DB_USERNAME: pulse
68+
DB_PASSWORD: password
69+
DB_COLLATION: utf8mb4_unicode_ci
6570

6671
mariadb:
6772
runs-on: ubuntu-22.04
6873

6974
services:
7075
mysql:
71-
image: mariadb:10.5
76+
image: mariadb:10
7277
env:
73-
MYSQL_ALLOW_EMPTY_PASSWORD: yes
74-
MYSQL_DATABASE: forge
78+
MYSQL_RANDOM_ROOT_PASSWORD: yes
79+
MYSQL_DATABASE: pulse
80+
MYSQL_USER: pulse
81+
MYSQL_PASSWORD: password
7582
ports:
7683
- 3306:3306
7784
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -85,10 +92,10 @@ jobs:
8592
fail-fast: true
8693
matrix:
8794
php: [8.3]
88-
laravel: [10]
95+
laravel: [11]
8996
stability: [prefer-stable]
9097

91-
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MariaDB 10.5
98+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MariaDB 10
9299

93100
steps:
94101
- name: Checkout code
@@ -113,8 +120,10 @@ jobs:
113120
- name: Execute tests
114121
run: vendor/bin/pest
115122
env:
116-
DB_CONNECTION: mysql
117-
DB_USERNAME: root
123+
DB_CONNECTION: mariadb
124+
DB_DATABASE: pulse
125+
DB_USERNAME: pulse
126+
DB_PASSWORD: password
118127

119128
pgsql:
120129
runs-on: ubuntu-22.04
@@ -123,8 +132,8 @@ jobs:
123132
postgresql:
124133
image: postgres:14
125134
env:
126-
POSTGRES_DB: forge
127-
POSTGRES_USER: forge
135+
POSTGRES_DB: pulse
136+
POSTGRES_USER: pulse
128137
POSTGRES_PASSWORD: password
129138
ports:
130139
- 5432:5432
@@ -139,7 +148,7 @@ jobs:
139148
fail-fast: true
140149
matrix:
141150
php: [8.3]
142-
laravel: [10]
151+
laravel: [11]
143152
stability: [prefer-stable]
144153

145154
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - PostgreSQL 14
@@ -169,6 +178,8 @@ jobs:
169178
run: vendor/bin/pest
170179
env:
171180
DB_CONNECTION: pgsql
181+
DB_DATABASE: pulse
182+
DB_USERNAME: pulse
172183
DB_PASSWORD: password
173184

174185
sqlite:
@@ -185,7 +196,7 @@ jobs:
185196
fail-fast: true
186197
matrix:
187198
php: [8.3]
188-
laravel: [10]
199+
laravel: [11]
189200
stability: [prefer-stable]
190201

191202
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - SQLite

‎database/migrations/2023_06_07_000001_create_pulse_tables.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function up(): void
2121
$table->string('type');
2222
$table->mediumText('key');
2323
match ($this->driver()) {
24-
'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
24+
'mariadb', 'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
2525
'pgsql' => $table->uuid('key_hash')->storedAs('md5("key")::uuid'),
2626
'sqlite' => $table->string('key_hash'),
2727
};
@@ -38,7 +38,7 @@ public function up(): void
3838
$table->string('type');
3939
$table->mediumText('key');
4040
match ($this->driver()) {
41-
'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
41+
'mariadb', 'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
4242
'pgsql' => $table->uuid('key_hash')->storedAs('md5("key")::uuid'),
4343
'sqlite' => $table->string('key_hash'),
4444
};
@@ -57,7 +57,7 @@ public function up(): void
5757
$table->string('type');
5858
$table->mediumText('key');
5959
match ($this->driver()) {
60-
'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
60+
'mariadb', 'mysql' => $table->char('key_hash', 16)->charset('binary')->virtualAs('unhex(md5(`key`))'),
6161
'pgsql' => $table->uuid('key_hash')->storedAs('md5("key")::uuid'),
6262
'sqlite' => $table->string('key_hash'),
6363
};

‎src/Storage/DatabaseStorage.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protected function upsertCount(array $values): int
182182
['bucket', 'period', 'type', 'aggregate', 'key_hash'],
183183
[
184184
'value' => match ($driver = $this->connection()->getDriverName()) {
185-
'mysql' => new Expression('`value` + values(`value`)'),
185+
'mariadb', 'mysql' => new Expression('`value` + values(`value`)'),
186186
'pgsql', 'sqlite' => new Expression('"pulse_aggregates"."value" + "excluded"."value"'),
187187
default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
188188
},
@@ -202,7 +202,7 @@ protected function upsertMin(array $values): int
202202
['bucket', 'period', 'type', 'aggregate', 'key_hash'],
203203
[
204204
'value' => match ($driver = $this->connection()->getDriverName()) {
205-
'mysql' => new Expression('least(`value`, values(`value`))'),
205+
'mariadb', 'mysql' => new Expression('least(`value`, values(`value`))'),
206206
'pgsql' => new Expression('least("pulse_aggregates"."value", "excluded"."value")'),
207207
'sqlite' => new Expression('min("pulse_aggregates"."value", "excluded"."value")'),
208208
default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
@@ -223,7 +223,7 @@ protected function upsertMax(array $values): int
223223
['bucket', 'period', 'type', 'aggregate', 'key_hash'],
224224
[
225225
'value' => match ($driver = $this->connection()->getDriverName()) {
226-
'mysql' => new Expression('greatest(`value`, values(`value`))'),
226+
'mariadb', 'mysql' => new Expression('greatest(`value`, values(`value`))'),
227227
'pgsql' => new Expression('greatest("pulse_aggregates"."value", "excluded"."value")'),
228228
'sqlite' => new Expression('max("pulse_aggregates"."value", "excluded"."value")'),
229229
default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
@@ -244,7 +244,7 @@ protected function upsertSum(array $values): int
244244
['bucket', 'period', 'type', 'aggregate', 'key_hash'],
245245
[
246246
'value' => match ($driver = $this->connection()->getDriverName()) {
247-
'mysql' => new Expression('`value` + values(`value`)'),
247+
'mariadb', 'mysql' => new Expression('`value` + values(`value`)'),
248248
'pgsql', 'sqlite' => new Expression('"pulse_aggregates"."value" + "excluded"."value"'),
249249
default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
250250
},
@@ -263,7 +263,7 @@ protected function upsertAvg(array $values): int
263263
$values,
264264
['bucket', 'period', 'type', 'aggregate', 'key_hash'],
265265
match ($driver = $this->connection()->getDriverName()) {
266-
'mysql' => [
266+
'mariadb', 'mysql' => [
267267
'value' => new Expression('(`value` * `count` + (values(`value`) * values(`count`))) / (`count` + values(`count`))'),
268268
'count' => new Expression('`count` + values(`count`)'),
269269
],

‎src/Support/PulseMigration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getConnection(): ?string
2424
*/
2525
protected function shouldRun(): bool
2626
{
27-
if (in_array($this->driver(), ['mysql', 'pgsql', 'sqlite'])) {
27+
if (in_array($this->driver(), ['mariadb', 'mysql', 'pgsql', 'sqlite'])) {
2828
return true;
2929
}
3030

‎tests/Pest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
function keyHash(string $string): string
103103
{
104104
return match (DB::connection()->getDriverName()) {
105-
'mysql' => hex2bin(md5($string)),
105+
'mariadb', 'mysql' => hex2bin(md5($string)),
106106
'pgsql' => Uuid::fromString(md5($string)),
107107
'sqlite' => md5($string),
108108
};

0 commit comments

Comments
 (0)