[8.x] MySQL Builds #39415

driesvints · 2021-10-29T17:14:04Z

This PR adds a separate build for MySQL that runs our database integration tests against MySQL 5.7 & MySQL 8.0. What I did was add separate database builds that run our database integration tests to validate that all functionality works in every engine. I've already discovered several places in our tests which were set up incorrectly or validating data incorrectly. I've added comments to each part that got changed to explain why that happened. Feel free to "Resolve conversation" those that are clear and add comments to the ones which you have questions about.

A few follow up PR's that I'd like to make after this is to consolidate how the environment gets set up and data gets refreshed as well as to look in the unit test suite which tests might be able to move to the integration test suite.

Builds for PostgreSQL, MSSQL & MariaDB will be added after this gets merged to keep the scope of this PR small.

driesvints · 2021-10-29T17:15:51Z

tests/Integration/Database/DatabaseTestCase.php

+            $this->artisan('db:wipe', ['--drop-views' => true]);
+        }
+
+        parent::tearDown();


Because we're not running an in-memory database anymore we'll need to wipe the database each time after every test. I want to refactor this to a RefreshDatabase trait later on but for now this is okay.

driesvints · 2021-10-29T17:17:05Z

tests/Integration/Database/EloquentBelongsToManyTest.php

@@ -132,7 +132,7 @@ public function testCustomPivotClass()
        $post->tagsWithCustomPivot()->attach($tag->id);

        $this->assertInstanceOf(PostTagPivot::class, $post->tagsWithCustomPivot[0]->pivot);
-        $this->assertEquals('1507630210', $post->tagsWithCustomPivot[0]->pivot->getAttributes()['created_at']);
+        $this->assertEquals('1507630210', $post->tagsWithCustomPivot[0]->pivot->created_at);


Switch to an accessor instead of relying on SQLite's U date format. We only need to verify that the custom pivot class is properly hydrated so no need to use $dateFormat specifically.

driesvints · 2021-10-29T17:17:34Z

tests/Integration/Database/EloquentBelongsToManyTest.php

-                'created_at' => '1507630210',
-                'updated_at' => '1507630210',
+                'created_at' => '2017-10-10 10:10:10',
+                'updated_at' => '2017-10-10 10:10:10',


Use universal date formats instead of SQLite specific timestamps.

driesvints · 2021-10-29T17:18:49Z

tests/Integration/Database/EloquentWithCountTest.php


-        $this->assertSame('select "one".*, (select count(*) from "two" where "one"."id" = "two"."one_id") as "twos_count" from "one"', $result);
+        $this->assertNull($query->orders);
+        $this->assertSame([], $query->getRawBindings()['order']);


We don't need to verify a specific query, just that the sorting got removed from the subquery.

driesvints · 2021-10-29T17:19:56Z

tests/Integration/Database/SchemaBuilderTest.php

        $blueprint->build($this->getConnection(), new SQLiteGrammar);

        $this->assertArrayHasKey(TinyInteger::NAME, Type::getTypesMap());
        $this->assertSame('tinyinteger', Schema::getColumnType('test', 'test_column'));
-        $this->assertEquals($expected, $statements);


We don't need to check the expected queries as that should be a concern of the Doctrine test suite. Just checking if the test column got renamed is enough.

driesvints · 2021-10-29T17:22:39Z

tests/Integration/Database/QueryBuilderTest.php

