x:description/attribute(xquery-version) #497

AirQuick · 2019-01-02T14:19:33Z

This pull request derives from #496. So needs to be handled after that.

x:description has @xslt-version but it doesn't have a facility to specify the XQuery version.

This pull request provides it: x:description/@xquery-version

I didn't name it @query-version (without x of the first letter), because @xslt-version isn't @stylesheet-version.

Commits

fba935a defines @xquery-version in the schema.
- I verified manually that oXygen picks it up with the annotation.
- The type of the attribute (text) is based on XQueryX schema (<xsd:element name="version" type="xsd:string"/>).
39038b3 annotates @xslt-version in the schema.
- The annotation highlights the difference from @xquery-version.
- I verified manually that oXygen picks up the annotation.
c984615 generates the version declaration when compiling XSpec for XQuery.
c79b7cb verifies that @xquery-version is actually declared in the compiled module.

1b60e1e enables test/*.xspec to be run on XQuery 3.1.
Saxon 9.6 doesn't support 3.1. 9.7 supports 3.1 only when -qversion:3.1 is specified. 9.8 and 9.9 support 3.1 by default but reject -qversion. build.xml and generate.xsl work together to find the best route in the matrix:

Saxon-HE 9.9: Travis, AppVeyor
Saxon-HE 9.8: Travis, AppVeyor

Saxon-EE 9.7:

$ ./run-xspec-tests-ant.sh -silent
...
xquery.supports.3-1.default=false
xquery.supports.3-1.qversion=true
...
Testing xquery-version_3.1.xspec [q]
passed: 1 / pending: 0 / failed: 0 / total: 1

Saxon-EE 9.6:

$ ./run-xspec-tests-ant.sh -silent
...
xquery.supports.3-1.default=false
...
xquery.supports.3-1.qversion=false
Skipping xquery-version_3.1.xspec: Requires XQuery 3.1 processor

# Conflicts: # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/xspec-rule.xspec # test/win-bats/collection.xml # test/xspec-node-selection.xspec # test/xspec.bats

…-59-2_xquery # Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/xspec-rule.xspec # test/win-bats/collection.xml # test/xspec.bats

…-151 # Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/xspec-rule.xspec # test/win-bats/collection.xml # test/xspec.bats

…d-like # Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # src/schemas/xspec.rnc # test/end-to-end/cases/expected/query/xspec-three-dots-result.html # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/end-to-end/cases/xspec-focus-1.xspec # test/end-to-end/cases/xspec-function.xspec # test/end-to-end/cases/xspec-import.xspec # test/end-to-end/cases/xspec-pending.xspec # test/end-to-end/cases/xspec-three-dots.xspec # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-308.xspec # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats

# Conflicts: # .travis.yml # appveyor.yml # src/compiler/generate-common-tests.xsl # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/unit-expect-xsl.xspec # test/win-bats/collection.xml # test/xspec-308.xspec # test/xspec-59_use-case-1.xspec # test/xspec-59_use-case-2.xspec # test/xspec-node-selection.xspec # test/xspec-variable.xspec # test/xspec.bats

…erwise # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/win-bats/collection.xml # test/xspec.bats

…-output-escaping # Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/win-bats/collection.xml # test/xspec.bats

…-folding-img-src # Conflicts: # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/win-bats/collection.xml # test/xspec.bats

…sult-prefixes # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…lize # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…ormat-xslt # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…erialize # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…359-367 # Conflicts: # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…-flags # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…diff # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…ort-value # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…355-357-358-360-361 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…sequence # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…-151 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…nt-family # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html # test/end-to-end/cases/expected/xspec-rule-junit-norm.xml # test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml # test/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…e-type # Conflicts: # test/xspec-result-naming-collision.xspec

…uery

…hut-to-xspec

AirQuick · 2019-06-18T20:42:12Z

@galtm
This PR adds an attribute to the schema, So I thought this should be reviewed by someone.
The immediate reason for introducing this new attribute is #498 (ce552c6 in particular where testing #355 requires XPath 3.1).

galtm · 2019-06-20T14:08:57Z

test/ant/worker/generate.xsl

 				</xsl:when>
 			</xsl:choose>
 		</xsl:variable>

+		<xsl:variable as="xs:string?" name="skip">


I assume you are intentionally reusing the variable name on lines 76 and 100. Just mentioning it in case your preferred style is to make variable names unique and the reuse was inadvertent.

Yes, the variable is reused here. Probably in order to simplify the diff.

galtm

The changes look good. Thanks for the detailed description of the pull request, including results in different Saxon versions. FYI, I don't use Ant much, so my review of those files was shallow.

galtm · 2019-06-20T14:14:15Z

src/schemas/xspec.rnc

+		attribute query { xsd:anyURI }?,
+
+		## XQuery version which will be declared in the compiled main module.
+		attribute xquery-version { text }?,


Your description explained why you named this xquery-version instead of query-version. I think it makes perfect sense to name it xquery-version because it's the version of the language, not the version of the query file being tested.

Thanks for the review. I'm merging this pr.

…sion # Conflicts: # src/compiler/generate-query-tests.xsl # src/schemas/xspec.rnc # test/win-bats/collection.xml # test/xspec.bats

AirQuick · 2019-06-21T06:11:41Z

@cirulls
Merged this new feature.

AirQuick added 2 commits January 2, 2019 19:44

Test invalid xquery-version

c79b7cb

Test xquery-version=3.1

1b60e1e

AirQuick added the enhancement label Jan 2, 2019

AirQuick mentioned this pull request Jan 2, 2019

Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

Merged

AirQuick added 26 commits January 3, 2019 23:51

Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-466

208f1cc

# Conflicts: # test/win-bats/collection.xml # test/xspec.bats

AirQuick added 19 commits March 7, 2019 08:50

Merge branch 'test-deps-2018-12-24' into xquery-copy-desc-ns

53c4d3e

Merge branch 'xquery-copy-desc-ns' into fix_issue-480

8e62577

Merge branch 'fix_issue-480' into prep_177-test_xquery

58cd952

Merge branch 'prep_177-test_xquery' into fix_issue-177_xquery

13cac10

Merge branch 'fix_issue-177_xquery' into test_issue-153_xquery

b1e98c2

Merge branch 'test_issue-153_xquery' into xquery-import-test-utils

ba45b31

Merge branch 'xquery-import-test-utils' into test-items-ns

11bb965

Merge branch 'test-items-ns' into xquery-instance-of-namespace

0eb55be

Merge branch 'xquery-instance-of-namespace' into fix_issue-67_xquery

88b265a

Merge branch 'fix_issue-67_xquery' into xquery-node-type

d9a6677

Merge branch 'master' of git://github.com/xspec/xspec into xquery-nod…

bf9ef7e

…e-type # Conflicts: # test/xspec-result-naming-collision.xspec

Merge branch 'xquery-node-type' into test_wrappable-sequence

f760e29

Merge branch 'test_wrappable-sequence' into test_report-sequence_xquery

10a5d92

Merge branch 'test_report-sequence_xquery' into test_serialization_xq…

247d98f

…uery

Merge branch 'test_serialization_xquery' into rm-xq-comment-from-build

7f0e07f

Merge branch 'rm-xq-comment-from-build' into undup-sch-location-compare

30867b7

Merge branch 'undup-sch-location-compare' into xsl-sequence-in-sch-019

db860a0

Merge branch 'xsl-sequence-in-sch-019' into xsl-namespace-first-in-sc…

f87e545

…hut-to-xspec

Merge branch 'xsl-namespace-first-in-schut-to-xspec' into xquery-version

1eb913a

AirQuick added this to the v1.4.0 milestone Apr 30, 2019

AirQuick requested a review from galtm June 18, 2019 20:22

galtm reviewed Jun 20, 2019

View reviewed changes

galtm approved these changes Jun 20, 2019

View reviewed changes

galtm reviewed Jun 20, 2019

View reviewed changes

Merge branch 'master' of git://github.com/xspec/xspec into xquery-ver…

0d79d4f

…sion # Conflicts: # src/compiler/generate-query-tests.xsl # src/schemas/xspec.rnc # test/win-bats/collection.xml # test/xspec.bats

AirQuick merged commit 69eff64 into xspec:master Jun 21, 2019

AirQuick deleted the xquery-version branch June 21, 2019 05:30

cirulls mentioned this pull request Sep 5, 2019

Automatically generate release notes #601

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

x:description/attribute(xquery-version) #497

x:description/attribute(xquery-version) #497

AirQuick commented Jan 2, 2019

AirQuick commented Jun 18, 2019

galtm Jun 20, 2019

AirQuick Jun 21, 2019

galtm left a comment

galtm Jun 20, 2019

AirQuick Jun 21, 2019

AirQuick commented Jun 21, 2019

x:description/attribute(xquery-version) #497

x:description/attribute(xquery-version) #497

Conversation

AirQuick commented Jan 2, 2019

Commits

AirQuick commented Jun 18, 2019

galtm Jun 20, 2019

Choose a reason for hiding this comment

AirQuick Jun 21, 2019

Choose a reason for hiding this comment

galtm left a comment

Choose a reason for hiding this comment

galtm Jun 20, 2019

Choose a reason for hiding this comment

AirQuick Jun 21, 2019

Choose a reason for hiding this comment

AirQuick commented Jun 21, 2019