Skip to content

[FIX] Handle default table options in master slave connection. #453

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

Conversation

zackrowe
Copy link
Contributor

Currently the doctrine AbstractSchemaManager::createSchemaConfig is checking the top level of the settings array to see if the defaultTableOptions is set. When utilizing the MasterSlaveConnection this setting is nested within the master and slave arrays and is getting ignored.

Changes proposed in this pull request:

  • Update the MasterSlaveConnection::resolve() function to check if this setting is set and add it to the top level of the returned array.
  • Update the MasterSlaveConnectionTest to verify that the defaultTableOptions are being handle properly.

@eigan
Copy link
Member

eigan commented Jul 22, 2020

👍

Could you rebase on top of 1.5? Would like to have this in for those using Laravel 6 (LTS).

@zackrowe zackrowe changed the base branch from 1.6 to 1.5 July 22, 2020 10:49
@zackrowe zackrowe force-pushed the master-slave-connection-handle-default-table-options branch from d1d2655 to 46b9de1 Compare July 22, 2020 11:10
@eigan
Copy link
Member

eigan commented Jul 22, 2020

Please drop unrelated commits when rebasing :)

@zackrowe zackrowe force-pushed the master-slave-connection-handle-default-table-options branch from abe30df to 46b9de1 Compare July 22, 2020 11:29
@zackrowe zackrowe force-pushed the master-slave-connection-handle-default-table-options branch from 46b9de1 to efda211 Compare July 22, 2020 11:31
@zackrowe
Copy link
Contributor Author

Please drop unrelated commits when rebasing :)

Yikes! Sorry about that. I guess I'm a little confused on how rebases are handled in my IDE.

@zackrowe zackrowe changed the title [Fix] Handle default table options in master slave connection. [FIX] Handle default table options in master slave connection. Jul 22, 2020
@eigan eigan merged commit bcae6f3 into laravel-doctrine:1.5 Jul 23, 2020
@eigan
Copy link
Member

eigan commented Jul 23, 2020

It happens :)

Released with 1.5.8 and 1.6.1, thanks! 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants