Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0 #76

piotaixr · 2021-11-07T00:34:13Z

This PR updates the code and tests in order to be compatible with Doctrine ORM 2.10 and DBAL 3.0.
This PR contains breaking changes and should result in a new major version.
The implementation of the platform mocks is a dummy one and the strict minimum in order to have green tests.

A lot of imports that were not used are also cleaned.

The package.json file makes sure to require Doctrine ORM and DBAL as this libs depends on them.

Deprecations fixed:

Doctrine\DBAL\DBALException was renamed to Doctrine\DBAL\Exception
Doctrine\DBAL\Platforms\MySqlPlatform was renamed to Doctrine\DBAL\Platforms\MySQLPlatform
Doctrine\DBAL\Platforms\PostgreSqlPlatform does not exist anymore and is replaced by PostgreSql94Platform and PostgreSql100Platform.
Doctrine\DBAL\Connection#query now takes a string as parameter and returns a Result
Doctrine\DBAL\Connection#executeUpdate now returns an int. Making ConnectionMock#executeUpdate return 0 to have green tests
Doctrine\DBAL\Platforms\AbstractPlatform#prefersSequences does not exist anymore
The database platform mock must support an identity generator to have green tests. Making DatabasePlatformMock#supportsIdentityColumns return true.
Doctrine\DBAL\Driver has a new method: getExceptionConverter. Making the method throw in order to have the mock respect the interface and have green tests.
Doctrine\DBAL\Driver#getSchemaManager now takes the platform as second argument.

Closes #74

mpiot · 2021-11-18T08:36:26Z

I've just tested the branch in my project and it works well.
Thanks for the PR :)

KornelKrupa · 2021-11-25T08:15:06Z

Yes, it works well! You can merge.

florentdestremau · 2021-11-25T13:42:27Z

The fork is live in our project and works fine

webmasterMeyers · 2021-11-25T15:03:26Z

We are also using this for Postgres and it is working

stephpy · 2021-11-26T08:20:49Z

👍 I use it on sf 5.3, doctrine/dbal 3.1.4, doctrine/orm 2.10.2

mpiot · 2022-01-08T10:34:14Z

friendly ping @Hikariii

Hikariii · 2022-01-08T11:00:36Z

Thnx for the ping, I missed this somehow. I'll check, merge and release this next week.

mpiot · 2022-01-08T12:04:39Z

Thanks a lot @Hikariii

Hikariii · 2022-01-08T13:01:27Z

@piotaixr Because of the implemented requirements in the composer.json file this PR now has conflicts. Can you update this PR so the conflicts are resolved? If not I will make one myself.

piotaixr · 2022-01-08T13:03:15Z

I'll do it within the hour.

Hikariii

Just some minor comments. Thank you so much for your effort.

composer.json

Hikariii · 2022-01-08T13:20:30Z

