Skip to content

Backport of #185 #186

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

Merged
merged 6 commits into from
Feb 13, 2018
Merged

Backport of #185 #186

merged 6 commits into from
Feb 13, 2018

Conversation

wachterjohannes
Copy link
Contributor

No description provided.

@wachterjohannes
Copy link
Contributor Author

@dbu this should be the last one :) thanks for merging, tagging and just everything ;)

Copy link
Member

@dbu dbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, just one request to change how we clean up the command argument in the test.

please add a new commit for that in your branch, so that the git history between 1.2 and 1.3 stays consistent.

@@ -94,6 +94,7 @@ public function testNodeUpdate($options)
$this->setupQueryManager($options);

$args = [
'--query-language' => 'jcr-sql2',
Copy link
Member

@dbu dbu Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the original solution was to completely drop this argument: b222c2a . for the 1.2 branch i think it was simply never fixed, i think we can just leave it as is there. but can you please delete it here?

the thing is: sql2 is default, but if you specify a query language option, you have to specify a value for it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dbu should be fixed

@dbu dbu merged commit 0f100e4 into phpcr:1.3 Feb 13, 2018
@wachterjohannes wachterjohannes deleted the 1.3 branch February 13, 2018 07:26
@dbu
Copy link
Member

dbu commented Feb 13, 2018

tagged 1.3.3 with this

@wachterjohannes
Copy link
Contributor Author

@dbu 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