Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Sep 25, 2018
2 parents bc76c93 + 9e4d2a6 commit 6f32927
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
4 changes: 2 additions & 2 deletions xml/pm/claims/simple.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ SOFTWARE.
<created>2016-12-29T09:03:21.684Z</created>
<token>user;yegor256</token>
</claim>
<claim id="2722301000">
<claim id="e5241c4e-e47d-4b85-b07f-27afbeba090c">
<type>bootstrap the project</type>
<created>2016-12-29T09:03:21.684Z</created>
<token>github;yegor256</token>
</claim>
<claim id="2722301077">
<claim id="83199f5d-d808-4136-b918-b871537fb96e">
<type>Notify</type>
<created>2016-12-29T09:03:21.684Z</created>
<token>project;C99998888</token>
Expand Down
11 changes: 9 additions & 2 deletions xsd/pm/claims.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ SOFTWARE.
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="id" type="xs:long" use="required"/>
<!--
@todo #388:30min Restrict id type as uuid.
Claim id was changed from long to uuid, but to keep
system working the migration should be done in two steps:
change claim id from long to string to accept both types
(numbers and uuids), then change this type to uuid (see types.xsd).
-->
<xs:attribute name="id" type="xs:string" use="required"/>
</xs:complexType>
<xs:element name="claims">
<xs:complexType>
Expand All @@ -64,7 +71,7 @@ SOFTWARE.
<xs:attribute name="version" use="required" type="version"/>
<xs:attribute name="busy" use="optional" type="xs:dateTime"/>
</xs:complexType>
<xs:unique name="uniqueID">
<xs:unique name="claimID">
<xs:selector xpath="claim"/>
<xs:field xpath="@id"/>
</xs:unique>
Expand Down
5 changes: 5 additions & 0 deletions xsd/pmo/types.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,9 @@ SOFTWARE.
<xs:pattern value="[A-Za-z\d\-]{1,39}/[A-Za-z\d\-]{1,39}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="uuid">
<xs:restriction base="xs:string">
<xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>

1 comment on commit 6f32927

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 6f32927 Sep 25, 2018

Choose a reason for hiding this comment

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

Puzzle 388-7308d934 discovered in xsd/pm/claims.xsd and submitted as #390. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.