src/Query/AST/Functions/Postgresql/PostgresqlJsonFunctionNode.php

     */
    protected function validatePlatform(SqlWalker$sqlWalker): void
    {
-        if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-            throw DBALException::notSupported(static::FUNCTION_NAME);
+        if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSQL94Platform) {


Json functions are available from postgres 9.3 and this limits future versions of postgres.
I would steer clear from such specific details and just leave this as it was: PostgreSqlPlatform

This platform does not exist anymore. The parent of PostgreSQL94Platform is now AbstractPlatform.

Doesnt look like it to me: https://github.com/doctrine/dbal/blob/3.2.x/src/Platforms/PostgreSQLPlatform.php

And this: https://github.com/doctrine/dbal/blob/3.2.x/src/Platforms/PostgreSQL94Platform.php

Hmm I'm confused by their versioning. You're right for the 3.0 tag...

Can we resolve this, then?

what's about

Suggested change

if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSQL94Platform) {

$platform = !$sqlWalker->getConnection()->getDatabasePlatform();

if (!$platform instanceof PostgreSQL94Platform && !$platform instanceof PostgreSQLPlatform) {

Curious, I tried this locally. I was expecting this to fail with doctrine 3.1. (Doctrine 3.0 cannot be used, constraints from doctrine/orm preventing it)
Now, what I don't know is if its possible for an instance of AbstractPlatform (not Postgresql) to be given to this function. If yes (and the API does not prevent it, so I think its possible), the code will break with somethong else than Doctrine\DBAL\Exception which violates the interface contract.

I don't understand why you are pushing this much to have the check also done on PostgreSQLPlatform, can you elaborate more?

In the end we can deal with the deprecation later. I've just merged and released version 5. Thank you for all your effort.

src/Query/AST/Functions/Postgresql/PostgresqlJsonOperatorFunctionNode.php

tests/Mocks/DatabasePlatformMock.php

tests/Query/PostgresqlTestCase.php

…fig)

piotaixr · 2022-01-08T13:36:04Z

Updated. I hope I didn't mess up anything.

Hikariii · 2022-01-08T13:40:28Z

Thank you, I will do a more extended test this week. I'm still a bit confused by the different PostgreSqlPlatform versions.
I'll sleep about it a bit. Maybe you have a good suggestion?

piotaixr · 2022-01-08T16:21:20Z

I just read about the 3.0 release of DBAL here: https://github.com/doctrine/dbal/releases/tag/3.0.0
They say they dropped support for postgresql 9.3 and older, making 9.4 the minimum supported version.

jderusse · 2022-01-08T18:21:59Z

src/Query/AST/Functions/Postgresql/PostgresqlJsonFunctionNode.php

     */
    protected function validatePlatform(SqlWalker$sqlWalker): void
    {
-        if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-            throw DBALException::notSupported(static::FUNCTION_NAME);
+        if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSQL94Platform) {


If you support doctrine 3.*, you should support both PostgreSQLPlatform and PostgreSQL94Platform.
(same for other platforms)

composer.json

…as dev dependency

piotaixr · 2022-01-10T19:25:50Z

I don't how thos happened, but the tests wouldn't pass until I added a dev dependency on doctrine/annotations.

Hikariii mentioned this pull request Jan 8, 2022

Incompatibility with doctrine/dbal 3 #74

Closed

Hikariii requested changes Jan 8, 2022

View reviewed changes

piotaixr added 2 commits January 8, 2022 14:32

Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0

d344799

Fixing composer.json that was not using spaces for indents (editorcon…

98aa95b

…fig)

piotaixr force-pushed the feature/dbal3.0 branch from 56fe1ae to 98aa95b Compare January 8, 2022 13:35

jderusse reviewed Jan 8, 2022

View reviewed changes

Normalizing import constraint styles and adding doctrine/annotations …

2cdb3f6

…as dev dependency

Merge branch 'master' into feature/dbal3.0

b3b8e0f

Hikariii merged commit a5a2309 into ScientaNL:master Jan 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0 #76

Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0 #76

piotaixr commented Nov 7, 2021 •

edited

Loading

mpiot commented Nov 18, 2021 •

edited

Loading

KornelKrupa commented Nov 25, 2021

florentdestremau commented Nov 25, 2021

webmasterMeyers commented Nov 25, 2021

stephpy commented Nov 26, 2021

mpiot commented Jan 8, 2022

Hikariii commented Jan 8, 2022

mpiot commented Jan 8, 2022

Hikariii commented Jan 8, 2022

piotaixr commented Jan 8, 2022

Hikariii left a comment

Hikariii Jan 8, 2022

piotaixr Jan 8, 2022 •

edited

Loading

Hikariii Jan 8, 2022

Hikariii Jan 8, 2022

Hikariii Jan 8, 2022 •

edited

Loading

piotaixr Jan 10, 2022

piotaixr Jan 10, 2022

jderusse Jan 10, 2022

piotaixr Jan 10, 2022 •

edited

Loading

Hikariii Jan 12, 2022

piotaixr commented Jan 8, 2022

Hikariii commented Jan 8, 2022

piotaixr commented Jan 8, 2022

jderusse Jan 8, 2022

piotaixr commented Jan 10, 2022

	if (!$sqlWalker->getConnection()->getDatabasePlatform() instanceof PostgreSQL94Platform) {
	$platform = !$sqlWalker->getConnection()->getDatabasePlatform();
	if (!$platform instanceof PostgreSQL94Platform && !$platform instanceof PostgreSQLPlatform) {

Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0 #76

Make code compatible (and requiring) Doctrine ORM 2.10 and DBAL 3.0 #76

Conversation

piotaixr commented Nov 7, 2021 • edited Loading

mpiot commented Nov 18, 2021 • edited Loading

KornelKrupa commented Nov 25, 2021

florentdestremau commented Nov 25, 2021

webmasterMeyers commented Nov 25, 2021

stephpy commented Nov 26, 2021

mpiot commented Jan 8, 2022

Hikariii commented Jan 8, 2022

mpiot commented Jan 8, 2022

Hikariii commented Jan 8, 2022

piotaixr commented Jan 8, 2022

Hikariii left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

piotaixr Jan 8, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hikariii Jan 8, 2022 • 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

piotaixr Jan 10, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

piotaixr commented Jan 8, 2022

Hikariii commented Jan 8, 2022

piotaixr commented Jan 8, 2022

Choose a reason for hiding this comment

piotaixr commented Jan 10, 2022

piotaixr commented Nov 7, 2021 •

edited

Loading

mpiot commented Nov 18, 2021 •

edited

Loading

piotaixr Jan 8, 2022 •

edited

Loading

Hikariii Jan 8, 2022 •

edited

Loading

piotaixr Jan 10, 2022 •

edited

Loading