Skip to content

Add the potential possibility of using nested joins #160

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

Closed
wants to merge 9 commits into from
Closed

Add the potential possibility of using nested joins #160

wants to merge 9 commits into from

Conversation

shinyvision
Copy link

I've noticed it isn't possible to perform a 'join join'. I have implemented this on my end and will therefore also be contributing to jackalope/jackalope-doctrine-dbal

@lsmith77 lsmith77 added review and removed wip/poc labels Feb 11, 2016
@dbu
Copy link
Member

dbu commented Feb 12, 2016

you can ignore the test build, that is just travis-ci having a problem with their php 5.3.3 setup. i created #161 to stop using that...

i will wait with merging this until what lukas explained in phpcr/phpcr-api-tests#177 (comment) shows that this really works - the tests on phpcr-utils are severely limited, most of the query builder is only tested in combination with jackalope.

@shinyvision
Copy link
Author

I figured the travis build failing because of technical issues... Though my coding is fair, I'm not highly experienced concerning Github contributions, so if there's anything else I need to do, please let me know!

@dbu
Copy link
Member

dbu commented Feb 12, 2016

no worries. you could rebase your branch on the upstream master to get an all green build:
git remote add upstream https://github.com/phpcr/phpcr-utils.git && git update upstream && git rebase upstream/master && git push origin -f

@shinyvision
Copy link
Author

My upstream is already set to https://github.com/phpcr/phpcr-utils.git. I've fetched upstream, rebased and force pushed, but it's already up-to-date. Am I doing something wrong?

stop building on broken 5.3.3 setup
@dbu
Copy link
Member

dbu commented Feb 12, 2016

sorry, that was my bad. i had not merged #161 yet. can you try again now that i merged it?

@dbu
Copy link
Member

dbu commented Feb 12, 2016

ups. looks like you did a merge instead of a rebase. i will merge this PR manually to sort things out.

@dbu
Copy link
Member

dbu commented Feb 12, 2016

merged in 9f51c3e

thanks a lot!

@dbu dbu closed this Feb 12, 2016
@lsmith77 lsmith77 removed the review label Feb 12, 2016
@shinyvision
Copy link
Author

Hm ok... On my end, I did a rebase / pull / push. My local commits did come through though. Anyways thanks for putting in the effort into getting this out there :) Really needed a join join implementation :)

@dbu
Copy link
Member

dbu commented Feb 12, 2016

pull by default does a merge rather than rebase. this is why your commits showed up again, along with mine from master. in this situation, you want to rebase on the master branch, not pull (= merge) changes from somewhere. the history in your PR branch can be rewritten, that does not hurt.

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.

3 participants