@@ -101,7 +101,7 @@ public function testAddSelectWithSubQuery()

    public function testFromWithAlias()
    {
-        $this->assertSame('select * from "posts" as "alias"', DB::table('posts', 'alias')->toSql());
+        $this->assertCount(2, DB::table('posts', 'alias')->select('alias.*')->get());


Actually verify if the aliasing works instead of checking the query.

driesvints · 2021-10-29T17:23:14Z

tests/Integration/Database/SchemaBuilderTest.php


        Schema::dropAllViews();

-        DB::statement('create view "view"("id") as select 1');
+        DB::statement('create view foo (id) as select 1');


Use the universal syntax of creating database views.

driesvints · 2021-10-29T17:30:31Z

@cbl I started working on this ^

driesvints · 2021-11-02T10:49:15Z

tests/Integration/Database/EloquentBelongsToManyTest.php

@@ -48,7 +48,7 @@ protected function setUp(): void

        Schema::create('posts_tags', function (Blueprint $table) {
            $table->integer('post_id');
-            $table->integer('tag_id');
+            $table->string('tag_id');


In one test we're storing the name as a value so this needs to be a string. SQLite accepted this but it's in fact an incorrect column type for these tests.

driesvints · 2021-11-02T10:49:54Z

tests/Integration/Database/EloquentCursorPaginateTest.php

@@ -180,7 +180,7 @@ public function testPaginationWithDistinctColumnsAndSelect()
            TestPost::create(['title' => 'Goodbye world']);
        }

-        $query = TestPost::query()->distinct('title')->select('title');
+        $query = TestPost::query()->orderBy('title')->distinct('title')->select('title');


Cursor based pagination relies on an orderBy clause when selecting specific columns.

driesvints · 2021-11-02T10:50:34Z

tests/Integration/Database/EloquentModelDateCastingTest.php

-        $user = TestModel1::create([
-            'date_field' => '2019-10',
+        TestModel1::create([
+            'date_field' => '2019-10-01',


Date fields in most engines need a full date to be inserted.

driesvints · 2021-11-02T10:51:13Z

tests/Integration/Database/EloquentWhereHasTest.php

@@ -26,7 +26,7 @@ protected function setUp(): void
        Schema::create('texts', function (Blueprint $table) {
            $table->increments('id');
            $table->unsignedInteger('post_id');
-            $table->boolean('content');
+            $table->text('content');


content for these tests relies on string values so this column type was incorrect.

driesvints · 2021-11-02T10:51:52Z

tests/Integration/Database/QueryBuilderTest.php

            (array) DB::table('posts')->select(['id', 'title', 'foo' => function ($query) {
-                $query->select('bar');
+                $query->select('content');


bar isn't a column.

driesvints · 2021-11-02T10:52:25Z

tests/Integration/Database/QueryBuilderTest.php

@@ -127,7 +127,7 @@ public function testWhereValueSubQuery()

    public function testWhereValueSubQueryBuilder()
    {
-        $subQuery = DB::table('posts')->selectRaw("'Sub query value'");
+        $subQuery = DB::table('posts')->selectRaw("'Sub query value'")->limit(1);


We need to limit this raw select because MySQL will produce more than one row and will throw an error when used as a subquery.

driesvints · 2021-11-02T11:20:23Z

tests/Integration/Database/EloquentWhereHasMorphTest.php

@@ -53,7 +53,7 @@ public function testWhereHasMorph()
    {
        $comments = Comment::whereHasMorph('commentable', [Post::class, Video::class], function (Builder $query) {
            $query->where('title', 'foo');
-        })->get();
+        })->orderBy('id')->get();


SQLite, MySQL 5.7 & MySQL 8.0 have different behavior for ordering the result set in these tests. Since the focus of the tests isn't on the order of the results, I've added orderBy clauses to all of these queries.

driesvints · 2021-11-02T11:43:21Z

tests/Integration/Database/DatabaseMySqlSchemaBuilderAlterTableWithEnumTest.php

+
+        foreach (['id', 'name', 'age', 'color'] as $column) {
+            $this->assertContains($column, $columns);
+        }


Really unhappy with this solution but there doesn't seems like a better way to do this 😅

Needed because the ordering of these columns isn't the same between MySQL 8 and MySQL 5.7

you could sort the arrays and check they are same?

actually, there's a function for that assertEqualsCanonicalizing

driesvints and others added 17 commits October 29, 2021 12:17

Add MySQL build

31a4935

wip

9574005

Disable other builds for now

d7eefd2

Update DatabaseTestCase.php

58b9589

wip

903e2b0

Delete workflow for now

45518d0

Try root user

c557679

Try root password

853e5dd

Try port

675c099

wip

edbfc97

refactor

d1677f5

Refactor to remove query

923f35b

Do not test against specific queries

3939946

Refactor test

a148a64

Fix some more tests

8e57d1d

re-add base tests

c33b439

Apply fixes from StyleCI

3d8fe20

driesvints commented Oct 29, 2021

View reviewed changes

Fix query

c8caab0

driesvints commented Oct 29, 2021

View reviewed changes

driesvints changed the title ~~[8.x] MySQL Build~~ [8.x] MySQL 5.7 Build Oct 29, 2021

driesvints added 3 commits November 1, 2021 19:02

wip

07471c8

Use PHP 8.1

5f2a79a

wip

7338975

Fix column type

3c1fbff

driesvints commented Nov 2, 2021

View reviewed changes

driesvints added 2 commits November 2, 2021 11:55

Test on MySQL 8.0

fb96ca0

Add orderBy clauses

1f791f4

driesvints changed the title ~~[8.x] MySQL 5.7 Build~~ [8.x] MySQL Builds Nov 2, 2021

driesvints commented Nov 2, 2021

View reviewed changes

driesvints added 2 commits November 2, 2021 12:41

meh

b48c479

wip

e12a0da

driesvints commented Nov 2, 2021

View reviewed changes

wip

6408970

driesvints requested review from nunomaduro and taylorotwell and removed request for nunomaduro November 2, 2021 13:18

driesvints marked this pull request as ready for review November 2, 2021 13:18

taylorotwell merged commit 50f5079 into 8.x Nov 2, 2021

taylorotwell deleted the db-driver-builds branch November 2, 2021 13:44

driesvints mentioned this pull request Nov 4, 2021

[8.x] PostgreSQL, MSSQL & MariaDB builds #39477

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[8.x] MySQL Builds #39415

[8.x] MySQL Builds #39415

driesvints commented Oct 29, 2021 •

edited

Loading

driesvints Oct 29, 2021 •

edited

Loading

driesvints Oct 29, 2021

driesvints Oct 29, 2021

driesvints Oct 29, 2021

driesvints Oct 29, 2021

driesvints Oct 29, 2021

driesvints Oct 29, 2021

driesvints commented Oct 29, 2021

driesvints Nov 2, 2021

driesvints Nov 2, 2021

driesvints Nov 2, 2021

driesvints Nov 2, 2021 •

edited

Loading

driesvints Nov 2, 2021

driesvints Nov 2, 2021 •

edited

Loading

driesvints Nov 2, 2021

driesvints Nov 2, 2021 •

edited

Loading

GrahamCampbell Nov 2, 2021

GrahamCampbell Nov 2, 2021

[8.x] MySQL Builds #39415

[8.x] MySQL Builds #39415

Conversation

driesvints commented Oct 29, 2021 • edited Loading

driesvints Oct 29, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driesvints commented Oct 29, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driesvints Nov 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driesvints Nov 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driesvints Nov 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driesvints commented Oct 29, 2021 •

edited

Loading

driesvints Oct 29, 2021 •

edited

Loading

driesvints Nov 2, 2021 •

edited

Loading

driesvints Nov 2, 2021 •

edited

Loading

driesvints Nov 2, 2021 •

edited

Loading