Skip to content

Implement the fn:collation-key XQuery function - #4435

Merged
dizzzz merged 11 commits into
eXist-db:developfrom
evolvedbinary:feature/fn-collation-key#1,#2
Jul 4, 2022
Merged

dizzzz merged 11 commits into
eXist-db:developfrom
evolvedbinary:feature/fn-collation-key#1,#2

Conversation

@chris-evolvedbinary

@chris-evolvedbinary chris-evolvedbinary commented Jun 7, 2022 •

Copy link
Copy Markdown
Contributor

Implementation of the fn:collation-key() function.

Reference:

Type of tests:

  • exist-core/src/test/xquery/xquery3/fnCollationKey.xqm

This passes all XQTS tests for fn-collation-key apart from the two tests: collation-key-105 and collation-key-206. These tests require that eXist-db supports the merge-last option when calling map:merge. These remaining two tests tests should pass once the PR #3738 is merged to eXist-db.

--

This open source contribution to the eXist-db project was commissioned by the Office of the Historian, U.S. Department of State, https://history.state.gov/.

@adamretter adamretter changed the title Feature/fn collation key#1,#2 Implement fn:collation key#1,#2 Jun 8, 2022
@adamretter adamretter changed the title Implement fn:collation key#1,#2 Implement the fn:collation-key XQuery function Jun 8, 2022

@adamretter adamretter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just a few small issues with equality comparisons that need to be addressed in the tests.

Comment thread exist-core/src/main/java/org/exist/xquery/functions/fn/FunCollationKey.java Outdated
Comment thread exist-core/src/main/java/org/exist/xquery/functions/fn/FunCollationKey.java Outdated
Comment thread exist-core/src/test/xquery/xquery3/fnCollationKey.xqm Outdated
Comment thread exist-core/src/test/xquery/xquery3/fnCollationKey.xqm Outdated
@adamretter adamretter added the enhancement new features, suggestions, etc. label Jun 8, 2022
@adamretter adamretter added this to the eXist-6.1.0 milestone Jun 8, 2022
@adamretter

Copy link
Copy Markdown
Contributor

@chris-evolvedbinary Also could you please use the prefixes in your commit messages. If you look at the commit log you will see we use prefixes like [bugfix], [feature], [test], [refactor], etc.

@dizzzz dizzzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, one test case not correct

Comment thread exist-core/src/test/xquery/xquery3/fnCollationKey.xqm

@dizzzz dizzzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One testcase needs to be updated

@adamretter
adamretter marked this pull request as draft June 10, 2022 14:57
@adamretter
adamretter force-pushed the feature/fn-collation-key#1,#2 branch from e418d2f to fec9102 Compare June 15, 2022 12:26
@adamretter
adamretter marked this pull request as ready for review June 15, 2022 12:28
@adamretter

Copy link
Copy Markdown
Contributor

@dizzzz I think this is now ready

@adamretter
adamretter self-requested a review June 15, 2022 14:11

@adamretter adamretter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This now looks good to me :-)

@dizzzz

dizzzz commented Jun 17, 2022

Copy link
Copy Markdown
Member

Still quite some testcases fail. Rerunning....

@dizzzz dizzzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

image

@adamretter
adamretter force-pushed the feature/fn-collation-key#1,#2 branch from a5601f0 to a589379 Compare June 24, 2022 15:00
@sonarqubecloud

sonarqubecloud Bot commented Jul 1, 2022

Copy link
Copy Markdown

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

57.9% 57.9% Coverage
0.0% 0.0% Duplication

@dizzzz
dizzzz merged commit 5086400 into eXist-db:develop Jul 4, 2022
@adamretter
adamretter deleted the feature/fn-collation-key#1,#2 branch November 28, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement new features, suggestions, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants