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

Merge 3.9.x and 4.0.x into 4.1.x #6450

Merged
merged 13 commits into from
Jun 19, 2024
Merged

Merge 3.9.x and 4.0.x into 4.1.x #6450

merged 13 commits into from
Jun 19, 2024

Conversation

derrabus
Copy link
Member

No description provided.

derrabus and others added 12 commits June 7, 2024 16:06
* 3.8.x:
  Fix MariaDB fetching of default table character-set (doctrine#6361) (doctrine#6425)
  Fix the portability documentation (doctrine#6429)
  Update tests/Platforms/AbstractPlatformTestCase.php
  Update tests/Platforms/AbstractPlatformTestCase.php
  add test
  Fix: Skip type comparison if disableTypeComments is true
…_key_name_change_detection"

This reverts commit 080aab5, reversing
changes made to a5d2baf.
Revert "Merge pull request doctrine#6413 from achterin/bugfix/foreign_key_name_change_detection"
|      Q       |   A
|------------- | -----------
| Type         | bug
| Fixed issues | n/a

#### Summary

`SqlitePlatform::getCreatePrimaryKeySQL` method must receive original
table name, the split is intended for SQLite `CREATE INDEX` statement
only.
* 3.8.x:
  Move schema split for SQLite CREATE INDEX only (doctrine#6352)
  PHPStan 1.11.5 (doctrine#6446)
  Revert "Merge pull request doctrine#6413 from achterin/bugfix/foreign_key_name_change_detection"
  CI: Update MariaDB versions (doctrine#6426)
  CI MariaDB: add 11.4, remove 11.0 (doctrine#6432)
  Fix typo in the portability documentation (doctrine#6430)
* 3.8.x:
  Move schema split for SQLite CREATE INDEX only (doctrine#6352)
  PHPStan 1.11.5 (doctrine#6446)
  Revert "Merge pull request doctrine#6413 from achterin/bugfix/foreign_key_name_change_detection"
The diverging MariaDB-10.10.1+ implementation of retrieving table
options split the implementation so that its now in the
AbstractMySQLPlatform and the MariaDB specific implementation in
MariaDBPlatform.

Fixes doctrine#6361.
…lit.x

Add MariaDb1010Platform for fetchTableOptionsByTable
* 4.0.x:
  PHPUnit 10.5.21 (doctrine#6447)
  Move schema split for SQLite CREATE INDEX only (doctrine#6352)
  PHPStan 1.11.5 (doctrine#6446)
  Revert "Merge pull request doctrine#6413 from achterin/bugfix/foreign_key_name_change_detection"
* 3.9.x:
  Simplify signature of fetchTableOptionsByTable
  Add MariaDb1010Platform for fetchTableOptionsByTable
@derrabus derrabus merged commit df2fc59 into doctrine:4.1.x Jun 19, 2024
76 of 77 checks passed
@derrabus derrabus deleted the 4.1.x branch June 19, 2024 06:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants